diff options
| author | Jeff Trawick <trawick@apache.org> | 2013-11-18 15:14:19 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2013-11-18 15:14:19 +0000 |
| commit | 1124cb2ff813ededb7a10936e74ce4ad1efa8650 (patch) | |
| tree | f30d8fe157b0666c754378a9b39cda5992b50ac4 /network_io | |
| parent | a3a8b3bda115128b0027c85ce0073732b6ff5a7e (diff) | |
| download | apr-1124cb2ff813ededb7a10936e74ce4ad1efa8650.tar.gz | |
Follow up to r1543033:
Use the new code required for OS X/Darwin on the other platforms too.
(IOW, we're willing to peek in the socket as long as APR_POLLIN is
returned, regardless of other flags.)
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1543056 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
| -rw-r--r-- | network_io/unix/socket_util.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/network_io/unix/socket_util.c b/network_io/unix/socket_util.c index 5fb2ccfe8..93fe25976 100644 --- a/network_io/unix/socket_util.c +++ b/network_io/unix/socket_util.c @@ -46,12 +46,8 @@ APR_DECLARE(apr_status_t) apr_socket_atreadeof(apr_socket_t *sock, int *atreadeo /* Some other error -> unexpected error. */ return rv; } -#if defined(DARWIN) - /* OSX returns APR_POLLHUP|APR_POLLIN */ + /* Many platforms return only APR_POLLIN; OS X returns APR_POLLHUP|APR_POLLIN */ else if (nfds == 1 && (pfds[0].rtnevents & APR_POLLIN) == APR_POLLIN) { -#else - else if (nfds == 1 && pfds[0].rtnevents == APR_POLLIN) { -#endif apr_sockaddr_t unused; apr_size_t len = 1; char buf; |