From eda936e63cbf1ff7d77b0a4f66225ed704549696 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 10 Feb 2007 22:47:19 +0000
Subject: * lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse  
 a quoted-string in a Content-Disposition value.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/cgi.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/cgi.rb')

diff --git a/lib/cgi.rb b/lib/cgi.rb
index 38407da5cc..94d92e25ae 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1037,8 +1037,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']))
-- 
cgit v1.2.3