diff options
Diffstat (limited to 'actionpack')
| -rwxr-xr-x | actionpack/lib/action_controller/cgi_ext/cgi_methods.rb | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb index 3e65e5cb3a..e09fc4ac11 100755 --- a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb +++ b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb @@ -63,7 +63,7 @@ class CGIMethods #:nodoc: when Proc strategy.call(raw_post_data) when :xml_simple - XmlSimple.xml_in(raw_post_data, 'ForceArray' => false, :keeproot => true) + XmlSimple.xml_in(raw_post_data, 'ForceArray' => false, 'keeproot' => true) when :yaml YAML.load(raw_post_data) when :xml_node diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 06b6601fb4..b55f63e618 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -155,7 +155,6 @@ module ActionController # This method returns nil unless the web server is apache. def relative_url_root @@relative_url_root ||= server_software == 'apache' ? @env["SCRIPT_NAME"].to_s.sub(/\/dispatch\.(fcgi|rb|cgi)$/, '') : '' - end # Returns the port number of this request as an integer. |