naruse	2018-03-28 22:46:14 +0900 (Wed, 28 Mar 2018)

  New Revision: 63011

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63011

  Log:
    merge revision(s) 63008:
    
    get rid of test error/failure on Windows introduced at r62955
    
    * 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.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/lib/webrick/httpresponse.rb
    branches/ruby_2_5/lib/webrick/httpservlet/filehandler.rb
    branches/ruby_2_5/version.h
Index: ruby_2_5/lib/webrick/httpresponse.rb
===================================================================
--- ruby_2_5/lib/webrick/httpresponse.rb	(revision 63010)
+++ ruby_2_5/lib/webrick/httpresponse.rb	(revision 63011)
@@ -433,7 +433,12 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/webrick/httpresponse.rb#L433
             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
Index: ruby_2_5/lib/webrick/httpservlet/filehandler.rb
===================================================================
--- ruby_2_5/lib/webrick/httpservlet/filehandler.rb	(revision 63010)
+++ ruby_2_5/lib/webrick/httpservlet/filehandler.rb	(revision 63011)
@@ -100,7 +100,12 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/webrick/httpservlet/filehandler.rb#L100
                 "#{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}")
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 63010)
+++ ruby_2_5/version.h	(revision 63011)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.1"
 #define RUBY_RELEASE_DATE "2018-03-28"
-#define RUBY_PATCHLEVEL 55
+#define RUBY_PATCHLEVEL 56
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 63010)
+++ ruby_2_5	(revision 63011)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r63008

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/