From 78af2710695973bbd747738d175fb3b1f488df6c Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 14 Jan 2009 19:00:07 -0800
Subject: Skip respond_to check so rack.input doesn't have to implement it

---
 actionpack/lib/action_controller/rack_ext.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller/rack_ext.rb')

diff --git a/actionpack/lib/action_controller/rack_ext.rb b/actionpack/lib/action_controller/rack_ext.rb
index 3b142307e9..3d6f1f9256 100644
--- a/actionpack/lib/action_controller/rack_ext.rb
+++ b/actionpack/lib/action_controller/rack_ext.rb
@@ -6,8 +6,8 @@ module Rack
           result = parse_multipart_without_rewind(env)
 
           begin
-            env['rack.input'].rewind if env['rack.input'].respond_to?(:rewind)
-          rescue Errno::ESPIPE
+            env['rack.input'].rewind
+          rescue NoMethodError, Errno::ESPIPE
             # Handles exceptions raised by input streams that cannot be rewound
             # such as when using plain CGI under Apache
           end
-- 
cgit v1.2.3


From 515a1a332808eb7c2f9c006fc1903e1e8555b7fa Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 17 Jan 2009 10:16:31 -0600
Subject: Lock middleware has been committed upstream

---
 actionpack/lib/action_controller/rack_ext.rb | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'actionpack/lib/action_controller/rack_ext.rb')

diff --git a/actionpack/lib/action_controller/rack_ext.rb b/actionpack/lib/action_controller/rack_ext.rb
index 3d6f1f9256..17cd08f39a 100644
--- a/actionpack/lib/action_controller/rack_ext.rb
+++ b/actionpack/lib/action_controller/rack_ext.rb
@@ -1,22 +1,2 @@
-module Rack
-  module Utils
-    module Multipart
-      class << self
-        def parse_multipart_with_rewind(env)
-          result = parse_multipart_without_rewind(env)
-
-          begin
-            env['rack.input'].rewind
-          rescue NoMethodError, Errno::ESPIPE
-            # Handles exceptions raised by input streams that cannot be rewound
-            # such as when using plain CGI under Apache
-          end
-
-          result
-        end
-
-        alias_method_chain :parse_multipart, :rewind
-      end
-    end
-  end
-end
+require 'action_controller/rack_ext/lock'
+require 'action_controller/rack_ext/multipart'
-- 
cgit v1.2.3


From ff0a2678c4bce9da348e1263915558795e3a3640 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 17 Jan 2009 20:29:50 -0600
Subject: Build query string and POST params parser on top of Rack::Request.
 Also switch our multipart parser to use Racks. Moved XML, JSON, and YAML
 parsers into ActionController::ParamsParser middleware [#1661 state:resolved]

---
 actionpack/lib/action_controller/rack_ext.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/lib/action_controller/rack_ext.rb')

diff --git a/actionpack/lib/action_controller/rack_ext.rb b/actionpack/lib/action_controller/rack_ext.rb
index 17cd08f39a..2ba6654e3d 100644
--- a/actionpack/lib/action_controller/rack_ext.rb
+++ b/actionpack/lib/action_controller/rack_ext.rb
@@ -1,2 +1,3 @@
 require 'action_controller/rack_ext/lock'
 require 'action_controller/rack_ext/multipart'
+require 'action_controller/rack_ext/parse_query'
-- 
cgit v1.2.3