shyouhei	2008-07-02 19:06:58 +0900 (Wed, 02 Jul 2008)

  New Revision: 17817

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

  Log:
    merge revision(s) 17753:
    * lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
      double quotes are allowed.  [ruby-list:45140]



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

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/lib/cgi.rb?r1=17817&r2=17816&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17817&r2=17816&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17817&r2=17816&diff_format=u

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17816)
+++ ruby_1_8_7/ChangeLog	(revision 17817)
@@ -1,3 +1,8 @@
+Wed Jul  2 19:06:43 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
+	  double quotes are allowed.  [ruby-list:45140]
+
 Wed Jul  2 19:03:37 2008  Tanaka Akira  <akr@f...>
 
 	* numeric.c (num_coerce): call rb_Float(x) first.  don't depend on
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17816)
+++ ruby_1_8_7/version.h	(revision 17817)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-02"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080702
-#define RUBY_PATCHLEVEL 45
+#define RUBY_PATCHLEVEL 46
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/cgi.rb
===================================================================
--- ruby_1_8_7/lib/cgi.rb	(revision 17816)
+++ ruby_1_8_7/lib/cgi.rb	(revision 17817)
@@ -1043,7 +1043,7 @@
 
         body.rewind
 
-        /Content-Disposition:.* filename=(?:"((?:\\.|[^\"\s])*)"|([^;\s]*))/ni.match(head)
+        /Content-Disposition:.* filename=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni.match(head)
 	filename = ($1 or $2 or "")
 	if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
 	    /Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and

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