summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2016-07-31 06:51:13 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2016-07-31 06:51:13 (GMT)
commitcde03fa0381fcb7f7d3ba0dff4e784eade1f3031 (patch)
treee5958851d32ee2b1d8296c33324fd80d6177e8df /Misc
parentbf5868d2c5a9bc742b69172820a34ea88bfe2591 (diff)
parent7bfbd1d3c56b2a5281edeb7a8e21598618b7c1a3 (diff)
downloadcpython-cde03fa0381fcb7f7d3ba0dff4e784eade1f3031.zip
cpython-cde03fa0381fcb7f7d3ba0dff4e784eade1f3031.tar.gz
cpython-cde03fa0381fcb7f7d3ba0dff4e784eade1f3031.tar.bz2
[merge from 3.5] - Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates that the script is in CGI mode. Issue #27568 Reported and patch contributed by Rémi Rampin.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index b9af726..926cdae 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1204,6 +1204,7 @@ Shorya Raj
Jeff Ramnani
Varpu Rantala
Brodie Rao
+Rémi Rampin
Senko Rasic
Antti Rasinen
Nikolaus Rath
diff --git a/Misc/NEWS b/Misc/NEWS
index a6bc778..d265038 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,6 +38,10 @@ Core and Builtins
Library
-------
+- Issue #27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the
+ HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates
+ that the script is in CGI mode.
+
- Issue #7063: Remove dead code from the "array" module's slice handling.
Patch by Chuck.