diff options
| author | Jeff Trawick <trawick@apache.org> | 2013-09-16 12:48:37 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2013-09-16 12:48:37 +0000 |
| commit | 747316f261667165ed8c386643311c420b2e791d (patch) | |
| tree | ad434487145a5f39f53864f0e2cd5101e3f1382a /network_io/win32/sockopt.c | |
| parent | 7f57122b424792a72a7a954621da89f26d4ebc1e (diff) | |
| download | apr-747316f261667165ed8c386643311c420b2e791d.tar.gz | |
follow up to r1523384: if we disable non-blocking when a timeout is set, forget that non-blocking is enabled
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1523615 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io/win32/sockopt.c')
| -rw-r--r-- | network_io/win32/sockopt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/network_io/win32/sockopt.c b/network_io/win32/sockopt.c index 7f7a0eda6..463eeebf5 100644 --- a/network_io/win32/sockopt.c +++ b/network_io/win32/sockopt.c @@ -66,6 +66,7 @@ APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock, apr_interva 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) |