aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-23 19:09:37 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-23 19:09:37 +0000
commit4bd3e3aa1b92c75fafbb727820aeacae5e9bcb42 (patch)
treec2b9757a7ab8e30babacfebfc4258dad55250f8b /actionpack/lib
parent7b99b403521f0a4c15903c1672cb22acb65f0afb (diff)
downloadrails-4bd3e3aa1b92c75fafbb727820aeacae5e9bcb42.tar.gz
rails-4bd3e3aa1b92c75fafbb727820aeacae5e9bcb42.tar.bz2
rails-4bd3e3aa1b92c75fafbb727820aeacae5e9bcb42.zip
Set RAW_POST_DATA when request parameters are parsed.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6823 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb2
-rwxr-xr-xactionpack/lib/action_controller/request.rb67
2 files changed, 33 insertions, 36 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index dcfa39fc03..edb7fb38d8 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -72,7 +72,7 @@ module ActionController #:nodoc:
end
def request_parameters
- @request_parameters ||= self.class.parse_formatted_request_parameters(body, content_type_with_parameters, content_length, env)
+ @request_parameters ||= parse_formatted_request_parameters
end
def cookies
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 476f65a6dc..cdd35cc17b 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -231,11 +231,14 @@ module ActionController
end
- # Receive the raw post data.
- # This is useful for services such as REST, XMLRPC and SOAP
- # which communicate over HTTP POST but don't use the traditional parameter format.
+ # Read the request body. This is useful for web services that need to
+ # work with raw requests directly.
def raw_post
- @env['RAW_POST_DATA'] ||= body.read
+ unless env.include? 'RAW_POST_DATA'
+ env['RAW_POST_DATA'] = body.read(content_length)
+ body.rewind if body.respond_to?(:rewind)
+ end
+ env['RAW_POST_DATA']
end
# Returns both GET and POST parameters in a single hash.
@@ -312,37 +315,26 @@ module ActionController
end
end
-
- class << self
- def extract_content_type_without_parameters(content_type_with_parameters)
- $1.strip.downcase if content_type_with_parameters =~ /^([^,\;]*)/
- end
-
- def parse_formatted_request_parameters(body, content_type_with_parameters, content_length, env = {})
- content_length = content_length.to_i
+ def parse_formatted_request_parameters
return {} if content_length.zero?
- content_type, boundary = extract_multipart_boundary(content_type_with_parameters.to_s)
+ content_type, boundary = self.class.extract_multipart_boundary(content_type_with_parameters)
return {} if content_type.blank?
mime_type = Mime::Type.lookup(content_type)
strategy = ActionController::Base.param_parsers[mime_type]
# Only multipart form parsing expects a stream.
- if strategy && strategy != :multipart_form
- data = body.read(content_length)
- body.rewind if body.respond_to?(:rewind)
- body = data
- end
+ body = raw_post if strategy && strategy != :multipart_form
case strategy
when Proc
strategy.call(body)
when :url_encoded_form
- clean_up_ajax_request_body! body
- parse_query_parameters(body)
+ self.class.clean_up_ajax_request_body! body
+ self.class.parse_query_parameters(body)
when :multipart_form
- parse_multipart_form_parameters(body, boundary, content_length, env)
+ self.class.parse_multipart_form_parameters(body, boundary, content_length, env)
when :xml_simple, :xml_node
body.blank? ? {} : Hash.from_xml(body).with_indifferent_access
when :yaml
@@ -359,6 +351,7 @@ module ActionController
"backtrace" => e.backtrace }
end
+ class << self
def parse_query_parameters(query_string)
return {} if query_string.blank?
@@ -402,6 +395,24 @@ module ActionController
parse_request_parameters(read_multipart(body, boundary, content_length, env))
end
+ def extract_multipart_boundary(content_type_with_parameters)
+ if content_type_with_parameters =~ MULTIPART_BOUNDARY
+ ['multipart/form-data', $1.dup]
+ else
+ extract_content_type_without_parameters(content_type_with_parameters)
+ end
+ end
+
+ def extract_content_type_without_parameters(content_type_with_parameters)
+ $1.strip.downcase if content_type_with_parameters =~ /^([^,\;]*)/
+ end
+
+ def clean_up_ajax_request_body!(body)
+ body.chop! if body[-1] == 0
+ body.gsub!(/&_=$/, '')
+ end
+
+
private
def get_typed_value(value)
case value
@@ -454,20 +465,6 @@ module ActionController
MULTIPART_BOUNDARY = %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
- def extract_multipart_boundary(content_type_with_parameters)
- if content_type_with_parameters =~ MULTIPART_BOUNDARY
- ['multipart/form-data', $1.dup]
- else
- extract_content_type_without_parameters(content_type_with_parameters)
- end
- end
-
- def clean_up_ajax_request_body!(body)
- body.chop! if body[-1] == 0
- body.gsub!(/&_=$/, '')
- end
-
-
EOL = "\015\012"
def read_multipart(body, boundary, content_length, env)