diff options
| author | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
| commit | 073d039ce1755179ade6d76571f16045ade34213 (patch) | |
| tree | 0e023fb89b7a7e9a4fa11cfb7d9118a7510d2640 /contrib/apr/network_io/unix/socket_util.c | |
| parent | c5be37fb1f34d0c40f8f70140824b785f414c4da (diff) | |
| parent | ca02a2bfd2f08739388e00fb3bbe93fa3fa5efb0 (diff) | |
| download | FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.zip FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.tar.gz | |
Merge apr-1.4.8 -> apr-1.5.1 and update.
Diffstat (limited to 'contrib/apr/network_io/unix/socket_util.c')
| -rw-r--r-- | contrib/apr/network_io/unix/socket_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/apr/network_io/unix/socket_util.c b/contrib/apr/network_io/unix/socket_util.c index 6cd28a5..93fe259 100644 --- a/contrib/apr/network_io/unix/socket_util.c +++ b/contrib/apr/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; |
