summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-05-23 19:26:11 (GMT)
committerBarry Warsaw <barry@python.org>2011-05-23 19:26:11 (GMT)
commit34289260dad734038dae6b17d6c534b50f0cd0fb (patch)
tree8ac9c095f765ce287bdb04f4090079ee769a4676 /Misc
parentcf0d8ab818852503057b8ade6cccc403fbb5d2be (diff)
downloadcpython-34289260dad734038dae6b17d6c534b50f0cd0fb.zip
cpython-34289260dad734038dae6b17d6c534b50f0cd0fb.tar.gz
cpython-34289260dad734038dae6b17d6c534b50f0cd0fb.tar.bz2
Replay changeset 70248:c714e2f92f63 from fubar branch. Original commit
message: Cross-port changes for 2.6.7rc2 from the Subversion branch.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS19
-rw-r--r--Misc/RPM/python-2.6.spec2
2 files changed, 20 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 980de3c..d1bbdba 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,6 +4,25 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.)
+What's New in Python 2.6.7 rc 2?
+================================
+
+*Release date: 2011-05-20*
+
+*NOTE: Python 2.6 is in security-fix-only mode. No non-security bug fixes are
+ allowed. Python 2.6.7 and beyond will be source only releases.*
+
+
+Library
+-------
+
+- Issue #11662: Make urllib and urllib2 ignore redirections if the
+ scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
+
+- Issue #11442: Add a charset parameter to the Content-type in SimpleHTTPServer
+ to avoid XSS attacks.
+
+
What's New in Python 2.6.7 rc 1?
================================
diff --git a/Misc/RPM/python-2.6.spec b/Misc/RPM/python-2.6.spec
index d5873b4..06f1311 100644
--- a/Misc/RPM/python-2.6.spec
+++ b/Misc/RPM/python-2.6.spec
@@ -39,7 +39,7 @@
%define name python
#--start constants--
-%define version 2.6.7rc1
+%define version 2.6.7rc2
%define libver 2.6
#--end constants--
%define release 1pydotorg