svn commit: r1523615 - /apr/apr/trunk/network_io/win32/sockopt.c

[tr...@apache.org]

Author: trawick
Date: Mon Sep 16 12:48:37 2013
New Revision: 1523615

URL: http://svn.apache.org/r1523615
Log:
follow up to r1523384: if we disable non-blocking when a timeout is set, forget that non-blocking is enabled

Modified:
    apr/apr/trunk/network_io/win32/sockopt.c

Modified: apr/apr/trunk/network_io/win32/sockopt.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/win32/sockopt.c?rev=1523615&r1=1523614&r2=1523615&view=diff
==============================================================================
--- apr/apr/trunk/network_io/win32/sockopt.c (original)
+++ apr/apr/trunk/network_io/win32/sockopt.c Mon Sep 16 12:48:37 2013
@@ -66,6 +66,7 @@ APR_DECLARE(apr_status_t) apr_socket_tim
         if (sock->timeout == 0 || apr_is_option_set(sock, APR_SO_NONBLOCK)) {
             if ((stat = soblock(sock->socketdes)) != APR_SUCCESS)
                 return stat;
+            apr_set_option(sock, APR_SO_NONBLOCK, 0);
         }
         /* Reset socket timeouts if the new timeout differs from the old timeout */
         if (sock->timeout != t)