2 files changed, 16 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller/railties/subscriber.rb b/actionpack/lib/action_controller/railties/log_subscriber.rb
index 4499e82292..c2299d0b05 100644
--- a/actionpack/lib/action_controller/railties/subscriber.rb
+++ b/actionpack/lib/action_controller/railties/log_subscriber.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Railties
-    class Subscriber < Rails::Subscriber
+    class LogSubscriber < Rails::LogSubscriber
       INTERNAL_PARAMS = %w(controller action format _method only_path)
 
       def start_processing(event)
@@ -22,15 +22,7 @@ module ActionController
       end
 
       def send_file(event)
-        message = if event.payload[:x_sendfile]
-          header = ActionController::Streaming::X_SENDFILE_HEADER
-          "Sent #{header} header %s"
-        elsif event.payload[:stream]
-          "Streamed file %s"
-        else
-          "Sent file %s"
-        end
-
+        message = "Sent file %s"
         message << " (%.1fms)"
         info(message % [event.payload[:path], event.duration])
       end
diff --git a/actionpack/lib/action_controller/railties/url_helpers.rb b/actionpack/lib/action_controller/railties/url_helpers.rb
new file mode 100644
index 0000000000..ad2a8d4ef3
--- /dev/null
+++ b/actionpack/lib/action_controller/railties/url_helpers.rb
@@ -0,0 +1,14 @@
+module ActionController
+  class Railtie
+    module UrlHelpers
+      def self.with(router)
+        Module.new do
+          define_method(:inherited) do |klass|
+            super(klass)
+            klass.send(:include, router.url_helpers)
+          end
+        end
+      end
+    end
+  end
+end
+\ No newline at end of file