From bae3d2b29d7b76c8ef21459a506fcae4593842cf Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 2 Jul 2008 10:06:15 +0000 Subject: 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 --- ChangeLog | 5 +++++ lib/cgi.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0aeb6f041..7e3cb767f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 2 19:05:35 2008 Nobuyoshi Nakada + + * 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 * 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 diff --git a/version.h b/version.h index 24c0f0199..97acafb27 100644 --- 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 -- cgit