From: Senthil Kumaran <senthil@uthcode.com>
Date: Wed, 19 Oct 2011 17:05:44 +0000 (+0800)
Subject: 3.2 - Fix closes Issue12529 - cgi.parse_header failure on double quotes and
X-Git-Tag: v3.2.3rc1~492
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ef0c0349e8fdb5415e21231cb42edbf232b742a;p=thirdparty%2FPython%2Fcpython.git

3.2 - Fix closes Issue12529 - cgi.parse_header failure on double quotes and
semicolons. Patch by Ben Darnell and Petri Lehtinen.
---

diff --git a/Lib/cgi.py b/Lib/cgi.py
index e198ed8653f2..90a33450bc07 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -291,7 +291,7 @@ def _parseparam(s):
     while s[:1] == ';':
         s = s[1:]
         end = s.find(';')
-        while end > 0 and s.count('"', 0, end) % 2:
+        while end > 0 and (s.count('"', 0, end) - s.count('\\"', 0, end)) % 2:
             end = s.find(';', end + 1)
         if end < 0:
             end = len(s)
diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py
index c42db4e70d98..9951e93f6eef 100644
--- a/Lib/test/test_cgi.py
+++ b/Lib/test/test_cgi.py
@@ -348,6 +348,10 @@ this is the content of the fake file
         self.assertEqual(
             cgi.parse_header('attachment; filename="strange;name";size=123;'),
             ("attachment", {"filename": "strange;name", "size": "123"}))
+        self.assertEqual(
+            cgi.parse_header('form-data; name="files"; filename="fo\\"o;bar"'),
+            ("form-data", {"name": "files", "filename": 'fo"o;bar'}))
+
 
 BOUNDARY = "---------------------------721837373350705526688164684"