Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED | Barry Warsaw | 2012-02-21 | 27 | -151/+705 |
| | | | | | | environment variable, to provide an opt-in way to protect against denial of service attacks due to hash collisions within the dict and set types. Patch by David Malcolm, based on work by Victor Stinner. | ||||
* | Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py. | Barry Warsaw | 2012-02-20 | 1 | -0/+1 |
| | |||||
* | Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in SimpleXMLRPCServer | Charles-François Natali | 2012-02-18 | 2 | -1/+7 |
| | | | | upon malformed POST request. | ||||
* | Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV ↵ | Antoine Pitrou | 2012-01-27 | 2 | -1/+5 |
| | | | | attack countermeasure. | ||||
* | merge closing of 2.5 branch | Martin v. Löwis | 2011-10-31 | 0 | -0/+0 |
|\ | |||||
| * | 2.5 is no longer maintained2.5 | Martin v. Löwis | 2011-10-31 | 0 | -0/+0 |
| | | |||||
* | | Remove mentions of previous license in profile module (#12417 followup) | Éric Araujo | 2011-07-28 | 3 | -56/+0 |
| | | |||||
* | | fix ws | Benjamin Peterson | 2011-06-29 | 1 | -3/+3 |
| | | |||||
* | | update profile license (closes #12417) | Benjamin Peterson | 2011-06-27 | 2 | -48/+28 |
| | | |||||
* | | Replay svn r88852. | Barry Warsaw | 2011-06-04 | 2 | -1/+13 |
| | | |||||
* | | Replay svn r88850.v2.6.7 | Barry Warsaw | 2011-06-04 | 7 | -26/+14 |
| | | |||||
* | | Nearly null-merge 2.5.6 | Martin v. Löwis | 2011-05-28 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | merge 2.5.6c1 tag | Martin v. Löwis | 2011-05-28 | 6 | -7/+19 |
| |\ | |||||
| | * | Added tag v2.5.6 for changeset de34c7b097e8 | Martin v. Löwis | 2011-05-28 | 1 | -0/+1 |
| | | | |||||
| | * | r88840: Prepare for 2.5.6.v2.5.6 | Martin v. Löwis | 2011-05-28 | 5 | -6/+17 |
| | | | |||||
| | * | r88828: Fix year. | Martin v. Löwis | 2011-05-28 | 1 | -1/+1 |
| | | | |||||
| * | | Added tag v2.5.6c1 for changeset a87c7b96672b | Martin v. Löwis | 2011-05-28 | 1 | -0/+1 |
| |/ | |||||
| * | r88824: Prepare for 2.5.6c1.v2.5.6c1 | Martin v. Löwis | 2011-05-28 | 5 | -7/+12 |
| | | |||||
* | | Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit | Barry Warsaw | 2011-05-23 | 2 | -2/+12 |
| | | | | | | | | | | | | message: Merging post 2.6.7rc2 changes from Subversion. | ||||
* | | Replay changeset 70248:c714e2f92f63 from fubar branch. Original commit | Barry Warsaw | 2011-05-23 | 7 | -7/+26 |
| | | | | | | | | | | | | message: Cross-port changes for 2.6.7rc2 from the Subversion branch. | ||||
* | | Replay changeset 70238:03e488b5c009 from fubar branch. Original commit | Barry Warsaw | 2011-05-23 | 16 | -35/+45 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | These files have Windows line endings in 2.6. | Barry Warsaw | 2011-05-23 | 1 | -0/+6 |
| | | |||||
* | | Closes #11786: ConfigParser.[Raw]ConfigParser optionxform(). | Łukasz Langa | 2011-04-28 | 1 | -5/+7 |
| | | |||||
* | | merge 11442 NEWS | Martin v. Löwis | 2011-04-17 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Issue 11442: Add NEWS entry for e9724d7abbc2 | Martin v. Löwis | 2011-04-17 | 1 | -0/+3 |
| | | |||||
* | | Merge cleanup. | Guido van Rossum | 2011-03-29 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge urllib/urllib2 security fix from 2.5 branch. | guido@google.com | 2011-03-29 | 5 | -0/+61 |
| |\ \ | | |/ | |||||
* | | | Merge issue 11662 from 2.5. | Guido van Rossum | 2011-03-29 | 5 | -13/+60 |
|\ \ \ | | |/ | |/| | |||||
| * | | Adding .hgignore (copied from default branch). | guido@google.com | 2011-03-29 | 1 | -0/+66 |
| | | | |||||
| * | | Add CVE number to urllib/urllib2 news item. | guido@google.com | 2011-03-28 | 1 | -1/+1 |
| | | | |||||
| * | | Add tests for the urllib[2] vulnerability. Change to raise exceptions. | guido@google.com | 2011-03-28 | 4 | -5/+45 |
| | | | |||||
| * | | Add FTP to the allowed url schemes. Add Misc/NEWS. | guido@google.com | 2011-03-24 | 3 | -4/+9 |
| | | | |||||
| * | | Issue 22663: fix redirect vulnerability in urllib/urllib2. | guido@google.com | 2011-03-24 | 2 | -2/+18 |
| | | | |||||
* | | | Issue #11639: Configuration function documentation referred to logging.XXX ↵ | Vinay Sajip | 2011-03-29 | 1 | -0/+4 |
| |/ |/| | | | | | rather than logging.config.XXX. | ||||
* | | null merge | Martin v. Löwis | 2011-03-21 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Set subversion version identification to empty strings if this is not a ↵ | Martin v. Löwis | 2011-03-21 | 1 | -2/+7 |
| | | | | | | | | | | | | | | subversion checkout (but a mercurial one). Closes #11579. Closes #11421. Patch by Senthil Kumaran. | ||||
* | | Whoops. The copyright should be two lines (merge from 2.5). | Guido van Rossum | 2011-03-19 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Whoops. The copyright should be two lines. | Guido van Rossum | 2011-03-19 | 1 | -1/+2 |
| | | |||||
* | | Test commit. Add 2011 to copyright line (merge from 2.5). | Guido van Rossum | 2011-03-19 | 1 | -3/+1 |
|\ \ | |/ | |||||
| * | Test commit. Add 2011 to copyright line. | Guido van Rossum | 2011-03-19 | 1 | -3/+1 |
| | | |||||
* | | merge from 2.5 branch. | Senthil Kumaran | 2011-03-17 | 1 | -1/+3 |
|\ \ | |/ | |||||
| * | Fix issue11442 - Add a charset parameter to the Content-type to avoid XSS ↵ | Senthil Kumaran | 2011-03-17 | 1 | -1/+3 |
| | | | | | | | | | | | | attacks. Patch by Tom N. (Backported from py3k codeline). | ||||
* | | Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), ↵ | Vinay Sajip | 2011-03-11 | 3 | -121/+5 |
| | | | | | | | | which should not have been made in this branch. | ||||
* | | Issue #11444: Lock handlers while flushing/closing during shutdown. | Vinay Sajip | 2011-03-08 | 1 | -0/+3 |
| | | |||||
* | | Issue #11424: Fix bug in determining child loggers. | Vinay Sajip | 2011-03-07 | 2 | -5/+118 |
| | | |||||
* | | Merge tags from 2.5. | Georg Brandl | 2011-03-05 | 1 | -1/+54 |
|\ \ | |/ | |||||
| * | Add tags from the closed branches. | Georg Brandl | 2011-03-05 | 1 | -0/+41 |
| | | |||||
* | | Dummy-merge 2.5 branch into 2.6 branch. | Georg Brandl | 2011-03-05 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Add .hgeol file and fix newlines in the 2.5 branch. | Georg Brandl | 2011-03-05 | 10 | -588/+627 |
| | | |||||
| * | Fix tag references in 2.5 branch. | Georg Brandl | 2011-03-05 | 1 | -69/+54 |
| | |