[Python-checkins] cpython (merge 3.2 -> default): default - Fix closes Issue12529 - cgi.parse_header failure on double quotes and

[senthil.kumaran]

http://hg.python.org/cpython/rev/8564d2b240b6
changeset:   72990:8564d2b240b6
parent:      72987:3bed4b7b46a9
parent:      72989:f5bd78b11275
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Thu Oct 20 01:06:59 2011 +0800
summary:
  default - Fix closes Issue12529 - cgi.parse_header failure on double quotes and
semicolons. Patch by Ben Darnell and Petri Lehtinen.

files:
  Lib/cgi.py           |  2 +-
  Lib/test/test_cgi.py |  4 ++++
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/cgi.py b/Lib/cgi.py
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -300,7 +300,7 @@
     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
--- a/Lib/test/test_cgi.py
+++ b/Lib/test/test_cgi.py
@@ -342,6 +342,10 @@
         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"
 

-- 
Repository URL: http://hg.python.org/cpython