Merged r23469 from trunk to 6.0-stable (#41930).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23470 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/application_controller.rb

@@ -511,7 +511,7 @@ class ApplicationController < ActionController::Base
         end
       end
       # Remove unnecessary components to convert the URL into a relative URL
-      uri.omit!(:scheme, :userinfo, :host, :port)
+      uri.omit!(:scheme, :authority)
     rescue Addressable::URI::InvalidURIError
       return false
     end