summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xLib/cgi.py2
-rw-r--r--Lib/test/test_cgi.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/cgi.py b/Lib/cgi.py
index e198ed8653..90a33450bc 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 c42db4e70d..9951e93f6e 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"