diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-12 22:15:31 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-12 22:15:31 +0000 |
| commit | 6ef323d6f8a4cb768ce8217171487d8932bc7bd8 (patch) | |
| tree | a810a5ed89d355cf557d2772c57bc5e558d8eeca /lib/webrick/httpresponse.rb | |
| parent | 0f9662f3660bd98a0a31196b4bef82aa78b0529c (diff) | |
* lib/webrick/httpresponse.rb (setup_header): 204 and 304 responses
are allowed to have a Keep-Alive connection. [ruby-core:41581]
* test/webrick/test_httpresponse.rb: corresponding test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httpresponse.rb')
| -rw-r--r-- | lib/webrick/httpresponse.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb index 0d36c0747e..ce72b3f9d6 100644 --- a/lib/webrick/httpresponse.rb +++ b/lib/webrick/httpresponse.rb @@ -202,7 +202,7 @@ module WEBrick if @header['connection'] == "close" @keep_alive = false elsif keep_alive? - if chunked? || @header['content-length'] + if chunked? || @header['content-length'] || @status == 304 || @status == 204 @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" |