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

get rid of test error/failure on Windows introduced at r62955

Browse source 
* lib/webrick/httpresponse.rb (send_body_io): use seek if NotImplementedError
  is raised in IO.copy_stream with offset.

* lib/webrick/httpservlet/filehandler.rb (multipart_body): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-03-28 13:27:35 +00:00
parent b78fa27ae0
commit c1718e988e
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/webrick/httpresponse.rb
View file

@ -433,7 +433,12 @@ module WEBrick
size = @header['content-length']
size = size.to_i if size
end
@sent_size = IO.copy_stream(@body, socket, size, offset)
begin
@sent_size = IO.copy_stream(@body, socket, size, offset)
rescue NotImplementedError
@body.seek(offset, IO::SEEK_SET)
@sent_size = IO.copy_stream(@body, socket, size)
end
end
ensure
@body.close

7
lib/webrick/httpservlet/filehandler.rb
View file

@ -100,7 +100,12 @@ module WEBrick
"#{CRLF}"
)
IO.copy_stream(body, socket, last - first + 1, first)
begin
IO.copy_stream(body, socket, last - first + 1, first)
rescue NotImplementedError
body.seek(first, IO::SEEK_SET)
IO.copy_stream(body, socket, last - first + 1)
end
socket.write(CRLF)
end while parts[0]
socket.write("--#{boundary}--#{CRLF}")