diff options
| author | peter <peter@FreeBSD.org> | 2014-05-27 07:00:33 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-05-27 07:00:33 +0000 |
| commit | ca02a2bfd2f08739388e00fb3bbe93fa3fa5efb0 (patch) | |
| tree | 6266be92f31f93e7851b958a90b1f93c3aefbbe8 /network_io/unix/socket_util.c | |
| parent | ed0c2f87192e10d255a0e36819e6df2a1d83d5fb (diff) | |
| download | FreeBSD-src-ca02a2bfd2f08739388e00fb3bbe93fa3fa5efb0.zip FreeBSD-src-ca02a2bfd2f08739388e00fb3bbe93fa3fa5efb0.tar.gz | |
Vendor import apr-1.5.1
Diffstat (limited to 'network_io/unix/socket_util.c')
| -rw-r--r-- | network_io/unix/socket_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/network_io/unix/socket_util.c b/network_io/unix/socket_util.c index 6cd28a5..93fe259 100644 --- a/network_io/unix/socket_util.c +++ b/network_io/unix/socket_util.c @@ -46,7 +46,8 @@ APR_DECLARE(apr_status_t) apr_socket_atreadeof(apr_socket_t *sock, int *atreadeo /* Some other error -> unexpected error. */ return rv; } - else if (nfds == 1 && pfds[0].rtnevents == 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) { apr_sockaddr_t unused; apr_size_t len = 1; char buf; |
