diff options
Diffstat (limited to 'actionpack/lib/action_controller/cgi_ext')
| -rw-r--r-- | actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb b/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb index 5cb13c2456..b2194eb07b 100644 --- a/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb +++ b/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb @@ -6,6 +6,8 @@ class CGI #:nodoc: # Handles multipart forms (in particular, forms that involve file uploads). # Reads query parameters in the @params field, and cookies into @cookies. def initialize_query() + @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] || env_table['COOKIE'])) + if boundary = multipart_form_boundary @multipart = true @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH'])) @@ -13,8 +15,6 @@ class CGI #:nodoc: @multipart = false @params = CGI::parse(read_query_params || "") end - - @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] || env_table['COOKIE'])) end private @@ -28,16 +28,32 @@ class CGI #:nodoc: end end + def read_params_from_query + if defined? MOD_RUBY + Apache::request.args || '' + else + # fixes CGI querystring parsing for POSTs + if env_table['QUERY_STRING'].blank? && !env_table['REQUEST_URI'].blank? + env_table['QUERY_STRING'] = env_table['REQUEST_URI'].split('?', 2)[1] || '' + end + env_table['QUERY_STRING'] + end + end + + def read_params_from_post + stdinput.binmode if stdinput.respond_to?(:binmode) + content = stdinput.read(Integer(env_table['CONTENT_LENGTH'])) || '' + env_table['RAW_POST_DATA'] = content.split("&_").first.to_s.freeze # &_ is a fix for Safari Ajax postings that always append \000 + end + def read_query_params case env_table['REQUEST_METHOD'].to_s.upcase when 'CMD' read_from_cmdline when 'POST', 'PUT' - stdinput.binmode if stdinput.respond_to?(:binmode) - content = stdinput.read(Integer(env_table['CONTENT_LENGTH'])) || '' - env_table['RAW_POST_DATA'] = content.split("&_").first.to_s.freeze # &_ is a fix for Safari Ajax postings that always append \000 + read_params_from_post else # when 'GET', 'HEAD', 'DELETE', 'OPTIONS' - (defined?(MOD_RUBY) ? Apache::request.args : env_table['QUERY_STRING']) || '' + read_params_from_query end end end # module QueryExtension |