yugui	2009-06-21 18:16:30 +0900 (Sun, 21 Jun 2009)

  New Revision: 23792

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

  Log:
    merges r23715 from trunk into ruby_1_9_1.
    --
    * lib/webrick/httputils.rb (parse_form_data): escape boundary of
      multipart/form-data when embed in regexp.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/webrick/httputils.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23791)
+++ ruby_1_9_1/ChangeLog	(revision 23792)
@@ -1,3 +1,8 @@
+Wed Jun 17 07:36:22 2009  NARUSE, Yui  <naruse@r...>
+
+	* lib/webrick/httputils.rb (parse_form_data): escape boundary of
+	  multipart/form-data when embed in regexp.
+
 Tue Jun 16 22:47:37 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* io.c (fptr_finalize): skip close(2) for fd 0,1,2.
Index: ruby_1_9_1/lib/webrick/httputils.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httputils.rb	(revision 23791)
+++ ruby_1_9_1/lib/webrick/httputils.rb	(revision 23792)
@@ -305,7 +305,7 @@
     module_function :parse_query
 
     def parse_form_data(io, boundary)
-      boundary_regexp = /\A--#{boundary}(--)?#{CRLF}\z/
+      boundary_regexp = /\A--#{Regexp.quote(boundary)}(--)?#{CRLF}\z/
       form_data = Hash.new
       return form_data unless io
       data = nil
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23791)
+++ ruby_1_9_1/version.h	(revision 23792)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 182
+#define RUBY_PATCHLEVEL 183
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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