Merge branch 'master' into adequaterecord

* master: (108 commits)
  make tests pass on Ruby 2.2
  Use Sqlite3 adapter in examples
  use the body proxy to freeze headers
  just ask the response for the commit status, we do not need to ask the jar
  only write the jar if the response isn't committed
  Fix a grammatical error in the i18n guide [ci skip]
  use method_defined? to check whether or not a method is defined
  Enhance docs for update_attribute [ci-skip]
  Change usec to 0 on tests that compare seconds
  Unit test for mysql quote time usec
  Changelog entry for mysql56 microseconds
  Test microsecond on mysql 5.6
  MySQL 5.6 and later supports microsecond precision in datetime.
  [ci skip] Add documentation for original_fullpath.
  Remove mocking on save, when not necessary
  comment why we are modifying global state. [ci skip]
  `change_table` supports `citext`. Follow up to #12523.
  Removed unnecessary command "application"
  register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]
  Fixes STI when 2+ levels deep.
  ...

30 files changed, 941 insertions, 533 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 66cef08b1b..c23577de9b 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Make logging of CSRF failures optional (but on by default) with the
+    `log_warning_on_csrf_failure` configuration setting in
+    `ActionController::RequestForgeryProtection`.
+
+    *John Barton*
+
 *   Fix URL generation in controller tests with request-dependent
     `default_url_options` methods.
 
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index e920a33765..b1acca2435 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -54,9 +54,9 @@ module ActionController
     end
 
     def deep_munge(event)
-      message = "Value for params[:#{event.payload[:keys].join('][:')}] was set"\
-                "to nil, because it was one of [], [null] or [null, null, ...]."\
-                "Go to http://guides.rubyonrails.org/security.html#unsafe-query-generation"\
+      message = "Value for params[:#{event.payload[:keys].join('][:')}] was set "\
+                "to nil, because it was one of [], [null] or [null, null, ...]. "\
+                "Go to http://guides.rubyonrails.org/security.html#unsafe-query-generation "\
                 "for more information."\
 
       debug(message)
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index fdf4ef293d..41b997a755 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -107,8 +107,11 @@ module ActionController
     end
 
     class Buffer < ActionDispatch::Response::Buffer #:nodoc:
+      include MonitorMixin
+
       def initialize(response)
-        @error_callback = nil
+        @error_callback = lambda { true }
+        @cv = new_cond
         super(response, SizedQueue.new(10))
       end
 
@@ -122,14 +125,25 @@ module ActionController
       end
 
       def each
+        @response.sending!
         while str = @buf.pop
           yield str
         end
+        @response.sent!
       end
 
       def close
-        super
-        @buf.push nil
+        synchronize do
+          super
+          @buf.push nil
+          @cv.broadcast
+        end
+      end
+
+      def await_close
+        synchronize do
+          @cv.wait_until { @closed }
+        end
       end
 
       def on_error(&block)
@@ -165,12 +179,20 @@ module ActionController
         end
       end
 
-      def commit!
-        headers.freeze
+      private
+
+      def before_committed
         super
+        jar = request.cookie_jar
+        # The response can be committed multiple times
+        jar.write self unless committed?
       end
 
-      private
+      def before_sending
+        super
+        request.cookie_jar.commit!
+        headers.freeze
+      end
 
       def build_buffer(response, body)
         buf = Live::Buffer.new response
@@ -191,6 +213,7 @@ module ActionController
       t1 = Thread.current
       locals = t1.keys.map { |key| [key, t1[key]] }
 
+      error = nil
       # This processes the action in a child thread. It lets us return the
       # response code and headers back up the rack stack, and still process
       # the body in parallel with sending data to the client
@@ -205,8 +228,9 @@ module ActionController
         begin
           super(name)
         rescue => e
-          @_response.status = 500 unless @_response.committed?
-          @_response.status = 400 if e.class == ActionController::BadRequest
+          unless @_response.committed?
+            error = e
+          end
           begin
             @_response.stream.write(ActionView::Base.streaming_completion_on_exception) if request.format == :html
             @_response.stream.call_on_error
@@ -222,6 +246,7 @@ module ActionController
       }
 
       @_response.await_commit
+      raise error if error
     end
 
     def log_error(exception)
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index e1bee9e60c..bdf6e88699 100644
--- a/actionpack/lib/action_controller/metal/rack_delegation.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -5,8 +5,8 @@ module ActionController
   module RackDelegation
     extend ActiveSupport::Concern
 
-    delegate :headers, :status=, :location=, :content_type=, :no_content_type=,
-             :status, :location, :content_type, :no_content_type, :to => "@_response"
+    delegate :headers, :status=, :location=, :content_type=,
+             :status, :location, :content_type, :to => "@_response"
 
     def dispatch(action, request)
       set_response!(request)
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 3c4ef596c7..93e7d6954c 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -45,9 +45,7 @@ module ActionController
     def _process_format(format, options = {})
       super
 
-      if options[:body]
-        self.headers.delete "Content-Type"
-      elsif options[:plain]
+      if options[:plain]
         self.content_type = Mime::TEXT
       else
         self.content_type ||= format.to_s
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index c88074d4c6..e3b1f5ae7c 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -68,6 +68,10 @@ module ActionController #:nodoc:
       config_accessor :allow_forgery_protection
       self.allow_forgery_protection = true if allow_forgery_protection.nil?
 
+      # Controls whether a CSRF failure logs a warning. On by default.
+      config_accessor :log_warning_on_csrf_failure
+      self.log_warning_on_csrf_failure = true
+
       helper_method :form_authenticity_token
       helper_method :protect_against_forgery?
     end
@@ -193,7 +197,9 @@ module ActionController #:nodoc:
         mark_for_same_origin_verification!
 
         if !verified_request?
-          logger.warn "Can't verify CSRF token authenticity" if logger
+          if logger && log_warning_on_csrf_failure
+            logger.warn "Can't verify CSRF token authenticity"
+          end
           handle_unverified_request
         end
       end
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 8650b75400..e9166d8747 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -258,6 +258,29 @@ module ActionController
     end
   end
 
+  class LiveTestResponse < Live::Response
+    def recycle!
+      @body = nil
+      initialize
+    end
+
+    def body
+      @body ||= super
+    end
+
+    # Was the response successful?
+    alias_method :success?, :successful?
+
+    # Was the URL not found?
+    alias_method :missing?, :not_found?
+
+    # Were we redirected?
+    alias_method :redirect?, :redirection?
+
+    # Was there a server-side error?
+    alias_method :error?, :server_error?
+  end
+
   # Methods #destroy and #load! are overridden to avoid calling methods on the
   # @store object, which does not exist for the TestSession class.
   class TestSession < Rack::Session::Abstract::SessionHash #:nodoc:
@@ -572,7 +595,9 @@ module ActionController
         @controller.process(name)
 
         if cookies = @request.env['action_dispatch.cookies']
-          cookies.write(@response)
+          unless @response.committed?
+            cookies.write(@response)
+          end
         end
         @response.prepare!
 
@@ -583,13 +608,14 @@ module ActionController
       end
 
       def setup_controller_request_and_response
-        @request          = build_request
-        @response         = build_response
-        @response.request = @request
-
         @controller = nil unless defined? @controller
 
+        response_klass = TestResponse
+
         if klass = self.class.controller_class
+          if klass < ActionController::Live
+            response_klass = LiveTestResponse
+          end
           unless @controller
             begin
               @controller = klass.new
@@ -599,6 +625,10 @@ module ActionController
           end
         end
 
+        @request          = build_request
+        @response         = build_response response_klass
+        @response.request = @request
+
         if @controller
           @controller.request = @request
           @controller.params = {}
@@ -609,8 +639,8 @@ module ActionController
         TestRequest.new
       end
 
-      def build_response
-        TestResponse.new
+      def build_response(klass)
+        klass.new
       end
 
       included do
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 1318c62fbe..daa06e96e6 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -152,6 +152,13 @@ module ActionDispatch
       Http::Headers.new(@env)
     end
 
+    # Returns a +String+ with the last requested path including their params.
+    #
+    #    # get '/foo'
+    #    request.original_fullpath # => '/foo'
+    #
+    #    # get '/foo?bar'
+    #    request.original_fullpath # => '/foo?bar'
     def original_fullpath
       @original_fullpath ||= (env["ORIGINAL_FULLPATH"] || fullpath)
     end
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index f14ca1ea44..3d27ff2b24 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -63,8 +63,6 @@ module ActionDispatch # :nodoc:
     # content you're giving them, so we need to send that along.
     attr_accessor :charset
 
-    attr_accessor :no_content_type # :nodoc:
-
     CONTENT_TYPE = "Content-Type".freeze
     SET_COOKIE   = "Set-Cookie".freeze
     LOCATION     = "Location".freeze
@@ -93,7 +91,10 @@ module ActionDispatch # :nodoc:
       end
 
       def each(&block)
-        @buf.each(&block)
+        @response.sending!
+        x = @buf.each(&block)
+        @response.sent!
+        x
       end
 
       def close
@@ -120,6 +121,8 @@ module ActionDispatch # :nodoc:
       @blank        = false
       @cv           = new_cond
       @committed    = false
+      @sending      = false
+      @sent         = false
       @content_type = nil
       @charset      = nil
 
@@ -140,17 +143,37 @@ module ActionDispatch # :nodoc:
       end
     end
 
+    def await_sent
+      synchronize { @cv.wait_until { @sent } }
+    end
+
     def commit!
       synchronize do
+        before_committed
         @committed = true
         @cv.broadcast
       end
     end
 
-    def committed?
-      @committed
+    def sending!
+      synchronize do
+        before_sending
+        @sending = true
+        @cv.broadcast
+      end
+    end
+
+    def sent!
+      synchronize do
+        @sent = true
+        @cv.broadcast
+      end
     end
 
+    def sending?;   synchronize { @sending };   end
+    def committed?; synchronize { @committed }; end
+    def sent?;      synchronize { @sent };      end
+
     # Sets the HTTP status code.
     def status=(status)
       @status = Rack::Utils.status_code(status)
@@ -275,6 +298,12 @@ module ActionDispatch # :nodoc:
 
   private
 
+    def before_committed
+    end
+
+    def before_sending
+    end
+
     def merge_default_headers(original, default)
       return original unless default.respond_to?(:merge)
 
@@ -305,17 +334,8 @@ module ActionDispatch # :nodoc:
       !@sending_file && @charset != false
     end
 
-    def remove_content_type!
-      headers.delete CONTENT_TYPE
-    end
-
     def rack_response(status, header)
-      if no_content_type
-        remove_content_type!
-      else
-        assign_default_content_type_and_charset!(header)
-      end
-
+      assign_default_content_type_and_charset!(header)
       handle_conditional_get!
 
       header[SET_COOKIE] = header[SET_COOKIE].join("\n") if header[SET_COOKIE].respond_to?(:join)
diff --git a/actionpack/lib/action_dispatch/journey/formatter.rb b/actionpack/lib/action_dispatch/journey/formatter.rb
index 4410c1b5d5..57f0963731 100644
--- a/actionpack/lib/action_dispatch/journey/formatter.rb
+++ b/actionpack/lib/action_dispatch/journey/formatter.rb
@@ -121,9 +121,9 @@ module ActionDispatch
         def possibles(cache, options, depth = 0)
           cache.fetch(:___routes) { [] } + options.find_all { |pair|
             cache.key?(pair)
-          }.map { |pair|
+          }.flat_map { |pair|
             possibles(cache[pair], options, depth + 1)
-          }.flatten(1)
+          }
         end
 
         # Returns +true+ if no missing keys are present, otherwise +false+.
diff --git a/actionpack/lib/action_dispatch/journey/gtg/builder.rb b/actionpack/lib/action_dispatch/journey/gtg/builder.rb
index 7d2791714b..450588cda6 100644
--- a/actionpack/lib/action_dispatch/journey/gtg/builder.rb
+++ b/actionpack/lib/action_dispatch/journey/gtg/builder.rb
@@ -27,7 +27,7 @@ module ActionDispatch
             marked[s] = true # mark s
 
             s.group_by { |state| symbol(state) }.each do |sym, ps|
-              u = ps.map { |l| followpos(l) }.flatten
+              u = ps.flat_map { |l| followpos(l) }
               next if u.empty?
 
               if u.uniq == [DUMMY]
@@ -90,7 +90,7 @@ module ActionDispatch
               firstpos(node.left)
             end
           when Nodes::Or
-            node.children.map { |c| firstpos(c) }.flatten.uniq
+            node.children.flat_map { |c| firstpos(c) }.uniq
           when Nodes::Unary
             firstpos(node.left)
           when Nodes::Terminal
@@ -105,7 +105,7 @@ module ActionDispatch
           when Nodes::Star
             firstpos(node.left)
           when Nodes::Or
-            node.children.map { |c| lastpos(c) }.flatten.uniq
+            node.children.flat_map { |c| lastpos(c) }.uniq
           when Nodes::Cat
             if nullable?(node.right)
               lastpos(node.left) | lastpos(node.right)
diff --git a/actionpack/lib/action_dispatch/journey/gtg/simulator.rb b/actionpack/lib/action_dispatch/journey/gtg/simulator.rb
index 58ad803841..254c2befc4 100644
--- a/actionpack/lib/action_dispatch/journey/gtg/simulator.rb
+++ b/actionpack/lib/action_dispatch/journey/gtg/simulator.rb
@@ -31,7 +31,7 @@ module ActionDispatch
 
           return if acceptance_states.empty?
 
-          memos = acceptance_states.map { |x| tt.memo(x) }.flatten.compact
+          memos = acceptance_states.flat_map { |x| tt.memo(x) }.compact
 
           MatchData.new(memos)
         end
diff --git a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
index 5a79059ed6..e6212b1ee2 100644
--- a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
+++ b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
@@ -114,17 +114,17 @@ module ActionDispatch
         end
 
         def states
-          ss = @string_states.keys + @string_states.values.map(&:values).flatten
-          rs = @regexp_states.keys + @regexp_states.values.map(&:values).flatten
+          ss = @string_states.keys + @string_states.values.flat_map(&:values)
+          rs = @regexp_states.keys + @regexp_states.values.flat_map(&:values)
           (ss + rs).uniq
         end
 
         def transitions
-          @string_states.map { |from, hash|
+          @string_states.flat_map { |from, hash|
             hash.map { |s, to| [from, s, to] }
-          }.flatten(1) + @regexp_states.map { |from, hash|
+          } + @regexp_states.flat_map { |from, hash|
             hash.map { |s, to| [from, s, to] }
-          }.flatten(1)
+          }
         end
 
         private
@@ -143,11 +143,11 @@ module ActionDispatch
           def move_regexp(t, a)
             return [] if t.empty?
 
-            t.map { |s|
+            t.flat_map { |s|
               if states = @regexp_states[s]
                 states.map { |re, v| re === a ? v : nil }
               end
-            }.flatten.compact.uniq
+            }.compact.uniq
           end
 
           def move_string(t, a)
diff --git a/actionpack/lib/action_dispatch/journey/nfa/dot.rb b/actionpack/lib/action_dispatch/journey/nfa/dot.rb
index 5c33a872e5..47bf76bdbf 100644
--- a/actionpack/lib/action_dispatch/journey/nfa/dot.rb
+++ b/actionpack/lib/action_dispatch/journey/nfa/dot.rb
@@ -16,9 +16,9 @@ module ActionDispatch
           #  end
           #  "  #{n.object_id} [label=\"#{label}\", shape=box];"
           #}
-          #memo_edges = memos.map { |k, memos|
+          #memo_edges = memos.flat_map { |k, memos|
           #  (memos || []).map { |v| "  #{k} -> #{v.object_id};" }
-          #}.flatten.uniq
+          #}.uniq
 
         <<-eodot
 digraph nfa {
diff --git a/actionpack/lib/action_dispatch/journey/nfa/simulator.rb b/actionpack/lib/action_dispatch/journey/nfa/simulator.rb
index 5b40da6569..b23270db3c 100644
--- a/actionpack/lib/action_dispatch/journey/nfa/simulator.rb
+++ b/actionpack/lib/action_dispatch/journey/nfa/simulator.rb
@@ -34,7 +34,7 @@ module ActionDispatch
 
           return if acceptance_states.empty?
 
-          memos = acceptance_states.map { |x| tt.memo(x) }.flatten.compact
+          memos = acceptance_states.flat_map { |x| tt.memo(x) }.compact
 
           MatchData.new(memos)
         end
diff --git a/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb b/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb
index a3017aeea1..66e414213a 100644
--- a/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb
+++ b/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb
@@ -42,7 +42,7 @@ module ActionDispatch
         end
 
         def states
-          (@table.keys + @table.values.map(&:keys).flatten).uniq
+          (@table.keys + @table.values.flat_map(&:keys)).uniq
         end
 
         # Returns a generalized transition graph with reduced states. The states
@@ -93,7 +93,7 @@ module ActionDispatch
         # Returns set of NFA states to which there is a transition on ast symbol
         # +a+ from some state +s+ in +t+.
         def following_states(t, a)
-          Array(t).map { |s| inverted[s][a] }.flatten.uniq
+          Array(t).flat_map { |s| inverted[s][a] }.uniq
         end
 
         # Returns set of NFA states to which there is a transition on ast symbol
@@ -107,7 +107,7 @@ module ActionDispatch
         end
 
         def alphabet
-          inverted.values.map(&:keys).flatten.compact.uniq.sort_by { |x| x.to_s }
+          inverted.values.flat_map(&:keys).compact.uniq.sort_by { |x| x.to_s }
         end
 
         # Returns a set of NFA states reachable from some NFA state +s+ in set
@@ -131,9 +131,9 @@ module ActionDispatch
         end
 
         def transitions
-          @table.map { |to, hash|
+          @table.flat_map { |to, hash|
             hash.map { |from, sym| [from, sym, to] }
-          }.flatten(1)
+          }
         end
 
         private
diff --git a/actionpack/lib/action_dispatch/journey/path/pattern.rb b/actionpack/lib/action_dispatch/journey/path/pattern.rb
index d37aa1fbe5..fb155e516f 100644
--- a/actionpack/lib/action_dispatch/journey/path/pattern.rb
+++ b/actionpack/lib/action_dispatch/journey/path/pattern.rb
@@ -53,9 +53,9 @@ module ActionDispatch
         end
 
         def optional_names
-          @optional_names ||= spec.grep(Nodes::Group).map { |group|
+          @optional_names ||= spec.grep(Nodes::Group).flat_map { |group|
             group.grep(Nodes::Symbol)
-          }.flatten.map { |n| n.name }.uniq
+          }.map { |n| n.name }.uniq
         end
 
         class RegexpOffsets < Journey::Visitors::Visitor # :nodoc:
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 18e64704f6..c0039fa3f5 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -74,7 +74,7 @@ module ActionDispatch
   #
   #     domain: nil  # Does not sets cookie domain. (default)
   #     domain: :all # Allow the cookie for the top most level
-  #                       domain and subdomains.
+  #                  # domain and subdomains.
   #
   # * <tt>:expires</tt> - The time at which this cookie expires, as a \Time object.
   # * <tt>:secure</tt> - Whether this cookie is only transmitted to HTTPS servers.
@@ -237,6 +237,15 @@ module ActionDispatch
         @secure = secure
         @options = options
         @cookies = {}
+        @committed = false
+      end
+
+      def committed?; @committed; end
+
+      def commit!
+        @committed = true
+        @set_cookies.freeze
+        @delete_cookies.freeze
       end
 
       def each(&block)
@@ -336,8 +345,8 @@ module ActionDispatch
       end
 
       def recycle! #:nodoc:
-        @set_cookies.clear
-        @delete_cookies.clear
+        @set_cookies = {}
+        @delete_cookies = {}
       end
 
       mattr_accessor :always_write_cookie
@@ -551,9 +560,11 @@ module ActionDispatch
       status, headers, body = @app.call(env)
 
       if cookie_jar = env['action_dispatch.cookies']
-        cookie_jar.write(headers)
-        if headers[HTTP_HEADER].respond_to?(:join)
-          headers[HTTP_HEADER] = headers[HTTP_HEADER].join("\n")
+        unless cookie_jar.committed?
+          cookie_jar.write(headers)
+          if headers[HTTP_HEADER].respond_to?(:join)
+            headers[HTTP_HEADER] = headers[HTTP_HEADER].join("\n")
+          end
         end
       end
 
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 0b762aa9a4..357829e59f 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -708,7 +708,8 @@ module ActionDispatch
           options[:constraints] ||= {}
 
           unless shallow?
-            options[:shallow_path] = options[:path] if args.any?
+            options[:shallow_path] ||= options[:path] if options.key?(:path)
+            options[:shallow_prefix] ||= options[:as] if options.key?(:as)
           end
 
           if options[:constraints].is_a?(Hash)
@@ -792,9 +793,16 @@ module ActionDispatch
         #   end
         def namespace(path, options = {})
           path = path.to_s
-          options = { :path => path, :as => path, :module => path,
-                      :shallow_path => path, :shallow_prefix => path }.merge!(options)
-          scope(options) { yield }
+
+          defaults = {
+            module:         path,
+            path:           options.fetch(:path, path),
+            as:             options.fetch(:as, path),
+            shallow_path:   options.fetch(:path, path),
+            shallow_prefix: options.fetch(:as, path)
+          }
+
+          scope(defaults.merge!(options)) { yield }
         end
 
         # === Parameter Restriction
@@ -1323,8 +1331,10 @@ module ActionDispatch
           end
 
           with_scope_level(:member) do
-            scope(parent_resource.member_scope) do
-              yield
+            if shallow?
+              shallow_scope(parent_resource.member_scope) { yield }
+            else
+              scope(parent_resource.member_scope) { yield }
             end
           end
         end
@@ -1347,16 +1357,8 @@ module ActionDispatch
           end
 
           with_scope_level(:nested) do
-            if shallow?
-              with_exclusive_scope do
-                if @scope[:shallow_path].blank?
-                  scope(parent_resource.nested_scope, nested_options) { yield }
-                else
-                  scope(@scope[:shallow_path], :as => @scope[:shallow_prefix]) do
-                    scope(parent_resource.nested_scope, nested_options) { yield }
-                  end
-                end
-              end
+            if shallow? && nesting_depth > 1
+              shallow_scope(parent_resource.nested_scope, nested_options) { yield }
             else
               scope(parent_resource.nested_scope, nested_options) { yield }
             end
@@ -1558,21 +1560,23 @@ module ActionDispatch
             end
           end
 
-          def with_scope_level(kind, resource = parent_resource)
+          def with_scope_level(kind)
             old, @scope[:scope_level] = @scope[:scope_level], kind
-            old_resource, @scope[:scope_level_resource] = @scope[:scope_level_resource], resource
             yield
           ensure
             @scope[:scope_level] = old
-            @scope[:scope_level_resource] = old_resource
           end
 
           def resource_scope(kind, resource) #:nodoc:
-            with_scope_level(kind, resource) do
-              scope(parent_resource.resource_scope) do
-                yield
-              end
+            old_resource, @scope[:scope_level_resource] = @scope[:scope_level_resource], resource
+            @nesting.push(resource)
+
+            with_scope_level(kind) do
+              scope(parent_resource.resource_scope) { yield }
             end
+          ensure
+            @nesting.pop
+            @scope[:scope_level_resource] = old_resource
           end
 
           def nested_options #:nodoc:
@@ -1584,6 +1588,10 @@ module ActionDispatch
             options
           end
 
+          def nesting_depth #:nodoc:
+            @nesting.size
+          end
+
           def param_constraint? #:nodoc:
             @scope[:constraints] && @scope[:constraints][parent_resource.param].is_a?(Regexp)
           end
@@ -1596,18 +1604,20 @@ module ActionDispatch
             flag && resource_method_scope? && CANONICAL_ACTIONS.include?(action.to_s)
           end
 
-          def shallow_scoping? #:nodoc:
-            shallow? && @scope[:scope_level] == :member
+          def shallow_scope(path, options = {}) #:nodoc:
+            old_name_prefix, old_path = @scope[:as], @scope[:path]
+            @scope[:as], @scope[:path] = @scope[:shallow_prefix], @scope[:shallow_path]
+
+            scope(path, options) { yield }
+          ensure
+            @scope[:as], @scope[:path] = old_name_prefix, old_path
           end
 
           def path_for_action(action, path) #:nodoc:
-            prefix = shallow_scoping? ?
-              "#{@scope[:shallow_path]}/#{parent_resource.shallow_scope}" : @scope[:path]
-
             if canonical_action?(action, path.blank?)
-              prefix.to_s
+              @scope[:path].to_s
             else
-              "#{prefix}/#{action_path(action, path)}"
+              "#{@scope[:path]}/#{action_path(action, path)}"
             end
           end
 
@@ -1645,7 +1655,7 @@ module ActionDispatch
             when :new
               [prefix, :new, name_prefix, member_name]
             when :member
-              [prefix, shallow_scoping? ? @scope[:shallow_prefix] : name_prefix, member_name]
+              [prefix, name_prefix, member_name]
             when :root
               [name_prefix, collection_name, prefix]
             else
@@ -1786,6 +1796,7 @@ module ActionDispatch
         @set = set
         @scope = { :path_names => @set.resources_path_names }
         @concerns = {}
+        @nesting = []
       end
 
       include Base
diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
new file mode 100644
index 0000000000..beaf35d3da
--- /dev/null
+++ b/actionpack/lib/action_pack/gem_version.rb
@@ -0,0 +1,15 @@
+module ActionPack
+  # Returns the version of the currently loaded ActionPack as a <tt>Gem::Version</tt>
+  def self.gem_version
+    Gem::Version.new VERSION::STRING
+  end
+
+  module VERSION
+    MAJOR = 4
+    MINOR = 2
+    TINY  = 0
+    PRE   = "alpha"
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
+end
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 75fb0d9532..7088cd2760 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -1,11 +1,8 @@
+require_relative 'gem_version'
+
 module ActionPack
-  # Returns the version of the currently loaded ActionPack as a Gem::Version
+  # Returns the version of the currently loaded ActionPack as a <tt>Gem::Version</tt>
   def self.version
-    Gem::Version.new "4.2.0.alpha"
-  end
-
-  module VERSION #:nodoc:
-    MAJOR, MINOR, TINY, PRE = ActionPack.version.segments
-    STRING = ActionPack.version.to_s
+    gem_version
   end
 end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 57b45b8f7b..591d0eccc3 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -243,8 +243,8 @@ CACHED
   end
 
   private
-    def template_digest(name, format)
-      ActionView::Digestor.digest(name, format, @controller.lookup_context)
+    def template_digest(name, format, variant = nil)
+      ActionView::Digestor.digest(name: name, format: format, variant: variant, finder: @controller.lookup_context)
     end
 end
 
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index fb6a750089..2fd5c930ba 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'active_support/concurrency/latch'
+Thread.abort_on_exception = true
 
 module ActionController
   class SSETest < ActionController::TestCase
@@ -43,9 +44,7 @@ module ActionController
     tests SSETestController
 
     def wait_for_response_stream_close
-      while !response.stream.closed?
-        sleep 0.01
-      end
+      response.body
     end
 
     def test_basic_sse
@@ -91,6 +90,9 @@ module ActionController
   end
 
   class LiveStreamTest < ActionController::TestCase
+    class Exception < StandardError
+    end
+
     class TestController < ActionController::Base
       include ActionController::Live
 
@@ -100,6 +102,12 @@ module ActionController
         'test'
       end
 
+      def set_cookie
+        cookies[:hello] = "world"
+        response.stream.write "hello world"
+        response.close
+      end
+
       def render_text
         render :text => 'zomg'
       end
@@ -153,11 +161,12 @@ module ActionController
           response.stream.close
         end
 
+        response.stream.write "" # make sure the response is committed
         raise 'An exception occurred...'
       end
 
       def exception_in_controller
-        raise 'Exception in controller'
+        raise Exception, 'Exception in controller'
       end
 
       def bad_request_error
@@ -169,24 +178,16 @@ module ActionController
         response.stream.on_error do
           raise 'We need to go deeper.'
         end
+        response.stream.write ''
         response.stream.write params[:widget][:didnt_check_for_nil]
       end
     end
 
     tests TestController
 
-    class TestResponse < Live::Response
-      def recycle!
-        initialize
-      end
-    end
-
-    def build_response
-      TestResponse.new
-    end
-
     def assert_stream_closed
       assert response.stream.closed?, 'stream should be closed'
+      assert response.sent?, 'stream should be sent'
     end
 
     def capture_log_output
@@ -200,6 +201,13 @@ module ActionController
       end
     end
 
+    def test_set_cookie
+      @controller = TestController.new
+      get :set_cookie
+      assert_equal({'hello' => 'world'}, @response.cookies)
+      assert_equal "hello world", @response.body
+    end
+
     def test_set_response!
       @controller.set_response!(@request)
       assert_kind_of(Live::Response, @controller.response)
@@ -221,6 +229,7 @@ module ActionController
       @controller.response = @response
 
       t = Thread.new(@response) { |resp|
+        resp.await_commit
         resp.stream.each do |part|
           assert_equal parts.shift, part
           ol = @controller.latch
@@ -257,24 +266,20 @@ module ActionController
     end
 
     def test_exception_handling_html
-      capture_log_output do |output|
+      assert_raises(ActionView::MissingTemplate) do
         get :exception_in_view
-        assert_match %r((window\.location = "/500\.html"</script></html>)$), response.body
-        assert_match 'Missing template test/doesntexist', output.rewind && output.read
-        assert_stream_closed
       end
+      assert response.body
+      assert_stream_closed
     end
 
     def test_exception_handling_plain_text
-      capture_log_output do |output|
+      assert_raises(ActionView::MissingTemplate) do
         get :exception_in_view, format: :json
-        assert_equal '', response.body
-        assert_match 'Missing template test/doesntexist', output.rewind && output.read
-        assert_stream_closed
       end
     end
 
-    def test_exception_callback
+    def test_exception_callback_when_committed
       capture_log_output do |output|
         get :exception_with_callback, format: 'text/event-stream'
         assert_equal %(data: "500 Internal Server Error"\n\n), response.body
@@ -284,16 +289,18 @@ module ActionController
     end
 
     def test_exception_in_controller_before_streaming
-      response = get :exception_in_controller, format: 'text/event-stream'
-      assert_equal 500, response.status
+      assert_raises(ActionController::LiveStreamTest::Exception) do
+        get :exception_in_controller, format: 'text/event-stream'
+      end
     end
 
     def test_bad_request_in_controller_before_streaming
-      response = get :bad_request_error, format: 'text/event-stream'
-      assert_equal 400, response.status
+      assert_raises(ActionController::BadRequest) do
+        get :bad_request_error, format: 'text/event-stream'
+      end
     end
 
-    def test_exceptions_raised_handling_exceptions
+    def test_exceptions_raised_handling_exceptions_and_committed
       capture_log_output do |output|
         get :exception_in_exception_callback, format: 'text/event-stream'
         assert_equal '', response.body
@@ -313,4 +320,11 @@ module ActionController
       assert_equal 304, @response.status.to_i
     end
   end
+
+  class BufferTest < ActionController::TestCase
+    def test_nil_callback
+      buf = ActionController::Live::Buffer.new nil
+      assert buf.call_on_error
+    end
+  end
 end
diff --git a/actionpack/test/controller/new_base/render_body_test.rb b/actionpack/test/controller/new_base/render_body_test.rb
index a7e4f87bd9..fad848349a 100644
--- a/actionpack/test/controller/new_base/render_body_test.rb
+++ b/actionpack/test/controller/new_base/render_body_test.rb
@@ -65,6 +65,11 @@ module RenderBody
       render body: "hello world", layout: "greetings"
     end
 
+    def with_custom_content_type
+      response.headers['Content-Type'] = 'application/json'
+      render body: '["troll","face"]'
+    end
+
     def with_ivar_in_layout
       @ivar = "hello world"
       render body: "hello world", layout: "ivar"
@@ -141,6 +146,13 @@ module RenderBody
       assert_status 200
     end
 
+    test "specified content type should not be removed" do
+      get "/render_body/with_layout/with_custom_content_type"
+
+      assert_equal %w{ troll face }, JSON.parse(response.body)
+      assert_equal 'application/json', response.headers['Content-Type']
+    end
+
     test "rendering body with layout: false" do
       get "/render_body/with_layout/with_layout_false"
 
@@ -154,22 +166,5 @@ module RenderBody
       assert_body "hello world"
       assert_status 200
     end
-
-    test "rendering from minimal controller returns response with no content type" do
-      get "/render_body/minimal/index"
-
-      assert_header_no_content_type
-    end
-
-    test "rendering from normal controller returns response with no content type" do
-      get "/render_body/simple/index"
-
-      assert_header_no_content_type
-    end
-
-    def assert_header_no_content_type
-      assert_not response.headers.has_key?("Content-Type"),
-        %(Expect response not to have Content-Type header, got "#{response.headers["Content-Type"]}")
-    end
   end
 end
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 1f5fc06410..99229b3baf 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -289,6 +289,22 @@ module RequestForgeryProtectionTests
     end
   end
 
+  def test_should_not_warn_if_csrf_logging_disabled
+    old_logger = ActionController::Base.logger
+    logger = ActiveSupport::LogSubscriber::TestHelper::MockLogger.new
+    ActionController::Base.logger = logger
+    ActionController::Base.log_warning_on_csrf_failure = false
+
+    begin
+      assert_blocked { post :index }
+
+      assert_equal 0, logger.logged(:warn).size
+    ensure
+      ActionController::Base.logger = old_logger
+      ActionController::Base.log_warning_on_csrf_failure = true
+    end
+  end
+
   def test_should_only_allow_same_origin_js_get_with_xhr_header
     assert_cross_origin_blocked { get :same_origin_js }
     assert_cross_origin_blocked { get :same_origin_js, format: 'js' }
diff --git a/actionpack/test/dispatch/live_response_test.rb b/actionpack/test/dispatch/live_response_test.rb
index e0cfb73acf..512f3a8a7a 100644
--- a/actionpack/test/dispatch/live_response_test.rb
+++ b/actionpack/test/dispatch/live_response_test.rb
@@ -6,6 +6,7 @@ module ActionController
     class ResponseTest < ActiveSupport::TestCase
       def setup
         @response = Live::Response.new
+        @response.request = ActionDispatch::Request.new({}) #yolo
       end
 
       def test_header_merge
@@ -34,6 +35,7 @@ module ActionController
           @response.stream.close
         }
 
+        @response.await_commit
         @response.each do |part|
           assert_equal 'foo', part
           latch.release
@@ -58,21 +60,30 @@ module ActionController
         assert_nil @response.headers['Content-Length']
       end
 
-      def test_headers_cannot_be_written_after_write
+      def test_headers_cannot_be_written_after_webserver_reads
         @response.stream.write 'omg'
+        latch = ActiveSupport::Concurrency::Latch.new
 
+        t = Thread.new {
+          @response.stream.each do |chunk|
+            latch.release
+          end
+        }
+
+        latch.await
         assert @response.headers.frozen?
         e = assert_raises(ActionDispatch::IllegalStateError) do
           @response.headers['Content-Length'] = "zomg"
         end
 
         assert_equal 'header already sent', e.message
+        @response.stream.close
+        t.join
       end
 
       def test_headers_cannot_be_written_after_close
         @response.stream.close
 
-        assert @response.headers.frozen?
         e = assert_raises(ActionDispatch::IllegalStateError) do
           @response.headers['Content-Length'] = "zomg"
         end
diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb
deleted file mode 100644
index ef1964fd19..0000000000
--- a/actionpack/test/dispatch/rack_test.rb
+++ /dev/null
@@ -1,191 +0,0 @@
-require 'abstract_unit'
-
-# TODO: Merge these tests into RequestTest
-
-class BaseRackTest < ActiveSupport::TestCase
-  def setup
-    @env = {
-      "HTTP_MAX_FORWARDS" => "10",
-      "SERVER_NAME" => "glu.ttono.us",
-      "FCGI_ROLE" => "RESPONDER",
-      "AUTH_TYPE" => "Basic",
-      "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
-      "HTTP_ACCEPT_CHARSET" => "UTF-8",
-      "HTTP_ACCEPT_ENCODING" => "gzip, deflate",
-      "HTTP_CACHE_CONTROL" => "no-cache, max-age=0",
-      "HTTP_PRAGMA" => "no-cache",
-      "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)",
-      "PATH_INFO" => "/homepage/",
-      "HTTP_ACCEPT_LANGUAGE" => "en",
-      "HTTP_NEGOTIATE" => "trans",
-      "HTTP_HOST" => "glu.ttono.us:8007",
-      "HTTP_REFERER" => "http://www.google.com/search?q=glu.ttono.us",
-      "HTTP_FROM" => "googlebot",
-      "SERVER_PROTOCOL" => "HTTP/1.1",
-      "REDIRECT_URI" => "/dispatch.fcgi",
-      "SCRIPT_NAME" => "/dispatch.fcgi",
-      "SERVER_ADDR" => "207.7.108.53",
-      "REMOTE_ADDR" => "207.7.108.53",
-      "REMOTE_HOST" => "google.com",
-      "REMOTE_IDENT" => "kevin",
-      "REMOTE_USER" => "kevin",
-      "SERVER_SOFTWARE" => "lighttpd/1.4.5",
-      "HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes",
-      "HTTP_X_FORWARDED_SERVER" => "glu.ttono.us",
-      "REQUEST_URI" => "/admin",
-      "DOCUMENT_ROOT" => "/home/kevinc/sites/typo/public",
-      "PATH_TRANSLATED" => "/home/kevinc/sites/typo/public/homepage/",
-      "SERVER_PORT" => "8007",
-      "QUERY_STRING" => "",
-      "REMOTE_PORT" => "63137",
-      "GATEWAY_INTERFACE" => "CGI/1.1",
-      "HTTP_X_FORWARDED_FOR" => "65.88.180.234",
-      "HTTP_ACCEPT" => "*/*",
-      "SCRIPT_FILENAME" => "/home/kevinc/sites/typo/public/dispatch.fcgi",
-      "REDIRECT_STATUS" => "200",
-      "REQUEST_METHOD" => "GET"
-    }
-    @request = ActionDispatch::Request.new(@env)
-    # some Nokia phone browsers omit the space after the semicolon separator.
-    # some developers have grown accustomed to using comma in cookie values.
-    @alt_cookie_fmt_request = ActionDispatch::Request.new(@env.merge({"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}))
-  end
-
-  private
-    def set_content_data(data)
-      @request.env['REQUEST_METHOD'] = 'POST'
-      @request.env['CONTENT_LENGTH'] = data.length
-      @request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
-      @request.env['rack.input'] = StringIO.new(data)
-    end
-end
-
-class RackRequestTest < BaseRackTest
-  test "proxy request" do
-    assert_equal 'glu.ttono.us', @request.host_with_port
-  end
-
-  test "http host" do
-    @env.delete "HTTP_X_FORWARDED_HOST"
-    @env['HTTP_HOST'] = "rubyonrails.org:8080"
-    assert_equal "rubyonrails.org", @request.host
-    assert_equal "rubyonrails.org:8080", @request.host_with_port
-
-    @env['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org"
-    assert_equal "www.secondhost.org", @request.host
-  end
-
-  test "http host with default port overrides server port" do
-    @env.delete "HTTP_X_FORWARDED_HOST"
-    @env['HTTP_HOST'] = "rubyonrails.org"
-    assert_equal "rubyonrails.org", @request.host_with_port
-  end
-
-  test "host with port defaults to server name if no host headers" do
-    @env.delete "HTTP_X_FORWARDED_HOST"
-    @env.delete "HTTP_HOST"
-    assert_equal "glu.ttono.us:8007", @request.host_with_port
-  end
-
-  test "host with port falls back to server addr if necessary" do
-    @env.delete "HTTP_X_FORWARDED_HOST"
-    @env.delete "HTTP_HOST"
-    @env.delete "SERVER_NAME"
-    assert_equal "207.7.108.53", @request.host
-    assert_equal 8007, @request.port
-    assert_equal "207.7.108.53:8007", @request.host_with_port
-  end
-
-  test "host with port if http standard port is specified" do
-    @env['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:80"
-    assert_equal "glu.ttono.us", @request.host_with_port
-  end
-
-  test "host with port if https standard port is specified" do
-    @env['HTTP_X_FORWARDED_PROTO'] = "https"
-    @env['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:443"
-    assert_equal "glu.ttono.us", @request.host_with_port
-  end
-
-  test "host if ipv6 reference" do
-    @env.delete "HTTP_X_FORWARDED_HOST"
-    @env['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]"
-    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
-  end
-
-  test "host if ipv6 reference with port" do
-    @env.delete "HTTP_X_FORWARDED_HOST"
-    @env['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]:8008"
-    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
-  end
-
-  test "CGI environment variables" do
-    assert_equal "Basic", @request.auth_type
-    assert_equal 0, @request.content_length
-    assert_equal nil, @request.content_mime_type
-    assert_equal "CGI/1.1", @request.gateway_interface
-    assert_equal "*/*", @request.accept
-    assert_equal "UTF-8", @request.accept_charset
-    assert_equal "gzip, deflate", @request.accept_encoding
-    assert_equal "en", @request.accept_language
-    assert_equal "no-cache, max-age=0", @request.cache_control
-    assert_equal "googlebot", @request.from
-    assert_equal "glu.ttono.us", @request.host
-    assert_equal "trans", @request.negotiate
-    assert_equal "no-cache", @request.pragma
-    assert_equal "http://www.google.com/search?q=glu.ttono.us", @request.referer
-    assert_equal "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)", @request.user_agent
-    assert_equal "/homepage/", @request.path_info
-    assert_equal "/home/kevinc/sites/typo/public/homepage/", @request.path_translated
-    assert_equal "", @request.query_string
-    assert_equal "207.7.108.53", @request.remote_addr
-    assert_equal "google.com", @request.remote_host
-    assert_equal "kevin", @request.remote_ident
-    assert_equal "kevin", @request.remote_user
-    assert_equal "GET", @request.request_method
-    assert_equal "/dispatch.fcgi", @request.script_name
-    assert_equal "glu.ttono.us", @request.server_name
-    assert_equal 8007, @request.server_port
-    assert_equal "HTTP/1.1", @request.server_protocol
-    assert_equal "lighttpd", @request.server_software
-  end
-
-  test "cookie syntax resilience" do
-    cookies = @request.cookies
-    assert_equal "c84ace84796670c052c6ceb2451fb0f2", cookies["_session_id"], cookies.inspect
-    assert_equal "yes", cookies["is_admin"], cookies.inspect
-
-    alt_cookies = @alt_cookie_fmt_request.cookies
-    #assert_equal "c84ace847,96670c052c6ceb2451fb0f2", alt_cookies["_session_id"], alt_cookies.inspect
-    assert_equal "yes", alt_cookies["is_admin"], alt_cookies.inspect
-  end
-end
-
-class RackRequestParamsParsingTest < BaseRackTest
-  test "doesnt break when content type has charset" do
-    set_content_data 'flamenco=love'
-
-    assert_equal({"flamenco"=> "love"}, @request.request_parameters)
-  end
-
-  test "doesnt interpret request uri as query string when missing" do
-    @request.env['REQUEST_URI'] = 'foo'
-    assert_equal({}, @request.query_parameters)
-  end
-end
-
-class RackRequestNeedsRewoundTest < BaseRackTest
-  test "body should be rewound" do
-    data = 'foo'
-    @env['rack.input'] = StringIO.new(data)
-    @env['CONTENT_LENGTH'] = data.length
-    @env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
-
-    # Read the request body by parsing params.
-    request = ActionDispatch::Request.new(@env)
-    request.request_parameters
-
-    # Should have rewound the body.
-    assert_equal 0, request.body.pos
-  end
-end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 40e32cb4d3..6e21b4a258 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -1,12 +1,34 @@
 require 'abstract_unit'
 
-class RequestTest < ActiveSupport::TestCase
+class BaseRequestTest < ActiveSupport::TestCase
+  def setup
+    @env = {
+      :ip_spoofing_check => true,
+      :tld_length => 1,
+      "rack.input" => "foo"
+    }
+  end
 
   def url_for(options = {})
     options = { host: 'www.example.com' }.merge!(options)
     ActionDispatch::Http::URL.url_for(options)
   end
 
+  protected
+    def stub_request(env = {})
+      ip_spoofing_check = env.key?(:ip_spoofing_check) ? env.delete(:ip_spoofing_check) : true
+      @trusted_proxies ||= nil
+      ip_app = ActionDispatch::RemoteIp.new(Proc.new { }, ip_spoofing_check, @trusted_proxies)
+      tld_length = env.key?(:tld_length) ? env.delete(:tld_length) : 1
+      ip_app.call(env)
+      ActionDispatch::Http::URL.tld_length = tld_length
+
+      env = @env.merge(env)
+      ActionDispatch::Request.new(env)
+    end
+end
+
+class RequestUrlFor < BaseRequestTest
   test "url_for class method" do
     e = assert_raise(ArgumentError) { url_for(:host => nil) }
     assert_match(/Please provide the :host parameter/, e.message)
@@ -31,7 +53,9 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal 'http://www.example.com?params=',  url_for(:params => '')
     assert_equal 'http://www.example.com?params=1', url_for(:params => 1)
   end
+end
 
+class RequestIP < BaseRequestTest
   test "remote ip" do
     request = stub_request 'REMOTE_ADDR' => '1.2.3.4'
     assert_equal '1.2.3.4', request.remote_ip
@@ -220,10 +244,12 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "remote ip middleware not present still returns an IP" do
-    request = ActionDispatch::Request.new({'REMOTE_ADDR' => '127.0.0.1'})
+    request = stub_request('REMOTE_ADDR' => '127.0.0.1')
     assert_equal '127.0.0.1', request.remote_ip
   end
+end
 
+class RequestDomain < BaseRequestTest
   test "domains" do
     request = stub_request 'HTTP_HOST' => 'www.rubyonrails.org'
     assert_equal "rubyonrails.org", request.domain
@@ -281,7 +307,9 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal [], request.subdomains
     assert_equal "", request.subdomain
   end
+end
 
+class RequestPort < BaseRequestTest
   test "standard_port" do
     request = stub_request
     assert_equal 80, request.standard_port
@@ -323,7 +351,9 @@ class RequestTest < ActiveSupport::TestCase
     request = stub_request 'HTTP_HOST' => 'www.example.org:8080'
     assert_equal ':8080', request.port_string
   end
+end
 
+class RequestPath < BaseRequestTest
   test "full path" do
     request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/path/of/some/uri', 'QUERY_STRING' => 'mapped=1'
     assert_equal "/path/of/some/uri?mapped=1", request.fullpath
@@ -354,6 +384,32 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal "/of/some/uri",               request.path_info
   end
 
+  test "original_fullpath returns ORIGINAL_FULLPATH" do
+    request = stub_request('ORIGINAL_FULLPATH' => "/foo?bar")
+
+    path = request.original_fullpath
+    assert_equal "/foo?bar", path
+  end
+
+  test "original_url returns url built using ORIGINAL_FULLPATH" do
+    request = stub_request('ORIGINAL_FULLPATH' => "/foo?bar",
+                           'HTTP_HOST'         => "example.org",
+                           'rack.url_scheme'   => "http")
+
+    url = request.original_url
+    assert_equal "http://example.org/foo?bar", url
+  end
+
+  test "original_fullpath returns fullpath if ORIGINAL_FULLPATH is not present" do
+    request = stub_request('PATH_INFO'    => "/foo",
+                           'QUERY_STRING' => "bar")
+
+    path = request.original_fullpath
+    assert_equal "/foo?bar", path
+  end
+end
+
+class RequestHost < BaseRequestTest
   test "host with default port" do
     request = stub_request 'HTTP_HOST' => 'rubyonrails.org:80'
     assert_equal "rubyonrails.org", request.host_with_port
@@ -364,15 +420,174 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal "rubyonrails.org:81", request.host_with_port
   end
 
-  test "server software" do
-    request = stub_request
-    assert_equal nil, request.server_software
+  test "proxy request" do
+    request = stub_request 'HTTP_HOST' => 'glu.ttono.us:80'
+    assert_equal "glu.ttono.us", request.host_with_port
+  end
+
+  test "http host" do
+    request = stub_request 'HTTP_HOST' => "rubyonrails.org:8080"
+    assert_equal "rubyonrails.org", request.host
+    assert_equal "rubyonrails.org:8080", request.host_with_port
+
+    request = stub_request 'HTTP_X_FORWARDED_HOST' => "www.firsthost.org, www.secondhost.org"
+    assert_equal "www.secondhost.org", request.host
+  end
+
+  test "http host with default port overrides server port" do
+    request = stub_request 'HTTP_HOST' => "rubyonrails.org"
+    assert_equal "rubyonrails.org", request.host_with_port
+  end
+
+  test "host with port if http standard port is specified" do
+    request = stub_request 'HTTP_X_FORWARDED_HOST' => "glu.ttono.us:80"
+    assert_equal "glu.ttono.us", request.host_with_port
+  end
+
+  test "host with port if https standard port is specified" do
+    request = stub_request(
+      'HTTP_X_FORWARDED_PROTO' => "https",
+      'HTTP_X_FORWARDED_HOST' => "glu.ttono.us:443"
+    )
+    assert_equal "glu.ttono.us", request.host_with_port
+  end
+
+  test "host if ipv6 reference" do
+    request = stub_request 'HTTP_HOST' => "[2001:1234:5678:9abc:def0::dead:beef]"
+    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", request.host
+  end
+
+  test "host if ipv6 reference with port" do
+    request = stub_request 'HTTP_HOST' => "[2001:1234:5678:9abc:def0::dead:beef]:8008"
+    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", request.host
+  end
+end
+
+class RequestCGI < BaseRequestTest
+  test "CGI environment variables" do
+    request = stub_request(
+      "AUTH_TYPE" => "Basic",
+      "GATEWAY_INTERFACE" => "CGI/1.1",
+      "HTTP_ACCEPT" => "*/*",
+      "HTTP_ACCEPT_CHARSET" => "UTF-8",
+      "HTTP_ACCEPT_ENCODING" => "gzip, deflate",
+      "HTTP_ACCEPT_LANGUAGE" => "en",
+      "HTTP_CACHE_CONTROL" => "no-cache, max-age=0",
+      "HTTP_FROM" => "googlebot",
+      "HTTP_HOST" => "glu.ttono.us:8007",
+      "HTTP_NEGOTIATE" => "trans",
+      "HTTP_PRAGMA" => "no-cache",
+      "HTTP_REFERER" => "http://www.google.com/search?q=glu.ttono.us",
+      "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)",
+      "PATH_INFO" => "/homepage/",
+      "PATH_TRANSLATED" => "/home/kevinc/sites/typo/public/homepage/",
+      "QUERY_STRING" => "",
+      "REMOTE_ADDR" => "207.7.108.53",
+      "REMOTE_HOST" => "google.com",
+      "REMOTE_IDENT" => "kevin",
+      "REMOTE_USER" => "kevin",
+      "REQUEST_METHOD" => "GET",
+      "SCRIPT_NAME" => "/dispatch.fcgi",
+      "SERVER_NAME" => "glu.ttono.us",
+      "SERVER_PORT" => "8007",
+      "SERVER_PROTOCOL" => "HTTP/1.1",
+      "SERVER_SOFTWARE" => "lighttpd/1.4.5",
+    )
+
+    assert_equal "Basic", request.auth_type
+    assert_equal 0, request.content_length
+    assert_equal nil, request.content_mime_type
+    assert_equal "CGI/1.1", request.gateway_interface
+    assert_equal "*/*", request.accept
+    assert_equal "UTF-8", request.accept_charset
+    assert_equal "gzip, deflate", request.accept_encoding
+    assert_equal "en", request.accept_language
+    assert_equal "no-cache, max-age=0", request.cache_control
+    assert_equal "googlebot", request.from
+    assert_equal "glu.ttono.us", request.host
+    assert_equal "trans", request.negotiate
+    assert_equal "no-cache", request.pragma
+    assert_equal "http://www.google.com/search?q=glu.ttono.us", request.referer
+    assert_equal "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)", request.user_agent
+    assert_equal "/homepage/", request.path_info
+    assert_equal "/home/kevinc/sites/typo/public/homepage/", request.path_translated
+    assert_equal "", request.query_string
+    assert_equal "207.7.108.53", request.remote_addr
+    assert_equal "google.com", request.remote_host
+    assert_equal "kevin", request.remote_ident
+    assert_equal "kevin", request.remote_user
+    assert_equal "GET", request.request_method
+    assert_equal "/dispatch.fcgi", request.script_name
+    assert_equal "glu.ttono.us", request.server_name
+    assert_equal 8007, request.server_port
+    assert_equal "HTTP/1.1", request.server_protocol
+    assert_equal "lighttpd", request.server_software
+  end
+end
+
+class RequestCookie < BaseRequestTest
+  test "cookie syntax resilience" do
+    request = stub_request("HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes")
+    assert_equal "c84ace84796670c052c6ceb2451fb0f2", request.cookies["_session_id"], request.cookies.inspect
+    assert_equal "yes", request.cookies["is_admin"], request.cookies.inspect
+
+    # some Nokia phone browsers omit the space after the semicolon separator.
+    # some developers have grown accustomed to using comma in cookie values.
+    request = stub_request("HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes")
+    assert_equal "c84ace847", request.cookies["_session_id"], request.cookies.inspect
+    assert_equal "yes", request.cookies["is_admin"], request.cookies.inspect
+  end
+end
+
+class RequestParamsParsing < BaseRequestTest
+  test "doesnt break when content type has charset" do
+    request = stub_request(
+      'REQUEST_METHOD' => 'POST',
+      'CONTENT_LENGTH' => "flamenco=love".length,
+      'CONTENT_TYPE' => 'application/x-www-form-urlencoded; charset=utf-8',
+      'rack.input' => StringIO.new("flamenco=love")
+    )
+
+    assert_equal({"flamenco"=> "love"}, request.request_parameters)
+  end
+
+  test "doesnt interpret request uri as query string when missing" do
+    request = stub_request('REQUEST_URI' => 'foo')
+    assert_equal({}, request.query_parameters)
+  end
+end
 
-    request = stub_request 'SERVER_SOFTWARE' => 'Apache3.422'
-    assert_equal 'apache', request.server_software
+class RequestRewind < BaseRequestTest
+  test "body should be rewound" do
+    data = 'rewind'
+    env = {
+      'rack.input' => StringIO.new(data),
+      'CONTENT_LENGTH' => data.length,
+      'CONTENT_TYPE' => 'application/x-www-form-urlencoded; charset=utf-8'
+    }
+
+    # Read the request body by parsing params.
+    request = stub_request(env)
+    request.request_parameters
+
+    # Should have rewound the body.
+    assert_equal 0, request.body.pos
+  end
+
+  test "raw_post rewinds rack.input if RAW_POST_DATA is nil" do
+    request = stub_request(
+      'rack.input' => StringIO.new("raw"),
+      'CONTENT_LENGTH' => 3
+    )
+    assert_equal "raw", request.raw_post
+    assert_equal "raw", request.env['rack.input'].read
+  end
+end
 
-    request = stub_request 'SERVER_SOFTWARE' => 'lighttpd(1.1.4)'
-    assert_equal 'lighttpd', request.server_software
+class RequestProtocol < BaseRequestTest
+  test "server software" do
+    assert_equal 'lighttpd', stub_request('SERVER_SOFTWARE' => 'lighttpd/1.4.5').server_software
+    assert_equal 'apache', stub_request('SERVER_SOFTWARE' => 'Apache3.422').server_software
   end
 
   test "xml http request" do
@@ -391,19 +606,12 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "reports ssl" do
-    request = stub_request
-    assert !request.ssl?
-
-    request = stub_request 'HTTPS' => 'on'
-    assert request.ssl?
+    assert !stub_request.ssl?
+    assert stub_request('HTTPS' => 'on').ssl?
   end
 
   test "reports ssl when proxied via lighttpd" do
-    request = stub_request
-    assert !request.ssl?
-
-    request = stub_request 'HTTP_X_FORWARDED_PROTO' => 'https'
-    assert request.ssl?
+    assert stub_request('HTTP_X_FORWARDED_PROTO' => 'https').ssl?
   end
 
   test "scheme returns https when proxied" do
@@ -411,63 +619,72 @@ class RequestTest < ActiveSupport::TestCase
     assert !request.ssl?
     assert_equal 'http', request.scheme
 
-    request = stub_request 'rack.url_scheme' => 'http', 'HTTP_X_FORWARDED_PROTO' => 'https'
+    request = stub_request(
+      'rack.url_scheme' => 'http',
+      'HTTP_X_FORWARDED_PROTO' => 'https'
+    )
     assert request.ssl?
     assert_equal 'https', request.scheme
   end
+end
 
-  test "String request methods" do
-    [:get, :post, :patch, :put, :delete].each do |method|
-      request = stub_request 'REQUEST_METHOD' => method.to_s.upcase
-      assert_equal method.to_s.upcase, request.method
-    end
-  end
+class RequestMethod < BaseRequestTest
+  test "request methods" do
+    [:post, :get, :patch, :put, :delete].each do |method|
+      request = stub_request('REQUEST_METHOD' => method.to_s.upcase)
 
-  test "Symbol forms of request methods via method_symbol" do
-    [:get, :post, :patch, :put, :delete].each do |method|
-      request = stub_request 'REQUEST_METHOD' => method.to_s.upcase
+      assert_equal method.to_s.upcase, request.method
       assert_equal method, request.method_symbol
     end
   end
 
   test "invalid http method raises exception" do
     assert_raise(ActionController::UnknownHttpMethod) do
-      request = stub_request 'REQUEST_METHOD' => 'RANDOM_METHOD'
-      request.request_method
+      stub_request('REQUEST_METHOD' => 'RANDOM_METHOD').request_method
     end
   end
 
   test "allow method hacking on post" do
     %w(GET OPTIONS PATCH PUT POST DELETE).each do |method|
-      request = stub_request "REQUEST_METHOD" => method.to_s.upcase
+      request = stub_request 'REQUEST_METHOD' => method.to_s.upcase
+
       assert_equal(method == "HEAD" ? "GET" : method, request.method)
     end
   end
 
   test "invalid method hacking on post raises exception" do
     assert_raise(ActionController::UnknownHttpMethod) do
-      request = stub_request "REQUEST_METHOD" => "_RANDOM_METHOD"
-      request.request_method
+      stub_request('REQUEST_METHOD' => '_RANDOM_METHOD').request_method
     end
   end
 
   test "restrict method hacking" do
     [:get, :patch, :put, :delete].each do |method|
-      request = stub_request 'REQUEST_METHOD' => method.to_s.upcase,
-        'action_dispatch.request.request_parameters' => { :_method => 'put' }
+      request = stub_request(
+        'action_dispatch.request.request_parameters' => { :_method => 'put' },
+        'REQUEST_METHOD' => method.to_s.upcase
+      )
+
       assert_equal method.to_s.upcase, request.method
     end
   end
 
   test "post masquerading as patch" do
-    request = stub_request 'REQUEST_METHOD' => 'PATCH', "rack.methodoverride.original_method" => "POST"
+    request = stub_request(
+      'REQUEST_METHOD' => 'PATCH',
+      "rack.methodoverride.original_method" => "POST"
+    )
+
     assert_equal "POST", request.method
     assert_equal "PATCH",  request.request_method
     assert request.patch?
   end
 
   test "post masquerading as put" do
-    request = stub_request 'REQUEST_METHOD' => 'PUT', "rack.methodoverride.original_method" => "POST"
+    request = stub_request(
+      'REQUEST_METHOD' => 'PUT',
+      "rack.methodoverride.original_method" => "POST"
+    )
     assert_equal "POST", request.method
     assert_equal "PUT",  request.request_method
     assert request.put?
@@ -493,7 +710,9 @@ class RequestTest < ActiveSupport::TestCase
       end
     end
   end
+end
 
+class RequestFormat < BaseRequestTest
   test "xml format" do
     request = stub_request
     request.expects(:parameters).at_least_once.returns({ :format => 'xml' })
@@ -513,109 +732,55 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "XMLHttpRequest" do
-    request = stub_request 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest',
-                           'HTTP_ACCEPT' =>
-                             [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(",")
+    request = stub_request(
+      'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest',
+      'HTTP_ACCEPT' => [Mime::JS, Mime::HTML, Mime::XML, "text/xml", Mime::ALL].join(",")
+    )
     request.expects(:parameters).at_least_once.returns({})
     assert request.xhr?
     assert_equal Mime::JS, request.format
   end
 
-  test "content type" do
-    request = stub_request 'CONTENT_TYPE' => 'text/html'
-    assert_equal Mime::HTML, request.content_mime_type
-  end
-
-  test "can override format with parameter" do
+  test "can override format with parameter negative" do
     request = stub_request
     request.expects(:parameters).at_least_once.returns({ :format => :txt })
     assert !request.format.xml?
+  end
 
+  test "can override format with parameter positive" do
     request = stub_request
     request.expects(:parameters).at_least_once.returns({ :format => :xml })
     assert request.format.xml?
   end
 
-  test "no content type" do
-    request = stub_request
-    assert_equal nil, request.content_mime_type
-  end
-
-  test "content type is XML" do
-    request = stub_request 'CONTENT_TYPE' => 'application/xml'
-    assert_equal Mime::XML, request.content_mime_type
-  end
-
-  test "content type with charset" do
-    request = stub_request 'CONTENT_TYPE' => 'application/xml; charset=UTF-8'
-    assert_equal Mime::XML, request.content_mime_type
-  end
-
-  test "user agent" do
-    request = stub_request 'HTTP_USER_AGENT' => 'TestAgent'
-    assert_equal 'TestAgent', request.user_agent
-  end
-
-  test "parameters" do
-    request = stub_request
-    request.stubs(:request_parameters).returns({ "foo" => 1 })
-    request.stubs(:query_parameters).returns({ "bar" => 2 })
-
-    assert_equal({"foo" => 1, "bar" => 2}, request.parameters)
-    assert_equal({"foo" => 1}, request.request_parameters)
-    assert_equal({"bar" => 2}, request.query_parameters)
-  end
-
-  test "parameters still accessible after rack parse error" do
-    mock_rack_env = { "QUERY_STRING" => "x[y]=1&x[y][][w]=2", "rack.input" => "foo" }
-    request = nil
-    request = stub_request(mock_rack_env)
-
-    assert_raises(ActionController::BadRequest) do
-      # rack will raise a TypeError when parsing this query string
-      request.parameters
-    end
-
-    assert_equal({}, request.parameters)
-  end
-
-  test "we have access to the original exception" do
-    mock_rack_env = { "QUERY_STRING" => "x[y]=1&x[y][][w]=2", "rack.input" => "foo" }
-    request = nil
-    request = stub_request(mock_rack_env)
-
-    e = assert_raises(ActionController::BadRequest) do
-      # rack will raise a TypeError when parsing this query string
-      request.parameters
-    end
-
-    assert e.original_exception
-    assert_equal e.original_exception.backtrace, e.backtrace
-  end
-
-  test "formats with accept header" do
+  test "formats text/html with accept header" do
     request = stub_request 'HTTP_ACCEPT' => 'text/html'
-    request.expects(:parameters).at_least_once.returns({})
     assert_equal [Mime::HTML], request.formats
+  end
 
+  test "formats blank with accept header" do
     request = stub_request 'HTTP_ACCEPT' => ''
-    request.expects(:parameters).at_least_once.returns({})
     assert_equal [Mime::HTML], request.formats
+  end
 
-    request = stub_request 'HTTP_ACCEPT' => '',
-                           'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
-    request.expects(:parameters).at_least_once.returns({})
+  test "formats XMLHttpRequest with accept header" do
+    request = stub_request 'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
     assert_equal [Mime::JS], request.formats
+  end
 
-    request = stub_request 'CONTENT_TYPE' => 'application/xml; charset=UTF-8',
-                           'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
-    request.expects(:parameters).at_least_once.returns({})
+  test "formats application/xml with accept header" do
+    request = stub_request('CONTENT_TYPE' => 'application/xml; charset=UTF-8',
+                           'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest")
     assert_equal [Mime::XML], request.formats
+  end
 
+  test "formats format:text with accept header" do
     request = stub_request
     request.expects(:parameters).at_least_once.returns({ :format => :txt })
     assert_equal [Mime::TEXT], request.formats
+  end
 
+  test "formats format:unknown with accept header" do
     request = stub_request
     request.expects(:parameters).at_least_once.returns({ :format => :unknown })
     assert_instance_of Mime::NullType, request.format
@@ -669,30 +834,87 @@ class RequestTest < ActiveSupport::TestCase
       ActionDispatch::Request.ignore_accept_header = false
     end
   end
+end
 
-  test "negotiate_mime" do
-    request = stub_request 'HTTP_ACCEPT' => 'text/html',
-                           'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
+class RequestMimeType < BaseRequestTest
+  test "content type" do
+    assert_equal Mime::HTML, stub_request('CONTENT_TYPE' => 'text/html').content_mime_type
+  end
 
-    request.expects(:parameters).at_least_once.returns({})
+  test "no content type" do
+    assert_equal nil, stub_request.content_mime_type
+  end
+
+  test "content type is XML" do
+    assert_equal Mime::XML, stub_request('CONTENT_TYPE' => 'application/xml').content_mime_type
+  end
+
+  test "content type with charset" do
+    assert_equal Mime::XML, stub_request('CONTENT_TYPE' => 'application/xml; charset=UTF-8').content_mime_type
+  end
+
+  test "user agent" do
+    assert_equal 'TestAgent', stub_request('HTTP_USER_AGENT' => 'TestAgent').user_agent
+  end
+
+  test "negotiate_mime" do
+    request = stub_request(
+      'HTTP_ACCEPT' => 'text/html',
+      'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
+    )
 
     assert_equal nil, request.negotiate_mime([Mime::XML, Mime::JSON])
     assert_equal Mime::HTML, request.negotiate_mime([Mime::XML, Mime::HTML])
     assert_equal Mime::HTML, request.negotiate_mime([Mime::XML, Mime::ALL])
+  end
+
+  test "negotiate_mime with content_type" do
+    request = stub_request(
+      'CONTENT_TYPE' => 'application/xml; charset=UTF-8',
+      'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
+    )
 
-    request = stub_request 'CONTENT_TYPE' => 'application/xml; charset=UTF-8',
-                           'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
-    request.expects(:parameters).at_least_once.returns({})
     assert_equal Mime::XML, request.negotiate_mime([Mime::XML, Mime::CSV])
   end
+end
 
-  test "raw_post rewinds rack.input if RAW_POST_DATA is nil" do
-    request = stub_request('rack.input' => StringIO.new("foo"),
-                           'CONTENT_LENGTH' => 3)
-    assert_equal "foo", request.raw_post
-    assert_equal "foo", request.env['rack.input'].read
+class RequestParameters < BaseRequestTest
+  test "parameters" do
+    request = stub_request
+    request.expects(:request_parameters).at_least_once.returns({ "foo" => 1 })
+    request.expects(:query_parameters).at_least_once.returns({ "bar" => 2 })
+
+    assert_equal({"foo" => 1, "bar" => 2}, request.parameters)
+    assert_equal({"foo" => 1}, request.request_parameters)
+    assert_equal({"bar" => 2}, request.query_parameters)
+  end
+
+  test "parameters still accessible after rack parse error" do
+    request = stub_request("QUERY_STRING" => "x[y]=1&x[y][][w]=2")
+
+    assert_raises(ActionController::BadRequest) do
+      # rack will raise a TypeError when parsing this query string
+      request.parameters
+    end
+
+    assert_equal({}, request.parameters)
   end
 
+  test "we have access to the original exception" do
+    request = stub_request("QUERY_STRING" => "x[y]=1&x[y][][w]=2")
+
+    e = assert_raises(ActionController::BadRequest) do
+      # rack will raise a TypeError when parsing this query string
+      request.parameters
+    end
+
+    assert e.original_exception
+    assert_equal e.original_exception.backtrace, e.backtrace
+  end
+end
+
+
+class RequestParameterFilter < BaseRequestTest
   test "process parameter filter" do
     test_hashes = [
     [{'foo'=>'bar'},{'foo'=>'bar'},%w'food'],
@@ -721,9 +943,14 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "filtered_parameters returns params filtered" do
-    request = stub_request('action_dispatch.request.parameters' =>
-      { 'lifo' => 'Pratik', 'amount' => '420', 'step' => '1' },
-      'action_dispatch.parameter_filter' => [:lifo, :amount])
+    request = stub_request(
+      'action_dispatch.request.parameters' => {
+        'lifo' => 'Pratik',
+        'amount' => '420',
+        'step' => '1'
+      },
+      'action_dispatch.parameter_filter' => [:lifo, :amount]
+    )
 
     params = request.filtered_parameters
     assert_equal "[FILTERED]", params["lifo"]
@@ -732,10 +959,14 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "filtered_env filters env as a whole" do
-    request = stub_request('action_dispatch.request.parameters' =>
-      { 'amount' => '420', 'step' => '1' }, "RAW_POST_DATA" => "yada yada",
-      'action_dispatch.parameter_filter' => [:lifo, :amount])
-
+    request = stub_request(
+      'action_dispatch.request.parameters' => {
+        'amount' => '420',
+        'step' => '1'
+      },
+      "RAW_POST_DATA" => "yada yada",
+      'action_dispatch.parameter_filter' => [:lifo, :amount]
+    )
     request = stub_request(request.filtered_env)
 
     assert_equal "[FILTERED]", request.raw_post
@@ -745,9 +976,11 @@ class RequestTest < ActiveSupport::TestCase
 
   test "filtered_path returns path with filtered query string" do
     %w(; &).each do |sep|
-      request = stub_request('QUERY_STRING' => %w(username=sikachu secret=bd4f21f api_key=b1bc3b3cd352f68d79d7).join(sep),
+      request = stub_request(
+        'QUERY_STRING' => %w(username=sikachu secret=bd4f21f api_key=b1bc3b3cd352f68d79d7).join(sep),
         'PATH_INFO' => '/authenticate',
-        'action_dispatch.parameter_filter' => [:secret, :api_key])
+        'action_dispatch.parameter_filter' => [:secret, :api_key]
+      )
 
       path = request.filtered_path
       assert_equal %w(/authenticate?username=sikachu secret=[FILTERED] api_key=[FILTERED]).join(sep), path
@@ -755,56 +988,40 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "filtered_path should not unescape a genuine '[FILTERED]' value" do
-    request = stub_request('QUERY_STRING' => "secret=bd4f21f&genuine=%5BFILTERED%5D",
+    request = stub_request(
+      'QUERY_STRING' => "secret=bd4f21f&genuine=%5BFILTERED%5D",
       'PATH_INFO' => '/authenticate',
-      'action_dispatch.parameter_filter' => [:secret])
+      'action_dispatch.parameter_filter' => [:secret]
+    )
 
     path = request.filtered_path
-    assert_equal "/authenticate?secret=[FILTERED]&genuine=%5BFILTERED%5D", path
+    assert_equal request.script_name + "/authenticate?secret=[FILTERED]&genuine=%5BFILTERED%5D", path
   end
 
   test "filtered_path should preserve duplication of keys in query string" do
-    request = stub_request('QUERY_STRING' => "username=sikachu&secret=bd4f21f&username=fxn",
+    request = stub_request(
+      'QUERY_STRING' => "username=sikachu&secret=bd4f21f&username=fxn",
       'PATH_INFO' => '/authenticate',
-      'action_dispatch.parameter_filter' => [:secret])
+      'action_dispatch.parameter_filter' => [:secret]
+    )
 
     path = request.filtered_path
-    assert_equal "/authenticate?username=sikachu&secret=[FILTERED]&username=fxn", path
+    assert_equal request.script_name + "/authenticate?username=sikachu&secret=[FILTERED]&username=fxn", path
   end
 
   test "filtered_path should ignore searchparts" do
-    request = stub_request('QUERY_STRING' => "secret",
+    request = stub_request(
+      'QUERY_STRING' => "secret",
       'PATH_INFO' => '/authenticate',
-      'action_dispatch.parameter_filter' => [:secret])
+      'action_dispatch.parameter_filter' => [:secret]
+    )
 
     path = request.filtered_path
-    assert_equal "/authenticate?secret", path
-  end
-
-  test "original_fullpath returns ORIGINAL_FULLPATH" do
-    request = stub_request('ORIGINAL_FULLPATH' => "/foo?bar")
-
-    path = request.original_fullpath
-    assert_equal "/foo?bar", path
-  end
-
-  test "original_url returns url built using ORIGINAL_FULLPATH" do
-    request = stub_request('ORIGINAL_FULLPATH' => "/foo?bar",
-                           'HTTP_HOST'         => "example.org",
-                           'rack.url_scheme'   => "http")
-
-    url = request.original_url
-    assert_equal "http://example.org/foo?bar", url
-  end
-
-  test "original_fullpath returns fullpath if ORIGINAL_FULLPATH is not present" do
-    request = stub_request('PATH_INFO'    => "/foo",
-                           'QUERY_STRING' => "bar")
-
-    path = request.original_fullpath
-    assert_equal "/foo?bar", path
+    assert_equal request.script_name + "/authenticate?secret", path
   end
+end
 
+class RequestEtag < BaseRequestTest
   test "if_none_match_etags none" do
     request = stub_request
 
@@ -843,7 +1060,9 @@ class RequestTest < ActiveSupport::TestCase
       assert request.etag_matches?(etag), etag
     end
   end
+end
 
+class RequestVarient < BaseRequestTest
   test "setting variant" do
     request = stub_request
 
@@ -868,16 +1087,4 @@ class RequestTest < ActiveSupport::TestCase
       request.variant = "mobile"
     end
   end
-
-protected
-
-  def stub_request(env = {})
-    ip_spoofing_check = env.key?(:ip_spoofing_check) ? env.delete(:ip_spoofing_check) : true
-    @trusted_proxies ||= nil
-    ip_app = ActionDispatch::RemoteIp.new(Proc.new { }, ip_spoofing_check, @trusted_proxies)
-    tld_length = env.key?(:tld_length) ? env.delete(:tld_length) : 1
-    ip_app.call(env)
-    ActionDispatch::Http::URL.tld_length = tld_length
-    ActionDispatch::Request.new(env)
-  end
 end
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 1360ede3f8..959a3bc5cd 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -235,14 +235,6 @@ class ResponseTest < ActiveSupport::TestCase
       assert_equal @response.body, body.each.to_a.join
     end
   end
-
-  test "does not add default content-type if Content-Type is none" do
-    resp = ActionDispatch::Response.new.tap { |response|
-      response.no_content_type = true
-    }
-
-    assert_not resp.headers.has_key?('Content-Type')
-  end
 end
 
 class ResponseIntegrationTest < ActionDispatch::IntegrationTest
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 1fa2cc6cf2..a47050adce 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1031,6 +1031,136 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal 'users/home#index', @response.body
   end
 
+  def test_namespaced_shallow_routes_with_module_option
+    draw do
+      namespace :foo, module: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/foo/posts'
+    assert_equal '/foo/posts', foo_posts_path
+    assert_equal 'bar/posts#index', @response.body
+
+    get '/foo/posts/1'
+    assert_equal '/foo/posts/1', foo_post_path('1')
+    assert_equal 'bar/posts#show', @response.body
+
+    get '/foo/posts/1/comments'
+    assert_equal '/foo/posts/1/comments', foo_post_comments_path('1')
+    assert_equal 'bar/comments#index', @response.body
+
+    get '/foo/comments/2'
+    assert_equal '/foo/comments/2', foo_comment_path('2')
+    assert_equal 'bar/comments#show', @response.body
+  end
+
+  def test_namespaced_shallow_routes_with_path_option
+    draw do
+      namespace :foo, path: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/bar/posts'
+    assert_equal '/bar/posts', foo_posts_path
+    assert_equal 'foo/posts#index', @response.body
+
+    get '/bar/posts/1'
+    assert_equal '/bar/posts/1', foo_post_path('1')
+    assert_equal 'foo/posts#show', @response.body
+
+    get '/bar/posts/1/comments'
+    assert_equal '/bar/posts/1/comments', foo_post_comments_path('1')
+    assert_equal 'foo/comments#index', @response.body
+
+    get '/bar/comments/2'
+    assert_equal '/bar/comments/2', foo_comment_path('2')
+    assert_equal 'foo/comments#show', @response.body
+  end
+
+  def test_namespaced_shallow_routes_with_as_option
+    draw do
+      namespace :foo, as: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/foo/posts'
+    assert_equal '/foo/posts', bar_posts_path
+    assert_equal 'foo/posts#index', @response.body
+
+    get '/foo/posts/1'
+    assert_equal '/foo/posts/1', bar_post_path('1')
+    assert_equal 'foo/posts#show', @response.body
+
+    get '/foo/posts/1/comments'
+    assert_equal '/foo/posts/1/comments', bar_post_comments_path('1')
+    assert_equal 'foo/comments#index', @response.body
+
+    get '/foo/comments/2'
+    assert_equal '/foo/comments/2', bar_comment_path('2')
+    assert_equal 'foo/comments#show', @response.body
+  end
+
+  def test_namespaced_shallow_routes_with_shallow_path_option
+    draw do
+      namespace :foo, shallow_path: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/foo/posts'
+    assert_equal '/foo/posts', foo_posts_path
+    assert_equal 'foo/posts#index', @response.body
+
+    get '/foo/posts/1'
+    assert_equal '/foo/posts/1', foo_post_path('1')
+    assert_equal 'foo/posts#show', @response.body
+
+    get '/foo/posts/1/comments'
+    assert_equal '/foo/posts/1/comments', foo_post_comments_path('1')
+    assert_equal 'foo/comments#index', @response.body
+
+    get '/bar/comments/2'
+    assert_equal '/bar/comments/2', foo_comment_path('2')
+    assert_equal 'foo/comments#show', @response.body
+  end
+
+  def test_namespaced_shallow_routes_with_shallow_prefix_option
+    draw do
+      namespace :foo, shallow_prefix: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/foo/posts'
+    assert_equal '/foo/posts', foo_posts_path
+    assert_equal 'foo/posts#index', @response.body
+
+    get '/foo/posts/1'
+    assert_equal '/foo/posts/1', foo_post_path('1')
+    assert_equal 'foo/posts#show', @response.body
+
+    get '/foo/posts/1/comments'
+    assert_equal '/foo/posts/1/comments', foo_post_comments_path('1')
+    assert_equal 'foo/comments#index', @response.body
+
+    get '/foo/comments/2'
+    assert_equal '/foo/comments/2', bar_comment_path('2')
+    assert_equal 'foo/comments#show', @response.body
+  end
+
   def test_namespace_containing_numbers
     draw do
       namespace :v2 do
@@ -3033,6 +3163,114 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal '/admin/posts/1/comments', admin_post_comments_path('1')
   end
 
+  def test_shallow_path_and_prefix_are_not_added_to_non_shallow_routes
+    draw do
+      scope shallow_path: 'projects', shallow_prefix: 'project' do
+        resources :projects do
+          resources :files, controller: 'project_files', shallow: true
+        end
+      end
+    end
+
+    get '/projects'
+    assert_equal 'projects#index', @response.body
+    assert_equal '/projects', projects_path
+
+    get '/projects/new'
+    assert_equal 'projects#new', @response.body
+    assert_equal '/projects/new', new_project_path
+
+    post '/projects'
+    assert_equal 'projects#create', @response.body
+
+    get '/projects/1'
+    assert_equal 'projects#show', @response.body
+    assert_equal '/projects/1', project_path('1')
+
+    get '/projects/1/edit'
+    assert_equal 'projects#edit', @response.body
+    assert_equal '/projects/1/edit', edit_project_path('1')
+
+    patch '/projects/1'
+    assert_equal 'projects#update', @response.body
+
+    delete '/projects/1'
+    assert_equal 'projects#destroy', @response.body
+
+    get '/projects/1/files'
+    assert_equal 'project_files#index', @response.body
+    assert_equal '/projects/1/files', project_files_path('1')
+
+    get '/projects/1/files/new'
+    assert_equal 'project_files#new', @response.body
+    assert_equal '/projects/1/files/new', new_project_file_path('1')
+
+    post '/projects/1/files'
+    assert_equal 'project_files#create', @response.body
+
+    get '/projects/files/2'
+    assert_equal 'project_files#show', @response.body
+    assert_equal '/projects/files/2', project_file_path('2')
+
+    get '/projects/files/2/edit'
+    assert_equal 'project_files#edit', @response.body
+    assert_equal '/projects/files/2/edit', edit_project_file_path('2')
+
+    patch '/projects/files/2'
+    assert_equal 'project_files#update', @response.body
+
+    delete '/projects/files/2'
+    assert_equal 'project_files#destroy', @response.body
+  end
+
+  def test_scope_path_is_copied_to_shallow_path
+    draw do
+      scope path: 'foo' do
+        resources :posts do
+          resources :comments, shallow: true
+        end
+      end
+    end
+
+    assert_equal '/foo/comments/1', comment_path('1')
+  end
+
+  def test_scope_as_is_copied_to_shallow_prefix
+    draw do
+      scope as: 'foo' do
+        resources :posts do
+          resources :comments, shallow: true
+        end
+      end
+    end
+
+    assert_equal '/comments/1', foo_comment_path('1')
+  end
+
+  def test_scope_shallow_prefix_is_not_overwritten_by_as
+    draw do
+      scope as: 'foo', shallow_prefix: 'bar' do
+        resources :posts do
+          resources :comments, shallow: true
+        end
+      end
+    end
+
+    assert_equal '/comments/1', bar_comment_path('1')
+  end
+
+  def test_scope_shallow_path_is_not_overwritten_by_path
+    draw do
+      scope path: 'foo', shallow_path: 'bar' do
+        resources :posts do
+          resources :comments, shallow: true
+        end
+      end
+    end
+
+    assert_equal '/bar/comments/1', comment_path('1')
+  end
+
 private
 
   def draw(&block)