naruse	2010-08-10 17:36:00 +0900 (Tue, 10 Aug 2010)

  New Revision: 28949

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

  Log:
    merge revision(s) 28945:
    
    * lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri):
      rollup leading slashes. [ruby-core:31657]
      patched by Jamison Wilde
      NOTE: //authority/path is valid relative URI both RFC2396 and
      RFC3986. So when give a relative URI-like string to URI lib,
      users must care leading slashes.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/webrick/httprequest.rb
    branches/ruby_1_8/version.h

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 28948)
+++ ruby_1_8/ChangeLog	(revision 28949)
@@ -1,3 +1,12 @@
+Tue Aug 10 17:35:49 2010  NARUSE, Yui  <naruse@r...>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri):
+	  rollup leading slashes. [ruby-core:31657]
+	  patched by Jamison Wilde
+	  NOTE: //authority/path is valid relative URI both RFC2396 and
+	  RFC3986. So when give a relative URI-like string to URI lib,
+	  users must care leading slashes.
+
 Sat Aug  7 17:40:24 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* mkconfig.rb, lib/rbconfig/obsolete.rb: warn obsolete and
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 28948)
+++ ruby_1_8/version.h	(revision 28949)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-08-07"
+#define RUBY_RELEASE_DATE "2010-08-10"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100807
+#define RUBY_RELEASE_CODE 20100810
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 10
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/lib/webrick/httprequest.rb
===================================================================
--- ruby_1_8/lib/webrick/httprequest.rb	(revision 28948)
+++ ruby_1_8/lib/webrick/httprequest.rb	(revision 28949)
@@ -249,6 +249,7 @@
       if @config[:Escape8bitURI]
         str = HTTPUtils::escape8bit(str)
       end
+      str.sub!(%r{\A/+}o, '/')
       uri = URI::parse(str)
       return uri if uri.absolute?
       if self["host"]

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