[Python-checkins] cpython (merge 3.2 -> 3.2): Branch merge.

[barry.warsaw]

http://hg.python.org/cpython/rev/f94485bf3e3a
changeset:   72802:f94485bf3e3a
branch:      3.2
parent:      72801:6e0e9237d8e8
parent:      72792:459f5e10cd4f
user:        Barry Warsaw <barry at python.org>
date:        Fri Oct 07 14:45:25 2011 -0400
summary:
  Branch merge.

files:
  Doc/library/ssl.rst |  4 ++--
  Misc/NEWS           |  4 ++++
  PC/errmap.h         |  1 +
  PC/generrmap.c      |  3 +++
  4 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -990,8 +990,8 @@
    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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
 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
--- a/PC/errmap.h
+++ b/PC/errmap.h
@@ -72,6 +72,7 @@
         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
--- a/PC/generrmap.c
+++ b/PC/generrmap.c
@@ -19,6 +19,9 @@
             /* Issue #12802 */
             if (i == ERROR_DIRECTORY)
                 errno = ENOTDIR;
+            /* Issue #13063 */
+            else if (i == ERROR_NO_DATA)
+                errno = EPIPE;
             else
                 continue;
         }

-- 
Repository URL: http://hg.python.org/cpython