aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-15 14:56:50 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-15 14:58:27 -0700
commitf52ad6cf33e89d53fbf3c45347567a24226c65e3 (patch)
treea8a535b03901ba795d4b623a8012b5c7afea8856 /actionpack/lib/action_controller
parentbd3e1ed23ce201dd63bd4ba2cfbfa254f4d36645 (diff)
downloadrails-f52ad6cf33e89d53fbf3c45347567a24226c65e3.tar.gz
rails-f52ad6cf33e89d53fbf3c45347567a24226c65e3.tar.bz2
rails-f52ad6cf33e89d53fbf3c45347567a24226c65e3.zip
Merge pull request #5456 from brianmario/redirect-sanitization
Strip null bytes from Location header
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/redirecting.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index b07742e0e1..3ffb7ef426 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -93,7 +93,7 @@ module ActionController
_compute_redirect_to_location options.call
else
url_for(options)
- end.gsub(/[\r\n]/, '')
+ end.gsub(/[\0\r\n]/, '')
end
end
end