Merge 3.5 (socket)

This commit is contained in:
Victor Stinner 2015-07-27 23:39:22 +02:00
commit 639f42115d
1 changed files with 5 additions and 0 deletions

View File

@ -2211,7 +2211,12 @@ sock_accept_impl(PySocketSockObject *s, void *data)
#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) */