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

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