Merge branch 'master' of https://github.com/rails/rails

1 files changed, 12 insertions, 14 deletions

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index a51fc5b8e4..6fc0cf1fb8 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -2,27 +2,25 @@ module ActionController
   module UrlFor
     extend ActiveSupport::Concern
 
-    include ActionDispatch::Routing::UrlFor
+    include AbstractController::UrlFor
 
     def url_options
-      super.reverse_merge(
-        :host => request.host_with_port,
+      @_url_options ||= super.reverse_merge(
+        :host => request.host,
+        :port => request.optional_port,
         :protocol => request.protocol,
         :_path_segments => request.symbolized_path_parameters
-      ).merge(:script_name => request.script_name)
-    end
-
-    def _routes
-      raise "In order to use #url_for, you must include routing helpers explicitly. " \
-            "For instance, `include Rails.application.routes.url_helpers"
-    end
+      ).freeze
 
-    module ClassMethods
-      def action_methods
-        @action_methods ||= begin
-          super - _routes.named_routes.helper_names
+      if _routes.equal?(env["action_dispatch.routes"])
+        @_url_options.dup.tap do |options|
+          options[:script_name] = request.script_name.dup
+          options.freeze
         end
+      else
+        @_url_options
       end
     end
+
   end
 end