[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (socket)

Mon Jul 27 23:39:30 CEST 2015

https://hg.python.org/cpython/rev/6f98ef46fede
changeset: 97093:6f98ef46fede
parent: 97091:2715734b3378
parent: 97092:cd60eccaa331
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Jul 27 23:39:22 2015 +0200
summary:
 Merge 3.5 (socket)
files:
 Modules/socketmodule.c | 5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2211,7 +2211,12 @@
 #else
 ctx->result = accept(s->sock_fd, SAS2SA(ctx->addrbuf), ctx->addrlen);
 #endif
+
+#ifdef MS_WINDOWS
+ return (ctx->result != INVALID_SOCKET);
+#else
 return (ctx->result >= 0);
+#endif
 }
 
 /* s._accept() -> (fd, address) */
-- 
Repository URL: https://hg.python.org/cpython
