diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-24 15:04:36 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-24 15:04:36 +0000 |
| commit | ae2b1d2fe1fbb43f46588a949c892576a0918e54 (patch) | |
| tree | 226c72bb4457fc6784390c03961794e0381813ac /lib | |
| parent | ceab943d087a8049b5ed72a77e88d151c1183e9a (diff) | |
merge revision(s) 52683,52684: [Backport #11719] [Backport #11722]
* lib/net/http.rb: Fixed regression for Net::HTTP::PUT with "Expect-100"
header.
* test/net/http/test_http.rb: added test.
* Added missing reference of GitHub
header. [fix GH-949]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/http.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 03823ae735..ee4f28d6b6 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1417,11 +1417,11 @@ module Net #:nodoc: res.uri = req.uri - res.reading_body(@socket, req.response_body_permitted?) { - yield res if block_given? - } res } + res.reading_body(@socket, req.response_body_permitted?) { + yield res if block_given? + } rescue Net::OpenTimeout raise rescue Net::ReadTimeout, IOError, EOFError, |