22108f1bb0
Closes #11786 : ConfigParser.[Raw]ConfigParser optionxform().
2011-04-28 17:27:59 +02:00
31e1b1f69c
merge 11442 NEWS
2011-04-17 22:56:19 +02:00
2d253dd9ea
Issue 11442: Add NEWS entry for e9724d7abbc2
2011-04-17 22:29:40 +02:00
8c850bf819
Merge cleanup.
2011-03-29 13:03:10 -07:00
079381d236
Merge issue 11662 from 2.5.
2011-03-29 12:51:16 -07:00
9a9fdfad59
Merge urllib/urllib2 security fix from 2.5 branch.
2011-03-29 10:48:23 -07:00
92ecb8737b
Adding .hgignore (copied from default branch).
2011-03-29 09:53:33 -07:00
af1fee06c9
Issue #11639 : Configuration function documentation referred to logging.XXX rather than logging.config.XXX.
2011-03-29 01:07:50 +01:00
db3080e68f
Add CVE number to urllib/urllib2 news item.
2011-03-28 13:53:40 -07:00
f1509306d2
Add tests for the urllib[2] vulnerability. Change to raise exceptions.
2011-03-28 13:47:01 -07:00
2bc23b8448
Add FTP to the allowed url schemes. Add Misc/NEWS.
2011-03-24 10:44:17 -07:00
60a4a90c8d
Issue 22663: fix redirect vulnerability in urllib/urllib2.
2011-03-24 08:07:45 -07:00
f23c515e5b
null merge
2011-03-21 10:31:44 +01:00
ce5d0e22fc
Set subversion version identification to empty strings if this is not a subversion
...
checkout (but a mercurial one). Closes #11579 . Closes #11421 .
Patch by Senthil Kumaran.
2011-03-21 10:30:07 +01:00
d7bed77815
Whoops. The copyright should be two lines (merge from 2.5).
2011-03-19 16:20:39 -07:00
197f7f6859
Whoops. The copyright should be two lines.
2011-03-19 16:20:06 -07:00
54b76d4299
Test commit. Add 2011 to copyright line (merge from 2.5).
2011-03-19 16:17:14 -07:00
deeb71e8a0
Test commit. Add 2011 to copyright line.
2011-03-19 16:14:44 -07:00
dfd1579e54
merge from 2.5 branch.
2011-03-17 14:23:24 +08:00
3853586e0c
Fix issue11442 - Add a charset parameter to the Content-type to avoid XSS attacks.
...
Patch by Tom N. (Backported from py3k codeline).
2011-03-17 12:34:18 +08:00
3ae81137c8
Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch.
2011-03-11 18:44:10 +00:00
f4d0af460a
Issue #11444 : Lock handlers while flushing/closing during shutdown.
2011-03-08 22:39:55 +00:00
8dd2a40bc7
Issue #11424 : Fix bug in determining child loggers.
2011-03-07 15:02:11 +00:00
df8e75ed5a
Merge tags from 2.5.
2011-03-05 20:40:50 +01:00
6e0a8b8ab6
Add tags from the closed branches.
2011-03-05 20:38:24 +01:00
ae2af38f3d
Dummy-merge 2.5 branch into 2.6 branch.
2011-03-05 15:13:50 +01:00
b5c93e9cad
Add .hgeol file and fix newlines in the 2.6 branch.
2011-03-05 15:04:01 +01:00
6feb9003e5
Fix tag references in 2.6 branch.
2011-03-05 15:03:31 +01:00
4db2c257d6
Add .hgeol file and fix newlines in the 2.5 branch.
2011-03-05 15:02:28 +01:00
2af945cd3f
Fix tag references in 2.5 branch.
2011-03-05 15:01:01 +01:00
41769a7513
Merged revisions 87663 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r87663 | alexander.belopolsky | 2011-01-02 18:23:54 -0500 (Sun, 02 Jan 2011) | 13 lines
Merged revisions 87648,87656 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87648 | alexander.belopolsky | 2011-01-02 15:48:22 -0500 (Sun, 02 Jan 2011) | 1 line
Issue #8013 : Fixed time.asctime segfault when OS's asctime fails
........
r87656 | alexander.belopolsky | 2011-01-02 17:16:10 -0500 (Sun, 02 Jan 2011) | 1 line
Issue #8013 : Fixed test
........
................
2011-01-02 23:26:12 +00:00
893c354a55
Merged revisions 87541,87543 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r87541 | alexander.belopolsky | 2010-12-28 10:47:56 -0500 (Tue, 28 Dec 2010) | 9 lines
Merged revisions 87442 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87442 | alexander.belopolsky | 2010-12-22 21:27:37 -0500 (Wed, 22 Dec 2010) | 1 line
Issue #10254 : Fixed a crash and a regression introduced by the implementation of PRI 29.
........
................
r87543 | alexander.belopolsky | 2010-12-28 11:04:06 -0500 (Tue, 28 Dec 2010) | 1 line
fixed issue 10254 test
................
2010-12-28 16:15:08 +00:00
8497f0a85d
backporting security fix of issue 9129 (smtpd module vulnerable to DoS attacks in case of connection bashing)
2010-12-07 18:54:43 +00:00
b7180a89b3
Merge r82494 from the python2.6 branch:
...
Issue #7673 : Fix security vulnerability (CVE-2010-2089) in the audioop module,
ensure that the input string length is a multiple of the frame size
2010-10-17 10:48:14 +00:00
d4367c24cd
Merge r81080 from the python2.6 branch:
...
Issue #8674 : fix another bogus overflow check in audioop module.
2010-10-17 10:34:40 +00:00
192b714f92
Merged revisions 81046 from the python2.6 branch:
...
Issue #8674 : Fix incorrect and UB-inducing overflow checks in audioop
module. Thanks Tomas Hoger for the patch.
2010-10-17 10:28:49 +00:00
1740947952
Post release bump
2010-08-24 16:19:58 +00:00
e25ad5ec43
Tagging 2.6.6 final.
2010-08-23 23:41:00 +00:00
d724296fc3
2.6.6 final. \o/
2010-08-23 23:37:56 +00:00
8275da3f6a
Post release twiddling.
2010-08-17 19:57:29 +00:00
8b5724fdcb
(Re-)tagging 2.6.6rc2.
2010-08-16 22:58:41 +00:00
a7077c865d
Move NEWS file entry.
2010-08-16 22:58:18 +00:00
841f7ed052
Remove tag for NEWS file fix.
2010-08-16 22:58:03 +00:00
69e266c9f1
Tagging 2.6.6rc2
2010-08-16 22:47:52 +00:00
607a2e3f6d
Bumping to 2.6.6rc2.
2010-08-16 22:19:57 +00:00
b828e5c957
Issue 9568: Fix test_urllib2_localnet on OS X 10.3.
2010-08-16 19:33:51 +00:00
29a66bdcb5
Merged revisions 84100 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r84100 | florent.xicluna | 2010-08-16 21:22:18 +0200 (lun., 16 août 2010) | 13 lines
Merged revisions 84097,84099 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84097 | florent.xicluna | 2010-08-16 20:41:19 +0200 (lun., 16 août 2010) | 1 line
Use test.support and unittest features. Fix duplicated test (bad merge in r79033). Fix comment for issue #7902 .
........
r84099 | florent.xicluna | 2010-08-16 21:03:05 +0200 (lun., 16 août 2010) | 1 line
I get it wrong in r84097: s/relative/absolute/
........
................
2010-08-16 19:26:54 +00:00
0261d2e361
Merged revisions 82529 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
........
r82529 | florent.xicluna | 2010-07-04 16:24:40 +0200 (dim., 04 juil. 2010) | 1 line
Issue #9145 : Fix a regression due to r79539
........
2010-08-16 16:08:12 +00:00
7c251bbd6e
Fix #9600 . Don't use relative imports for _multiprocessing on Windows.
...
Same fix as #9513 on 3.x.
2010-08-14 17:09:55 +00:00
77cb7ed40e
Revert regression from r81256 (with release manager approval, see #8688 )
2010-08-14 02:07:26 +00:00
Łukasz Langa
Martin v. Löwis
Guido van Rossum
guido@google.com
Vinay Sajip
Senthil Kumaran
Georg Brandl
Alexander Belopolsky
Giampaolo Rodolà
Matthias Klose
Barry Warsaw
Florent Xicluna
Brian Curtin
Éric Araujo