aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb4
-rwxr-xr-xactionpack/lib/action_controller/request.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index 029c1ebf24..ba9235ef81 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -63,8 +63,8 @@ module ActionController #:nodoc:
end
def request_parameters
- if env['HTTP_POST_DATA_FORMAT']
- CGIMethods.parse_formatted_request_parameters(env['HTTP_POST_DATA_FORMAT'].downcase.intern, env['RAW_POST_DATA'])
+ if env['HTTP_X_POST_DATA_FORMAT']
+ CGIMethods.parse_formatted_request_parameters(env['HTTP_X_POST_DATA_FORMAT'].downcase.intern, env['RAW_POST_DATA'])
else
CGIMethods.parse_request_parameters(@cgi.params)
end
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 216b9262b2..31d0fb1539 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -33,8 +33,8 @@ module ActionController
def post_format
- if env['POST_DATA_FORMAT']
- env['POST_DATA_FORMAT'].downcase.intern
+ if env['HTTP_X_POST_DATA_FORMAT']
+ env['HTTP_X_POST_DATA_FORMAT'].downcase.intern
else
:query_string
end