shyouhei	2009-02-15 04:17:10 +0900 (Sun, 15 Feb 2009)

  New Revision: 22309

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

  Log:
    merge revision(s) 20246:
    * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line):
      use non-greedy match for path retrieval to avoid huge recursion
      for insanely long path.

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

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 22308)
+++ ruby_1_8_6/ChangeLog	(revision 22309)
@@ -3,6 +3,12 @@
 	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
 	  Nobuhiro IMAI at [ruby-dev:37108].
 
+Sun Feb 15 04:15:39 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line):
+	  use non-greedy match for path retrieval to avoid huge recursion
+	  for insanely long path.
+
 Fri Feb 13 19:04:06 2009  Keiju Ishitsuka  <keiju@r...>
 
 	* shell/command-processor.rb: undefined method `top_level_test' in
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 22308)
+++ ruby_1_8_6/version.h	(revision 22309)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-02-13"
+#define RUBY_RELEASE_DATE "2009-02-15"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090213
-#define RUBY_PATCHLEVEL 330
+#define RUBY_RELEASE_CODE 20090215
+#define RUBY_PATCHLEVEL 331
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 15
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/lib/webrick/httprequest.rb
===================================================================
--- ruby_1_8_6/lib/webrick/httprequest.rb	(revision 22308)
+++ ruby_1_8_6/lib/webrick/httprequest.rb	(revision 22309)
@@ -225,7 +225,7 @@
       @request_line = read_line(socket) if socket
       @request_time = Time.now
       raise HTTPStatus::EOFError unless @request_line
-      if /^(\S+)\s+(\S+)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line
+      if /^(\S+)\s+(\S+?)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line
         @request_method = $1
         @unparsed_uri   = $2
         @http_version   = HTTPVersion.new($3 ? $3 : "0.9")

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