diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:54:29 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:54:29 +0000 |
commit | 0777c729cd1ae095ce18b55fb1cdf20b0d34cb0d (patch) | |
tree | 44b595908f6da0ed3b0602cef57114bddb3dd2c3 /lib/net | |
parent | a2339bc02147505ae459293c9fece5ae17b5f285 (diff) |
merges r25579 and r25581 from trunk into ruby_1_9_1.
--
* lib/net/http.rb (Net::HTTPResponse#each_response_header):
accept multiline message header of HTTP response. see #1796.
cf. RFC 2616 '4.2 Message Header'.
* test/net/http/test_httpresponse.rb: added.
--
* lib/net/http.rb (Net::HTTPResponse#each_response_header):
cosmetic: '?\ ' -> '?\s'
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r-- | lib/net/http.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index efc47c0009..d5395767e8 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -2146,13 +2146,20 @@ module Net #:nodoc: end def each_response_header(sock) + key = value = nil while true line = sock.readuntil("\n", true).sub(/\s+\z/, '') break if line.empty? - m = /\A([^:]+):\s*/.match(line) or - raise HTTPBadResponse, 'wrong header line format' - yield m[1], m.post_match + if line[0] == ?\s or line[0] == ?\t and value + value << ' ' unless value.empty? + value << line.strip + else + yield key, value if key + key, value = line.strip.split(/\s*:\s*/, 2) + raise HTTPBadResponse, 'wrong header line format' if value.nil? + end end + yield key, value if key end end |