Permalink
Browse files

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_7@17817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 81e75a1 commit 8a7c1e1f8111f9cdf2c07b11baf6e84108bb1471 @shyouhei shyouhei committed Jul 2, 2008
Showing with 7 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1 lib/cgi.rb
  3. +1 −1 version.h
View
@@ -1,3 +1,8 @@
+Wed Jul 2 19:06:43 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:03:37 2008 Tanaka Akira <akr@fsij.org>
* numeric.c (num_coerce): call rb_Float(x) first. don't depend on
View
@@ -1043,7 +1043,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
View
@@ -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

0 comments on commit 8a7c1e1

Please sign in to comment.