diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-30 11:56:05 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-30 11:56:05 +0000 |
| commit | 0f5bf067263d662ad57e41bea7665230ab6fafc7 (patch) | |
| tree | c266ae4f7a831ac30f092bf637a88cd707d8dbdc /lib | |
| parent | 18d73ae8151ff259fe8e4aac8f228173dbe57924 (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_1@52796 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 bd0a4d6b5f..b841858ffd 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, |