Commit Graph

1579 Commits

Author SHA1 Message Date
Benjamin Peterson aee9dfba4a merge 2.6 with hash randomization fix 2012-02-20 21:44:56 -05:00
Barry Warsaw 1e13eb084f - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED
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.
2012-02-20 20:42:21 -05:00
Charles-François Natali 46180751e9 Merge. 2011-10-12 21:10:02 +02:00
Charles-François Natali 1f3ff7bc3f Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native
TLS implementations, and fails with the ad-hoc TLS implementation when a thread
doesn't have an auto thread state (e.g. a thread created outside of Python
calling into a subinterpreter).
2011-10-12 21:07:54 +02:00
Antoine Pitrou 5a75355792 Try to fix linking failures under Windows 2011-10-04 14:45:32 +02:00
Charles-François Natali 605ee2406f Always define _PyIsSelectable_fd(). 2011-08-28 16:43:24 +02:00
Charles-François Natali fda7b379ac Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is
greater than FD_SETSIZE.
2011-08-28 16:22:33 +02:00
Sandro Tosi 9943c0d5d7 #10741: add documentation for PyGILState_GetThisThreadState() 2011-08-08 00:15:57 +02:00
Benjamin Peterson 6abd97e3b2 onto 2.7.3 2011-06-11 11:33:54 -05:00
Benjamin Peterson 9843ba5e54 bump to 2.7.2 final 2011-06-11 09:42:44 -05:00
Barry Warsaw d0366e862a Replay svn r88852. 2011-06-03 20:05:48 -04:00
Barry Warsaw 16ec24a192 Replay svn r88850. 2011-06-03 20:02:47 -04:00
Benjamin Peterson cd20705902 bump to 2.7.2rc1 2011-05-29 16:50:27 -05:00
Barry Warsaw 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
Barry Warsaw 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
Barry Warsaw 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
Antoine Pitrou 4394e0db24 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_*
APIs, to avoid a crash with the pthread implementation in RHEL 5.  Patch
by Charles-François Natali.
2011-04-27 19:20:48 +02:00
Ezio Melotti c2077b0d9b #11565: Fix several typos. Patch by Piotr Kasprzyk. 2011-03-16 12:34:31 +02:00
Benjamin Peterson d4acd356b2 make this subversion artifact empty 2011-03-15 15:03:13 -05:00
Georg Brandl 3a5508e2c0 Port build identification from default branch. 2011-03-06 10:42:21 +01:00
Benjamin Peterson 07f5451517 remove dictmaker rule; it's unused 2010-12-11 04:25:57 +00:00
Benjamin Peterson 5ee8448fd8 next release cycle bump 2010-11-28 04:49:23 +00:00
Benjamin Peterson 3e0fa42d87 2.7.1 final version bump 2010-11-27 14:40:29 +00:00
Georg Brandl b727650e0c Merged revisions 86561-86562,86564-86565,86705,86708,86713 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86561 | georg.brandl | 2010-11-20 12:47:10 +0100 (Sa, 20 Nov 2010) | 1 line

  #10460: Update indent.pro to match PEP 7 better.
........
  r86562 | georg.brandl | 2010-11-20 14:44:41 +0100 (Sa, 20 Nov 2010) | 1 line

  #10439: document PyCodec C APIs.
........
  r86564 | georg.brandl | 2010-11-20 15:08:53 +0100 (Sa, 20 Nov 2010) | 1 line

  #10460: an even better indent.pro.
........
  r86565 | georg.brandl | 2010-11-20 15:16:17 +0100 (Sa, 20 Nov 2010) | 1 line

  socket.gethostbyname(socket.gethostname()) can fail when host name resolution is not set up correctly; do not fail test_socket if this is the case.
........
  r86705 | georg.brandl | 2010-11-23 08:54:19 +0100 (Di, 23 Nov 2010) | 1 line

  #10468: document Unicode exception creation and access functions.
........
  r86708 | georg.brandl | 2010-11-23 09:37:54 +0100 (Di, 23 Nov 2010) | 2 lines

  #10511: clarification of what heaps are; suggested by Johannes Hoff.
........
  r86713 | georg.brandl | 2010-11-23 19:14:57 +0100 (Di, 23 Nov 2010) | 1 line

  assert.h is also included. Thanks to Savio Sena.
........
2010-11-26 08:28:05 +00:00
Benjamin Peterson db4c334e0d towards final 2010-11-13 23:32:58 +00:00
Benjamin Peterson cc21417408 2.7.1rc1 bump 2010-11-13 17:33:04 +00:00
R. David Murray 0491047580 Merged revisions 85675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85675 | r.david.murray | 2010-10-17 20:15:31 -0400 (Sun, 17 Oct 2010) | 4 lines

  #4499: silence compiler warning on AIX.

  Patch from ActiveState.
........
2010-10-18 00:19:30 +00:00
Daniel Stutzbach 93db23ef2f Merged revisions 84810 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84810 | daniel.stutzbach | 2010-09-14 11:02:01 -0500 (Tue, 14 Sep 2010) | 1 line

  Remove pointers to a FAQ entry that no longer exists.  Incorporate some text from the old FAQ into the docs
........
2010-09-14 16:10:22 +00:00
Antoine Pitrou 1fcdba84be Merged revisions 84391 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84391 | antoine.pitrou | 2010-09-01 14:58:21 +0200 (mer., 01 sept. 2010) | 5 lines

  Issue #3101: Helper functions _add_one_to_C() and _add_one_to_F() become
  _Py_add_one_to_C() and _Py_add_one_to_F(), respectively.
........
2010-09-01 13:02:50 +00:00
Antoine Pitrou a408350a08 Merged revisions 84344 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84344 | antoine.pitrou | 2010-08-28 20:17:03 +0200 (sam., 28 août 2010) | 4 lines

  Issue #1868: Eliminate subtle timing issues in thread-local objects by
  getting rid of the cached copy of thread-local attribute dictionary.
........
2010-08-28 18:29:13 +00:00
Barry Warsaw 1740947952 Post release bump 2010-08-24 16:19:58 +00:00
Barry Warsaw d724296fc3 2.6.6 final. \o/ 2010-08-23 23:37:56 +00:00
Barry Warsaw 8275da3f6a Post release twiddling. 2010-08-17 19:57:29 +00:00
Barry Warsaw 607a2e3f6d Bumping to 2.6.6rc2. 2010-08-16 22:19:57 +00:00
Barry Warsaw 498323eec7 Post 2.6.6rc1 2010-08-04 22:30:09 +00:00
Barry Warsaw 6053744c3a Bumping to 2.6.6 rc 1 2010-08-03 22:39:42 +00:00
Stefan Krah d483a1a12b Merged revisions 82969 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r82969 | stefan.krah | 2010-07-19 15:14:01 +0200 (Mon, 19 Jul 2010) | 14 lines

  Issue #9036: Throughout the code base, Py_CHARMASK is used on 8-bit wide
  signed/unsigned chars or on integers directly derived from those. In all
  cases, it could be replaced by a simple cast to (unsigned char). Reasons
  for the change:

    a) Make the comment more explicit.

    b) If char is unsigned, the cast is optimized away.

    c) If char is unsigned, gcc emits spurious "array subscript
       has type 'char'" warnings.
........
2010-07-19 13:36:13 +00:00
Stefan Krah a1775944ae Issue #9036: Throughout the code base, Py_CHARMASK is used on 8-bit wide
signed/unsigned chars or on integers directly derived from those. In all
cases, it could be replaced by a simple cast to (unsigned char). Reasons
for the change:

  a) Make the comment more explicit.

  b) If char is unsigned, the cast is optimized away.

  c) If char is unsigned, gcc emits spurious "array subscript
     has type 'char'" warnings.
2010-07-19 13:14:01 +00:00
Benjamin Peterson d6bbe0c179 technically not at 2.7.1 yet 2010-07-04 21:03:53 +00:00
Benjamin Peterson e3c104554b prepare for 2.7.1 2010-07-03 14:51:25 +00:00
Benjamin Peterson c60082d283 update to 2.7 final 2010-07-03 13:56:13 +00:00
Stefan Krah 3db4161011 Issue #9020: The Py_IS* macros from pyctype.h should generally only be
used with signed/unsigned char arguments. For integer arguments, EOF
has to be handled separately.
2010-06-24 09:33:05 +00:00
Benjamin Peterson 4f6125996d towards final release 2010-06-21 17:28:30 +00:00
Benjamin Peterson bfcedf4cb7 bump verson to 2.7rc2 2010-06-21 15:57:57 +00:00
Benjamin Peterson 2f3d9f926d careening towards 2.7rc2 we go 2010-06-06 02:09:33 +00:00
Benjamin Peterson 77d534e59d bump version to 2.7 rc1 2010-06-06 00:22:09 +00:00
Antoine Pitrou 52ca516cac Merged revisions 81398 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81398 | antoine.pitrou | 2010-05-21 19:12:38 +0200 (ven., 21 mai 2010) | 6 lines

  Issue #5753: A new C API function, :cfunc:`PySys_SetArgvEx`, allows
  embedders of the interpreter to set sys.argv without also modifying
  sys.path.  This helps fix `CVE-2008-5983
  <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5983>`_.
........
2010-05-21 17:22:43 +00:00
Antoine Pitrou 6a2656094d Issue #5753: A new C API function, :cfunc:`PySys_SetArgvEx`, allows
embedders of the interpreter to set sys.argv without also modifying
sys.path.  This helps fix `CVE-2008-5983
<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5983>`_.
2010-05-21 17:12:38 +00:00
Antoine Pitrou c7c96a90bc Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines

  Untabify C files. Will watch buildbots.
........
2010-05-09 15:15:40 +00:00
Antoine Pitrou c83ea137d7 Untabify C files. Will watch buildbots. 2010-05-09 14:46:46 +00:00