Skip to content

HTTP Keep-Alive should be honored for 304 response #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhengjia wants to merge 1 commit into from
Closed

HTTP Keep-Alive should be honored for 304 response #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/webrick/httpresponse.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def send_response(socket)
##
# Sets up the headers for sending

def setup_header()
def setup_header
@reason_phrase ||= HTTPStatus::reason_phrase(@status)
@header['server'] ||= @config[:ServerSoftware]
@header['date'] ||= Time.now.httpdate
Expand All @@ -184,7 +184,7 @@ def setup_header()
end

# Determine the message length (RFC2616 -- 4.4 Message Length)
if @status == 304 || @status == 204 || HTTPStatus::info?(@status)
if has_empty_response?
@header.delete('content-length')
@body = ""
elsif chunked?
Expand All @@ -202,7 +202,7 @@ def setup_header()
if @header['connection'] == "close"
@keep_alive = false
elsif keep_alive?
if chunked? || @header['content-length']
if has_empty_response? || chunked? || @header['content-length']
@header['connection'] = "Keep-Alive"
else
msg = "Could not determine content-length of response body. Set content-length of the response or set Response#chunked = true"
Expand Down Expand Up @@ -395,5 +395,10 @@ def _send_file(output, input, offset, size)
def _write_data(socket, data)
socket << data
end

def has_empty_response?
@status == 304 || @status == 204 || HTTPStatus::info?(@status)
end

end
end