summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Fixes Issue 14234: fix for the previous commit, keep compilation whenGregory P. Smith2012-03-152-0/+7
| | | | | using --with-system-expat working when the system expat does not have salted hash support.
* Fixes Issue #14234: CVE-2012-0876: Randomize hashes of xml attributesGregory P. Smith2012-03-144-59/+130
| | | | | | in the hash table internal to the pyexpat module's copy of the expat library to avoid a denial of service due to hash collisions. Patch by David Malcolm with some modifications by the expat project.
* merge with 2.6Georg Brandl2012-02-211-3/+3
|\
| * Remove reST markup from --help output. Also: O(n**2) is dict construction, ↵Georg Brandl2012-02-211-3/+3
| | | | | | | | not single insertion.
* | merge 2.6Benjamin Peterson2012-02-211-6/+0
|\ \ | |/
| * don't need this hack anymoreBenjamin Peterson2012-02-211-6/+0
| |
| * Fix crash at startup with -W options.Antoine Pitrou2012-02-211-2/+28
| |
| * Backport fix from default branch for ./python -R -Wd where hash('d') would notBarry Warsaw2012-02-211-0/+6
| | | | | | | | have gotten randomized.
* | Fix crash at startup with -W options.Antoine Pitrou2012-02-211-2/+28
| |
* | sqlite3: Fix 64-bit integer handling in user functions on 32-bit architecturesPetri Lehtinen2012-02-211-5/+8
| | | | | | | | Closes #8033.
* | kill interned strings computed before random initializationBenjamin Peterson2012-02-211-0/+6
| |
* | merge 2.6 with hash randomization fixBenjamin Peterson2012-02-212-107/+33
|\ \ | |/
| * - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEEDBarry Warsaw2012-02-212-106/+33
| | | | | | | | | | | | 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.
* | Issue #13014: Fix a possible reference leak in SSLSocket.getpeercert().Antoine Pitrou2012-02-151-9/+14
| |
* | Issue #13015: Fix a possible reference leak in defaultdict.__repr__.Antoine Pitrou2012-02-151-1/+3
| | | | | | | | Patch by Suman Saha.
* | Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ↵Petri Lehtinen2012-02-062-10/+20
| | | | | | | | ProgrammingError now.
* | Issue #13817: After fork(), reinit the ad-hoc TLS implementation earlier to fixCharles-François Natali2012-02-021-1/+3
| | | | | | | | | | a random deadlock when fork() is called in a multithreaded process in debug mode, and make PyOS_AfterFork() more robust.
* | sqlite3: Handle strings with embedded zeros correctlyPetri Lehtinen2012-02-012-11/+13
| | | | | | | | Closes #13676.
* | Issue #13806: The size check in audioop decompression functions was too ↵Antoine Pitrou2012-01-281-3/+3
| | | | | | | | | | | | strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk.
* | Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV ↵Antoine Pitrou2012-01-271-1/+2
|\ \ | |/ | | | | attack countermeasure.
| * Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV ↵Antoine Pitrou2012-01-271-1/+2
| | | | | | | | attack countermeasure.
| * Merged revisions 87663 via svnmerge fromAlexander Belopolsky2011-01-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ........ ................
| * Merged revisions 87541,87543 via svnmerge fromAlexander Belopolsky2010-12-281-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ................
| * Merged revisions 83306 via svnmerge fromMatthias Klose2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ........ r83306 | matthias.klose | 2010-07-30 23:27:18 +0200 (Fr, 30 Jul 2010) | 2 lines - Issue #7567: Don't call `setupterm' twice. ........
| * Merged revisions 83680,83685 via svnmerge fromMark Dickinson2010-08-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83680 | mark.dickinson | 2010-08-03 19:34:53 +0100 (Tue, 03 Aug 2010) | 9 lines Merged revisions 83677 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83677 | mark.dickinson | 2010-08-03 19:31:54 +0100 (Tue, 03 Aug 2010) | 1 line Fix memory leak in ssl module. ........ ................ r83685 | mark.dickinson | 2010-08-03 19:46:28 +0100 (Tue, 03 Aug 2010) | 9 lines Merged revisions 83683 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83683 | mark.dickinson | 2010-08-03 19:44:16 +0100 (Tue, 03 Aug 2010) | 1 line Misc/NEWS entry for r83677. ........ ................
| * Merged revisions 83593 via svnmerge fromGeorg Brandl2010-08-021-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83593 | georg.brandl | 2010-08-02 23:44:25 +0200 (Mo, 02 Aug 2010) | 57 lines Merged revisions 83536,83546-83548,83550,83554-83555,83558,83563,83565,83571,83574-83575 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line #8578: mention danger of not incref'ing weak referenced object. ........ r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line #7973: Fix distutils options spelling. ........ r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line #7386: add example that shows that trailing path separators are stripped. ........ r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line #8172: how does one use a property? ........ r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line #9451: strengthen warning about __*__ special name usage. ........ r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line #7280: note about nasmw.exe. ........ r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line #8861: remove unused variable. ........ r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line #8648: document UTF-7 codec functions. ........ r83563 | georg.brandl | 2010-08-02 22:21:21 +0200 (Mo, 02 Aug 2010) | 1 line #9037: add example how to raise custom exceptions from C code. ........ r83565 | georg.brandl | 2010-08-02 22:27:20 +0200 (Mo, 02 Aug 2010) | 1 line #9111: document that do_help() looks at docstrings. ........ r83571 | georg.brandl | 2010-08-02 22:44:34 +0200 (Mo, 02 Aug 2010) | 1 line Clarify that abs() is not a namespace. ........ r83574 | georg.brandl | 2010-08-02 22:47:56 +0200 (Mo, 02 Aug 2010) | 1 line #6867: epoll.register() returns None. ........ r83575 | georg.brandl | 2010-08-02 22:52:10 +0200 (Mo, 02 Aug 2010) | 1 line #9238: zipfile does handle archive comments. ........ ................
| * Merged revisions 83442 via svnmerge fromAntoine Pitrou2010-08-011-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83442 | antoine.pitrou | 2010-08-01 22:13:11 +0200 (dim., 01 août 2010) | 10 lines Merged revisions 83440 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83440 | antoine.pitrou | 2010-08-01 22:08:46 +0200 (dim., 01 août 2010) | 4 lines Issue #8397: Raise an error when attempting to mix iteration and regular reads on a BZ2File object, rather than returning incorrect results. ........ ................
| * Merged revisions 83241 via svnmerge fromMark Dickinson2010-07-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83241 | mark.dickinson | 2010-07-29 22:44:47 +0100 (Thu, 29 Jul 2010) | 9 lines Merged revisions 83239 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83239 | mark.dickinson | 2010-07-29 22:41:59 +0100 (Thu, 29 Jul 2010) | 2 lines Issue #9422: Fix memory leak when re-initializing a struct.Struct object. ........ ................
| * Merged revisions 83098 via svnmerge fromRonald Oussoren2010-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83098 | ronald.oussoren | 2010-07-23 17:12:28 +0100 (Fri, 23 Jul 2010) | 19 lines Merged revisions 83096 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83096 | ronald.oussoren | 2010-07-23 17:05:35 +0100 (Fri, 23 Jul 2010) | 13 lines Ensure that sys.prefix can reliably be found on OSX. This fixes a small issue that was exposed by running test_subprocess through regrtest (and hence in a subdirectory). Without this patch running python.exe from the build tree will fail when these tree conditions are true: 1) the CWD is not the root of build tree 2) python.exe is found through $PATH 3) the framework is not yet installed ........ ................
| * Merged revisions 83124 via svnmerge fromRonald Oussoren2010-07-241-7/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83124 | ronald.oussoren | 2010-07-24 10:46:41 +0100 (Sat, 24 Jul 2010) | 15 lines Merged revisions 83088 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83088 | ronald.oussoren | 2010-07-23 14:53:51 +0100 (Fri, 23 Jul 2010) | 8 lines This fixes issue7900 by adding code that deals with the fact that getgroups(2) might return more that MAX_GROUPS on OSX. See the issue (and python-dev archives) for the gory details. Summarized: OSX behaves rather oddly and Apple says this is intentional. ........ ................
| * Merged revisions 83031 via svnmerge fromAntoine Pitrou2010-07-211-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83031 | antoine.pitrou | 2010-07-21 18:47:28 +0200 (mer., 21 juil. 2010) | 11 lines Merged revisions 83030 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83030 | antoine.pitrou | 2010-07-21 18:41:31 +0200 (mer., 21 juil. 2010) | 5 lines Issue #5395: check that array.fromfile() re-raises an IOError instead of replacing it with EOFError. (this is only an added test, but 2.x will get a fix too) ........ ................
| * Merged revisions 83007 via svnmerge fromBrian Curtin2010-07-211-3/+3
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ........ r83007 | brian.curtin | 2010-07-20 20:35:46 -0500 (Tue, 20 Jul 2010) | 2 lines Fix #9316. if/is grammar corrections. ........
| * Merged revisions 82853-82854 via svnmerge fromStefan Krah2010-07-191-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ........ r82853 | stefan.krah | 2010-07-13 21:17:08 +0200 (Tue, 13 Jul 2010) | 4 lines Issue #9185: On Solaris and OpenBSD, posix_getcwd() could loop indefinitely if the path length exceeded PATH_MAX. ........ r82854 | stefan.krah | 2010-07-13 21:40:00 +0200 (Tue, 13 Jul 2010) | 3 lines Remove PYOS_OS2 special cases from the Solaris/OpenBSD section. ........
| * Merged revisions 82945 via svnmerge fromMark Dickinson2010-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r82945 | mark.dickinson | 2010-07-18 08:55:55 +0100 (Sun, 18 Jul 2010) | 14 lines Merged revisions 82941,82943 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82941 | mark.dickinson | 2010-07-18 08:29:02 +0100 (Sun, 18 Jul 2010) | 3 lines Issue #9277: Struct module: standard bool packing was incorrect if char is unsigned. Thanks Stefan Krah for the patch. ........ r82943 | mark.dickinson | 2010-07-18 08:48:20 +0100 (Sun, 18 Jul 2010) | 1 line Misc/NEWS entry for r82941. ........ ................
| * Issue #9130: Fix validation of relative imports in parser module.Mark Dickinson2010-07-041-3/+4
| |
| * Issue #9128: Fix validation of class decorators in parser module.Mark Dickinson2010-07-041-8/+9
| |
| * Merged revisions 82492 via svnmerge fromVictor Stinner2010-07-031-73/+71
| | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r82492 | victor.stinner | 2010-07-03 15:36:19 +0200 (sam., 03 juil. 2010) | 3 lines 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 ........
| * Merged revisions 82400 via svnmerge fromMark Dickinson2010-06-301-4/+7
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r82400 | mark.dickinson | 2010-06-30 17:27:57 +0100 (Wed, 30 Jun 2010) | 2 lines Issue #9125: Update parser module for "except ... as ..." syntax. ........
| * Merged revisions 82221 via svnmerge fromMark Dickinson2010-06-251-11/+11
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r82221 | mark.dickinson | 2010-06-25 21:19:48 +0100 (Fri, 25 Jun 2010) | 1 line Fix indentation of Python code example in C comment. ........
| * Merged revisions 82210 via svnmerge fromAntoine Pitrou2010-06-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r82210 | antoine.pitrou | 2010-06-25 02:03:21 +0200 (ven., 25 juin 2010) | 4 lines Issue #9075: In the ssl module, remove the setting of a `debug` flag on an OpenSSL structure. ........
| * Merged revisions 82047 via svnmerge fromSenthil Kumaran2010-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r82047 | senthil.kumaran | 2010-06-17 22:08:34 +0530 (Thu, 17 Jun 2010) | 3 lines Fix Issue4452 - Incorrect docstring of os.setpgrp ........
| * Merged revisions 81904 via svnmerge fromMark Dickinson2010-06-121-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r81904 | mark.dickinson | 2010-06-11 21:27:05 +0100 (Fri, 11 Jun 2010) | 4 lines Fix possible undefined behaviour from signed overflow in struct module. Backport of revisions 81897, 81898 and 81902 from py3k. ........
| * Merged revisions 79779 via svnmerge fromPhilip Jenvey2010-06-091-4/+5
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r79779 | philip.jenvey | 2010-04-04 19:51:51 -0700 (Sun, 04 Apr 2010) | 2 lines fix escape_encode to return the correct consumed size ........
| * Merged revisions 81860 via svnmerge fromAntoine Pitrou2010-06-091-67/+67
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r81860 | antoine.pitrou | 2010-06-09 18:24:00 +0200 (mer., 09 juin 2010) | 3 lines Issue #8930: fix some C code indentation ........
| * Merged revisions 81602 via svnmerge fromMark Dickinson2010-05-291-18/+17
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r81602 | mark.dickinson | 2010-05-29 22:00:52 +0100 (Sat, 29 May 2010) | 1 line Untabify Modules/config.c.in. ........
| * Merged revisions 81566 via svnmerge fromAlexander Belopolsky2010-05-271-13/+16
| | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r81566 | alexander.belopolsky | 2010-05-27 16:55:27 -0400 (Thu, 27 May 2010) | 3 lines Issue #7150: Raise OverflowError if the result of adding or subtracting timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range. ........
| * Merged revisions 74426 via svnmerge fromJean-Paul Calderone2010-05-231-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r74426 | gregory.p.smith | 2009-08-13 14:54:50 -0400 (Thu, 13 Aug 2009) | 4 lines Fix issue1628205: Socket file objects returned by socket.socket.makefile() now properly handles EINTR within the read, readline, write & flush methods. The socket.sendall() method now properly handles interrupted system calls. ........
| * Merged revisions 81454 via svnmerge fromVictor Stinner2010-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r81454 | victor.stinner | 2010-05-22 00:50:28 +0200 (sam., 22 mai 2010) | 3 lines Issue #5640: Fix Shift-JIS incremental encoder for error handlers different than strict ........
| * Merged revisions 72645 via svnmerge fromGeorg Brandl2010-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r72645 | antoine.pitrou | 2009-05-14 21:48:09 +0000 (Do, 14 Mai 2009) | 6 lines Issue #5918: Fix a crash in the parser module. Patch by Amaury. ........
| * Merged revisions 81241 via svnmerge fromAntoine Pitrou2010-05-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r81241 | antoine.pitrou | 2010-05-17 01:11:46 +0200 (lun., 17 mai 2010) | 4 lines Clear the OpenSSL error queue each time an error is signalled. When the error queue is not emptied, strange things can happen on the next SSL call, depending on the OpenSSL version. ........