]> granicus.if.org Git - php/commitdiff
Revert "suggest parentheses around ‘&&’ within ‘||’"
authorXinchen Hui <laruence@php.net>
Tue, 11 Aug 2015 14:14:37 +0000 (22:14 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 11 Aug 2015 14:14:37 +0000 (22:14 +0800)
This reverts commit 4f2c0e045132de51473b643c68e07e5b2c2e218b.

main/streams/xp_socket.c

index e88bb91208ce6722b008bea1fae4fcb17c9b9581..da80a0a8507e490f706a04abfaeb5082bd3e1b92 100644 (file)
@@ -326,7 +326,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
                                        ret = recv(sock->socket, &buf, sizeof(buf), MSG_PEEK);
                                        err = php_socket_errno();
                                        if (0 == ret || /* the counterpart did properly shutdown*/
-                                               (0 > ret && err != EWOULDBLOCK && err != EAGAIN)) { /* there was an unrecoverable error */
+                                               0 > ret && err != EWOULDBLOCK && err != EAGAIN) { /* there was an unrecoverable error */
                                                alive = 0;
                                        }
                                }