Branch merge.

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

Misc/NEWS

@@ -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.
 

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;

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;
         }