(original) (raw)

changeset: 72988:489237756488 branch: 2.7 parent: 72984:86e3943d0d5b user: Senthil Kumaran senthil@uthcode.com date: Thu Oct 20 00:52:24 2011 +0800 files: Lib/cgi.py Lib/test/test_cgi.py description: Fix closes Issue12529 - cgi.parse_header failure on double quotes and semicolons. Patch by Ben Darnell and Petri Lehtinen. diff -r 86e3943d0d5b -r 489237756488 Lib/cgi.py --- a/Lib/cgi.py Wed Oct 19 10:39:35 2011 +0300 +++ b/Lib/cgi.py Thu Oct 20 00:52:24 2011 +0800 @@ -293,7 +293,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 -r 86e3943d0d5b -r 489237756488 Lib/test/test_cgi.py --- a/Lib/test/test_cgi.py Wed Oct 19 10:39:35 2011 +0300 +++ b/Lib/test/test_cgi.py Thu Oct 20 00:52:24 2011 +0800 @@ -377,6 +377,9 @@ 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'})) def test_main(): /senthil@uthcode.com