shyouhei	2010-11-22 16:22:01 +0900 (Mon, 22 Nov 2010)

  New Revision: 29860

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

  Log:
    Tue, 10 Aug 2010 08:36:00 +0000  naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
     merge revision(s) 28949:
     
     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.
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 29859)
+++ ruby_1_8_7/ChangeLog	(revision 29860)
@@ -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.
+
 Fri Jul 30 08:51:51 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (file_expand_path): home directory must be absolute.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29859)
+++ ruby_1_8_7/version.h	(revision 29860)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-11-22"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101122
-#define RUBY_PATCHLEVEL 309
+#define RUBY_PATCHLEVEL 310
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/webrick/httprequest.rb
===================================================================
--- ruby_1_8_7/lib/webrick/httprequest.rb	(revision 29859)
+++ ruby_1_8_7/lib/webrick/httprequest.rb	(revision 29860)
@@ -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/