diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-02 10:06:58 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-02 10:06:58 +0000 |
| commit | 5fc213b366d6536601fc4b94cfefc50c32378dc0 (patch) | |
| tree | ad7f4a3c543b8623552d3dc10cce4b9d2a44602c | |
| parent | ed2c44bbfe994aef8b23924882b4f965def59dc5 (diff) | |
merge revision(s) 17753:
* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
double quotes are allowed. [ruby-list:45140]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17817 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: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 diff --git a/lib/cgi.rb b/lib/cgi.rb index e616534221..5279439a08 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -1043,7 +1043,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 187 #define RUBY_RELEASE_CODE 20080702 -#define RUBY_PATCHLEVEL 45 +#define RUBY_PATCHLEVEL 46 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |