mastodon v1.3.3 patch for http server

mastodon-http.diff

--- /mastodon/app/lib/tag_manager.rb.org
+++ /mastodon/app/lib/tag_manager.rb
@@ -69,7 +69,7 @@
 
     uri = Addressable::URI.new
     uri.host = domain.gsub(/[\/]/, '')
-    uri.normalize.host
+    uri.normalize.authority
   end
 
   def same_acct?(canonical, needle)
--- /mastodon/vendor/bundle/ruby/2.4.0/gems/goldfinger-1.2.0/lib/goldfinger/client.rb.org
+++ /mastodon/vendor/bundle/ruby/2.4.0/gems/goldfinger-1.2.0/lib/goldfinger/client.rb
@@ -19,10 +19,13 @@
 
         Goldfinger::Result.new(response)
       rescue HTTP::Error
-        raise Goldfinger::NotFoundError unless ssl
-
+        raise Goldfinger::NotFoundError unless ssl and ENV['LOCAL_HTTPS'] == 'false'
         ssl = false
         retry
+      rescue OpenSSL::SSL::SSLError
+        raise Goldfinger::SSLError unless ssl and ENV['LOCAL_HTTPS'] == 'false'
+        ssl = false
+        retry
       end
     rescue HTTP::Error
       raise Goldfinger::NotFoundError
@@ -40,8 +43,11 @@
       begin
         template = perform_get(url(ssl))
       rescue HTTP::Error
-        raise Goldfinger::NotFoundError unless ssl
-
+        raise Goldfinger::NotFoundError unless ssl and ENV['LOCAL_HTTPS'] == 'false'
+        ssl = false
+        retry
+      rescue OpenSSL::SSL::SSLError
+        raise Goldfinger::SSLError unless ssl and ENV['LOCAL_HTTPS'] == 'false'
         ssl = false
         retry
       end