kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 66582: [Backport #15468][Backport #15472]

Browse source 
Fix Net::Protocol::BufferedIO#write when sending large multi-byte string

	This commit should fix Net::Protocol::BufferedIO#write when sending
	large multi-byte string like following example.

	```
	$ ruby -rnet/http -rjson -v -e "Net::HTTP.post(URI('http://httpbin.org/post'), { text: '?'*100_000 }.to_json, 'Content-Type' => 'application/json')"
	ruby 2.6.0p0 (2018-12-25 revision 66547) [x86_64-linux]
	Traceback (most recent call last):
	        19: from -e:1:in `<main>'
	        18: from lib/ruby/2.6.0/net/http.rb:500:in `post'
	        17: from lib/ruby/2.6.0/net/http.rb:605:in `start'
	        16: from lib/ruby/2.6.0/net/http.rb:920:in `start'
	        15: from lib/ruby/2.6.0/net/http.rb:502:in `block in post'
	        14: from lib/ruby/2.6.0/net/http.rb:1281:in `post'
	        13: from lib/ruby/2.6.0/net/http.rb:1493:in `send_entity'
	        12: from lib/ruby/2.6.0/net/http.rb:1479:in `request'
	        11: from lib/ruby/2.6.0/net/http.rb:1506:in `transport_request'
	        10: from lib/ruby/2.6.0/net/http.rb:1506:in `catch'
	         9: from lib/ruby/2.6.0/net/http.rb:1507:in `block in transport_request'
	         8: from lib/ruby/2.6.0/net/http/generic_request.rb:123:in `exec'
	         7: from lib/ruby/2.6.0/net/http/generic_request.rb:189:in `send_request_with_body'
	         6: from lib/ruby/2.6.0/net/protocol.rb:247:in `write'
	         5: from lib/ruby/2.6.0/net/protocol.rb:265:in `writing'
	         4: from lib/ruby/2.6.0/net/protocol.rb:248:in `block in write'
	         3: from lib/ruby/2.6.0/net/protocol.rb:275:in `write0'
	         2: from lib/ruby/2.6.0/net/protocol.rb:275:in `each_with_index'
	         1: from lib/ruby/2.6.0/net/protocol.rb:275:in `each'
	lib/ruby/2.6.0/net/protocol.rb:280:in `block in write0': undefined method `bytesize' for nil:NilClass (NoMethodError)
	```

	[Fix GH-2058]

	From: Eito Katagiri <eitoball@gmail.com>


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2019-01-12 21:02:26 +00:00
parent 9b02f55c50
commit 9548df0443
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/net/protocol.rb
View file

@ -286,7 +286,7 @@ module Net # :nodoc:
# next string
end
elsif len < 0
str = str[len, -len]
str = str.byteslice(len, -len)
else # len > 0
need_retry = false
# next string

16
test/net/protocol/test_protocol.rb
View file

@ -27,10 +27,10 @@ class TestProtocol < Test::Unit::TestCase
end
end
def create_mockio
def create_mockio(capacity: 100)
mockio = Object.new
mockio.instance_variable_set(:@str, +'')
mockio.instance_variable_set(:@capacity, 100)
mockio.instance_variable_set(:@capacity, capacity)
def mockio.string; @str; end
def mockio.to_io; self; end
def mockio.wait_writable(sec); sleep sec; false; end
@ -46,7 +46,7 @@ class TestProtocol < Test::Unit::TestCase
strs.each do |str|
len1 = @str.bytesize
break if @capacity <= len1
@str << str[0, @capacity - @str.bytesize]
@str << str.byteslice(0, @capacity - @str.bytesize)
len2 = @str.bytesize
len += len2 - len1
end
@ -55,6 +55,16 @@ class TestProtocol < Test::Unit::TestCase
mockio
end
def test_write0_multibyte
mockio = create_mockio(capacity: 1)
def mockio.write_nonblock(str, *strs, **kw)
@str << str.byteslice(0, 1)
1
end
io = Net::BufferedIO.new(mockio)
assert_equal(3, io.write("\u3042"))
end
def test_write0_timeout
mockio = create_mockio
io = Net::BufferedIO.new(mockio)

4
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.6.0"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 5
#define RUBY_PATCHLEVEL 6
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 6
#define RUBY_RELEASE_DAY 13
#include "ruby/version.h"