Permalink
Browse files

Http::Headers respects headers that are not prefixed with HTTP_

  • Loading branch information...
1 parent b5493c8 commit 8945be464feb8c9ec8c4e7be52e5195f17a1ef5e @senny senny committed Mar 13, 2013
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* Http::Headers respects headers that are not prefixed with HTTP_
+
+ *Yves Senn*
+
* Fix incorrectly appended square brackets to a multiple select box
if an explicit name has been given and it already ends with "[]"
@@ -1,6 +1,16 @@
module ActionDispatch
module Http
class Headers
+ NON_PREFIX_VARIABLES = %w(
+ CONTENT_TYPE CONTENT_LENGTH
+ HTTPS AUTH_TYPE GATEWAY_INTERFACE
+ PATH_INFO PATH_TRANSLATED QUERY_STRING
+ REMOTE_ADDR REMOTE_HOST REMOTE_IDENT REMOTE_USER
+ REQUEST_METHOD SCRIPT_NAME
+ SERVER_NAME SERVER_PORT SERVER_PROTOCOL SERVER_SOFTWARE
+ )
+ HEADER_REGEXP = /\A[A-Za-z-]+\z/
+
include Enumerable
def initialize(env = {})
@@ -32,7 +42,9 @@ def env_name(header_name)
end
def cgi_name(k)
- "HTTP_#{k.upcase.gsub(/-/, '_')}"
+ k = k.upcase.gsub(/-/, '_')
+ k = "HTTP_#{k.upcase.gsub(/-/, '_')}" unless NON_PREFIX_VARIABLES.include?(k)
+ k
end
end
end
@@ -3,14 +3,16 @@
class HeaderTest < ActiveSupport::TestCase
def setup
@headers = ActionDispatch::Http::Headers.new(
- "HTTP_CONTENT_TYPE" => "text/plain"
+ "CONTENT_TYPE" => "text/plain",
+ "HTTP_REFERER" => "/some/page"
)
end
def test_each
headers = []
@headers.each { |pair| headers << pair }
- assert_equal [["HTTP_CONTENT_TYPE", "text/plain"]], headers
+ assert_equal [["CONTENT_TYPE", "text/plain"],
+ ["HTTP_REFERER", "/some/page"]], headers
end
def test_setter
@@ -19,19 +21,24 @@ def test_setter
end
def test_key?
- assert @headers.key?('HTTP_CONTENT_TYPE')
- assert @headers.include?('HTTP_CONTENT_TYPE')
+ assert @headers.key?('CONTENT_TYPE')
+ assert @headers.include?('CONTENT_TYPE')
end
def test_fetch_with_block
assert_equal 'omg', @headers.fetch('notthere') { 'omg' }
end
- test "content type" do
+ test "accessing http header" do
+ assert_equal "/some/page", @headers["Referer"]
+ assert_equal "/some/page", @headers["referer"]
+ assert_equal "/some/page", @headers["HTTP_REFERER"]
+ end
+
+ test "accessing special header" do
assert_equal "text/plain", @headers["Content-Type"]
assert_equal "text/plain", @headers["content-type"]
assert_equal "text/plain", @headers["CONTENT_TYPE"]
- assert_equal "text/plain", @headers["HTTP_CONTENT_TYPE"]
end
test "fetch" do

0 comments on commit 8945be4

Please sign in to comment.