merge revision(s) 17753:

* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside double quotes are allowed. [ruby-list:45140] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
tmm1 · Jul 2, 2008 · bae3d2b · bae3d2b
1 parent 38dc5de
commit bae3d2b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  2 19:05:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
+	  double quotes are allowed.  [ruby-list:45140]
+
 Wed Jul  2 19:01:13 2008  Tanaka Akira  <akr@fsij.org>
 
 	* numeric.c (num_coerce): call rb_Float(x) first.  don't depend on

diff --git a/lib/cgi.rb b/lib/cgi.rb
@@ -1038,7 +1038,7 @@ def read_multipart(boundary, content_length)
 
         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

diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-02"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080702
-#define RUBY_PATCHLEVEL 263
+#define RUBY_PATCHLEVEL 264
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8