d358e0554b
Issue #13885 : CVE-2011-3389: the _ssl module would always disable the CBC IV attack countermeasure.
2012-01-27 09:42:45 +01:00
141e770e8f
merge closing of 2.5 branch
2011-10-31 12:39:25 +01:00
e5b9bff214
2.5 is no longer maintained
2011-10-31 12:38:50 +01:00
345fff3de8
Remove mentions of previous license in profile module ( #12417 followup)
2011-07-28 22:27:28 +02:00
5ac56d275d
fix ws
2011-06-28 21:57:21 -05:00
1105f34a2b
update profile license ( closes #12417 )
2011-06-27 09:14:34 -05:00
d0366e862a
Replay svn r88852.
2011-06-03 20:05:48 -04:00
16ec24a192
Replay svn r88850.
2011-06-03 20:02:47 -04:00
9c53584ebd
Nearly null-merge 2.5.6
2011-05-28 14:13:32 +02:00
228516c3f8
merge 2.5.6c1 tag
2011-05-28 14:06:55 +02:00
dcdf0320c0
Added tag v2.5.6c1 for changeset a87c7b96672b
2011-05-28 14:05:31 +02:00
4ca9d48a04
Added tag v2.5.6 for changeset de34c7b097e8
2011-05-28 14:00:37 +02:00
11a859d70d
r88840: Prepare for 2.5.6.
2011-05-28 13:58:36 +02:00
e81c485e57
r88828: Fix year.
2011-05-28 13:57:28 +02:00
cf60858b55
r88824: Prepare for 2.5.6c1.
2011-05-28 13:56:22 +02:00
32140f8955
Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit
...
message:
Merging post 2.6.7rc2 changes from Subversion.
2011-05-23 15:27:52 -04:00
34289260da
Replay changeset 70248:c714e2f92f63 from fubar branch. Original commit
...
message:
Cross-port changes for 2.6.7rc2 from the Subversion branch.
2011-05-23 15:26:11 -04:00
cf0d8ab818
Replay changeset 70238:03e488b5c009 from fubar branch. Original commit
...
message:
Reconcile with the 2.6svn branch. The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync. These
changes should *not* propagate to any newer versions.
2011-05-23 15:22:56 -04:00
e26bc109ff
These files have Windows line endings in 2.6.
2011-05-22 21:16:55 -04:00
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
Antoine Pitrou
Martin v. Löwis
Éric Araujo
Benjamin Peterson
Barry Warsaw
Łukasz Langa
Guido van Rossum
guido@google.com
Vinay Sajip
Senthil Kumaran
Georg Brandl
Alexander Belopolsky