diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-30 13:09:03 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-30 13:09:03 +0000 |
commit | d1cb4a5ba7d39af6c793d069903a3fe24dbaa8d3 (patch) | |
tree | 6ebd84eb0b13537ceaf8d473aa3a076f55f71129 /lib/net | |
parent | 104c5f6b555de908191b70a565579b99402a707f (diff) | |
download | ruby-d1cb4a5ba7d39af6c793d069903a3fe24dbaa8d3.tar.gz |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25579 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 64dbef4cbb..57a2b2eea5 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -2158,13 +2158,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] == ?\ 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 |