Fix blocking connections on MS-Windows (Bug#20159)

 src/w32.c (sys_connect): Fix a mistake in previous commit that broke
 blocking connections.

diff --git a/src/ChangeLog b/src/ChangeLog
index db3056ce6bd0b69bf549a14d68375c6675bd90a0..0cc0a42b3499ff2f68a9a297dfec0dccb1e38a1c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-28  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32.c (sys_connect): Fix a mistake in previous commit that broke
+       blocking connections.  (Bug#20159)
+
 2015-03-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        Avoid some core dumps in X session management

diff --git a/src/w32.c b/src/w32.c
index 1917fea343d01b326e2aee7814df42f293145bfd..6f16704909c87ece37cdcd2594322bb0f25e4ed7 100644 (file)
--- 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;