kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Improved conditional response code from Dan Kubb. Handles ETag on 304 responses better.

Browse source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@173 19e92222-5c0b-0410-8929-a290d50e31e9
This commit is contained in:
zedshaw 2006-05-13 21:25:53 +00:00
parent 07dd2b4783
commit 429ebcd5df
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/mongrel/command.rb
View file

@ -48,11 +48,11 @@ module Mongrel
puts @opt puts @opt
end end
# I need to add my own -v definition to prevent the -h from exiting by default as well. # I need to add my own -v definition to prevent the -v from exiting by default as well.
@opt.on_tail("--version", "Show version") do @opt.on_tail("--version", "Show version") do
@done_validating = true @done_validating = true
if VERSION if VERSION
puts "Version #{MONGREL_VERSION}" puts "Version #{Mongrel::Const::MONGREL_VERSION}"
end end
end end

5
lib/mongrel/handlers.rb
View file

@ -179,14 +179,15 @@ module Mongrel
else unmodified_since || none_match # validation successful if we get this far and at least one of the header exists else unmodified_since || none_match # validation successful if we get this far and at least one of the header exists
end end
header = response.header
header[Const::ETAG] = etag
if same_response if same_response
response.start(304) {} response.start(304) {}
else else
# first we setup the headers and status then we do a very fast send on the socket directly # first we setup the headers and status then we do a very fast send on the socket directly
response.status = 200 response.status = 200
header = response.header
header[Const::LAST_MODIFIED] = mtime.httpdate header[Const::LAST_MODIFIED] = mtime.httpdate
header[Const::ETAG] = etag
# set the mime type from our map based on the ending # set the mime type from our map based on the ending
dot_at = req_path.rindex('.') dot_at = req_path.rindex('.')

12
test/test_conditional.rb
View file

@ -15,8 +15,8 @@ class HttpParserTest < Test::Unit::TestCase
# get the ETag and Last-Modified headers # get the ETag and Last-Modified headers
@path = '/README' @path = '/README'
res = @http.start { |http| http.get(@path) } res = @http.start { |http| http.get(@path) }
@etag = res['ETag'] assert_not_nil @etag = res['ETag']
@last_modified = res['Last-Modified'] assert_not_nil @last_modified = res['Last-Modified']
end end
def teardown def teardown
@ -94,7 +94,13 @@ class HttpParserTest < Test::Unit::TestCase
# assert the response status is correct for GET and HEAD # assert the response status is correct for GET and HEAD
def assert_status_for_get_and_head(status_class, headers = {}) def assert_status_for_get_and_head(status_class, headers = {})
%w{ get head }.each do |method| %w{ get head }.each do |method|
assert_kind_of status_class, @http.send(method, @path, headers) res = @http.send(method, @path, headers)
assert_kind_of status_class, res
assert_equal @etag, res['ETag']
case status_class
when Net::HTTPNotModified : assert_nil res['Last-Modified']
when Net::HTTPOK : assert_equal @last_modified, res['Last-Modified']
end
end end
end end
end end