From 7dc565a2cffeda8e7f5cf2806c056298e7907aba Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 28 Mar 2015 10:36:01 +0300 Subject: [PATCH] Fix blocking connections on MS-Windows (Bug#20159) src/w32.c (sys_connect): Fix a mistake in previous commit that broke blocking connections. --- src/ChangeLog | 5 +++++ src/w32.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index db3056ce6b..0cc0a42b34 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-28 Eli Zaretskii + + * w32.c (sys_connect): Fix a mistake in previous commit that broke + blocking connections. (Bug#20159) + 2015-03-27 Paul Eggert Avoid some core dumps in X session management diff --git a/src/w32.c b/src/w32.c index 1917fea343..6f16704909 100644 --- a/src/w32.c +++ b/src/w32.c @@ -7489,8 +7489,8 @@ sys_connect (int s, const struct sockaddr * name, int namelen) errno = EINPROGRESS; /* that's what process.c expects */ fd_info[s].flags |= FILE_CONNECT; } - return rc; } + return rc; } errno = ENOTSOCK; return SOCKET_ERROR; -- 2.39.2