apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1543057 - in /apr/apr/branches/1.5.x: ./ network_io/unix/socket_util.c
Date Mon, 18 Nov 2013 15:17:39 GMT
Author: jim
Date: Mon Nov 18 15:17:39 2013
New Revision: 1543057

URL: http://svn.apache.org/r1543057
Log:
Merge r1543056 from trunk:

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.)

Submitted by: trawick
Reviewed/backported by: jim

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/network_io/unix/socket_util.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1543056

Modified: apr/apr/branches/1.5.x/network_io/unix/socket_util.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/network_io/unix/socket_util.c?rev=1543057&r1=1543056&r2=1543057&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/network_io/unix/socket_util.c (original)
+++ apr/apr/branches/1.5.x/network_io/unix/socket_util.c Mon Nov 18 15:17:39 2013
@@ -46,12 +46,8 @@ APR_DECLARE(apr_status_t) apr_socket_atr
         /* 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;



Mime
View raw message