Skip to content

Commit

Permalink
Merge branch 'lint-headerhash' of git://bogomips.org/rack
Browse files Browse the repository at this point in the history
* 'lint-headerhash' of git://bogomips.org/rack:
  lint: avoid TypeError on non-Hash-like response headers
  • Loading branch information
raggi committed Jan 22, 2013
2 parents e1a4c00 + b20b002 commit c56fbf4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
5 changes: 5 additions & 0 deletions lib/rack/lint.rb
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,11 @@ def check_hijack(env)
## It is also possible to hijack a response after the status and headers
## have been sent.
def check_hijack_response(headers, env)

# this check uses headers like a hash, but the spec only requires
# headers respond to #each
headers = Rack::Utils::HeaderHash.new(headers)

## In order to do this, an application may set the special header
## <tt>rack.hijack</tt> to an object that responds to <tt>call</tt>
## accepting an argument that conforms to the <tt>rack.hijack_io</tt>
Expand Down
7 changes: 7 additions & 0 deletions test/spec_lint.rb
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,13 @@ def result.name
[200, {"Foo-Bar" => "one\ntwo\nthree", "Content-Length" => "0", "Content-Type" => "text/plain" }, []]
}).call(env({}))
}.should.not.raise(Rack::Lint::LintError)

# non-Hash header responses should be allowed
lambda {
Rack::Lint.new(lambda { |env|
[200, [%w(Content-Type text/plain), %w(Content-Length 0)], []]
}).call(env({}))
}.should.not.raise(TypeError)
end

should "notice content-type errors" do
Expand Down

0 comments on commit c56fbf4

Please sign in to comment.