diff options
| author | Barry Warsaw <barry@python.org> | 2011-10-07 18:45:25 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2011-10-07 18:45:25 (GMT) |
| commit | c6cfd4aa8826b75d972f33f7c625bbe79c493d5f (patch) | |
| tree | f483a30f7b6c18622b7b6ff486398479a55fef62 | |
| parent | 78f89d8c38e2c71c5e6a89a32022626a1d8d8922 (diff) | |
| parent | f394e4785159167fe8889dd2537c8a74e01d4cc5 (diff) | |
| download | cpython-c6cfd4aa8826b75d972f33f7c625bbe79c493d5f.zip cpython-c6cfd4aa8826b75d972f33f7c625bbe79c493d5f.tar.gz cpython-c6cfd4aa8826b75d972f33f7c625bbe79c493d5f.tar.bz2 | |
Branch merge.
| -rw-r--r-- | Doc/library/ssl.rst | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | PC/errmap.h | 1 | ||||
| -rw-r--r-- | PC/generrmap.c | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 3ac90ab..497c5ba 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -990,8 +990,8 @@ not SSLv2. Class :class:`socket.socket` Documentation of underlying :mod:`socket` class - `Introducing SSL and Certificates using OpenSSL <http://old.pseudonym.org/ssl/wwwj-index.html>`_ - Frederick J. Hirsch + `TLS (Transport Layer Security) and SSL (Secure Socket Layer) <http://www3.rad.com/networks/applications/secure/tls.htm>`_ + Debby Koren `RFC 1422: Privacy Enhancement for Internet Electronic Mail: Part II: Certificate-Based Key Management <http://www.ietf.org/rfc/rfc1422>`_ Steve Kent @@ -10,6 +10,10 @@ What's New in Python 3.2.3? Core and Builtins ----------------- +- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described + as "The pipe is being closed") is now mapped to POSIX errno EPIPE + (previously EINVAL). + - Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. diff --git a/PC/errmap.h b/PC/errmap.h index 8dde31c..985f673 100644 --- a/PC/errmap.h +++ b/PC/errmap.h @@ -72,6 +72,7 @@ int winerror_to_errno(int winerror) case 202: return 8; case 206: return 2; case 215: return 11; + case 232: return 32; case 267: return 20; case 1816: return 12; default: return EINVAL; diff --git a/PC/generrmap.c b/PC/generrmap.c index 0323cd4..953344c 100644 --- a/PC/generrmap.c +++ b/PC/generrmap.c @@ -19,6 +19,9 @@ int main() /* Issue #12802 */ if (i == ERROR_DIRECTORY) errno = ENOTDIR; + /* Issue #13063 */ + else if (i == ERROR_NO_DATA) + errno = EPIPE; else continue; } |