shyouhei	2010-06-16 15:57:47 +0900 (Wed, 16 Jun 2010)

  New Revision: 28336

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28336

  Log:
    merge revision(s) 26344,27367:
    * lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
      use inclusive range same as the header representation.
    * test/webrick/utils.rb (TestWEBrick#start_server): add log for
      test_filehandler.rb

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/net/http.rb
    branches/ruby_1_8_7/test/webrick/test_filehandler.rb
    branches/ruby_1_8_7/test/webrick/utils.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28335)
+++ ruby_1_8_7/ChangeLog	(revision 28336)
@@ -1,3 +1,13 @@
+Wed Jun 16 15:21:12 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/webrick/utils.rb (TestWEBrick#start_server): add log for
+	  test_filehandler.rb
+
+Wed Jun 16 15:21:12 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
+	  use inclusive range same as the header representation.
+
 Thu Jun 10 14:39:35 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/iconv/test_option.rb: removed particular implementation specific tests.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28335)
+++ ruby_1_8_7/version.h	(revision 28336)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-06-10"
+#define RUBY_RELEASE_DATE "2010-06-16"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20100610
-#define RUBY_PATCHLEVEL 294
+#define RUBY_RELEASE_CODE 20100616
+#define RUBY_PATCHLEVEL 295
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 16
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/lib/net/http.rb
===================================================================
--- ruby_1_8_7/lib/net/http.rb	(revision 28335)
+++ ruby_1_8_7/lib/net/http.rb	(revision 28336)
@@ -1366,13 +1366,13 @@
       return nil unless @header['content-range']
       m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or
           raise HTTPHeaderSyntaxError, 'wrong Content-Range format'
-      m[1].to_i .. m[2].to_i + 1
+      m[1].to_i .. m[2].to_i
     end
 
     # The length of the range represented in Content-Range: header.
     def range_length
       r = content_range() or return nil
-      r.end - r.begin
+      r.end - r.begin + 1
     end
 
     # Returns a content type string such as "text/html".
Index: ruby_1_8_7/test/webrick/utils.rb
===================================================================
--- ruby_1_8_7/test/webrick/utils.rb	(revision 28335)
+++ ruby_1_8_7/test/webrick/utils.rb	(revision 28336)
@@ -27,15 +27,21 @@
   module_function
 
   def start_server(klass, config={}, &block)
+    log_string = ""
+    logger = Object.new
+    class << logger; self; end.class_eval do
+      define_method(:<<) {|msg| log_string << msg }
+    end
+    log = proc { "webrick log start:\n" + log_string.gsub(/^/, "  ").chomp + "\nwebrick log end" }
     server = klass.new({
       :BindAddress => "127.0.0.1", :Port => 0,
-      :Logger => WEBrick::Log.new(NullWriter),
+      :Logger => WEBrick::Log.new(logger),
       :AccessLog => [[NullWriter, ""]]
     }.update(config))
     begin
       thread = Thread.start{ server.start }
       addr = server.listeners[0].addr
-      block.call([server, addr[3], addr[1]])
+      block.call([server, addr[3], addr[1], log])
     ensure
       server.stop
       thread.join
Index: ruby_1_8_7/test/webrick/test_filehandler.rb
===================================================================
--- ruby_1_8_7/test/webrick/test_filehandler.rb	(revision 28335)
+++ ruby_1_8_7/test/webrick/test_filehandler.rb	(revision 28336)
@@ -76,7 +76,7 @@
     range = nil
     bug2593 = '[ruby-dev:40030]'
 
-    TestWEBrick.start_httpserver(config) do |server, addr, port|
+    TestWEBrick.start_httpserver(config) do |server, addr, port, log|
       http = Net::HTTP.new(addr, port)
       req = Net::HTTP::Get.new("/")
       http.request(req){|res|

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