diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/cgi.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Feb 11 07:42:25 2007 Akinori MUSHA <knu@iDaemons.org> + + * lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse + a quoted-string in a Content-Disposition value. + Sat Feb 10 20:21:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp> * ext/win32ole/win32ole.c: add WIN32OLE#ole_query_interface. diff --git a/lib/cgi.rb b/lib/cgi.rb index b6e432eb48..92ec1b6d57 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -1034,8 +1034,8 @@ class CGI body.rewind - /Content-Disposition:.* filename="?([^\";]*)"?/ni.match(head) - filename = ($1 or "") + /Content-Disposition:.* filename=(?:"((?:\\.|[^\"])*)"|([^;]*))/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 (not /MSIE/ni.match(env_table['HTTP_USER_AGENT'])) |