com php-src: Revert "Revert "suggest parentheses around ‘&&’ within ‘||’" ": main/streams/xp_socket.c

Commit: 9834cd93392fc94f307486e35f04fe5e8b7bba89 Author: Xinchen Hui <laruence@php.net> Tue, 11 Aug 2015 22:34:39 +0800 Parents: 5a640d8aed0d7a2ff7a7b48b32c8269efc5cd2f0 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9834cd93392fc94f307486e35f04fe5e8b7bba89 Log: Revert "Revert "suggest parentheses around ‘&&’ within ‘||’"" This reverts commit ec1e8929c4e4c287d919945811475905e1391b7f. Changed paths: M main/streams/xp_socket.c Diff: diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index da80a0a..e88bb91 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -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; } }