diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-02 10:06:15 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-02 10:06:15 +0000 |
| commit | bae3d2b29d7b76c8ef21459a506fcae4593842cf (patch) | |
| tree | 69b45f7497367e97e6a31a7b54f07a8cef7fe1d1 | |
| parent | 38dc5de975aa0a5b22b2d10e284f1062df83c4f5 (diff) | |
| download | ruby-bae3d2b29d7b76c8ef21459a506fcae4593842cf.tar.gz ruby-bae3d2b29d7b76c8ef21459a506fcae4593842cf.tar.xz ruby-bae3d2b29d7b76c8ef21459a506fcae4593842cf.zip | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/cgi.rb | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -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 index ccc48d883..bf64d5a54 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -1038,7 +1038,7 @@ class CGI 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 @@ -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 |