[Emacs-diffs] master 7dc565a: Fix blocking connections on MS-Windows (Bug#20159)

[Eli Zaretskii]

branch: master
commit 7dc565a2cffeda8e7f5cf2806c056298e7907aba
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index db3056c..0cc0a42 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-28  Eli Zaretskii  <address@hidden>
+
+       * w32.c (sys_connect): Fix a mistake in previous commit that broke
+       blocking connections.  (Bug#20159)
+
 2015-03-27  Paul Eggert  <address@hidden>
 
        Avoid some core dumps in X session management
diff --git a/src/w32.c b/src/w32.c
index 1917fea..6f16704 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;