diff options
| author | Xinchen Hui <laruence@php.net> | 2015-08-11 22:14:37 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-08-11 22:14:37 +0800 |
| commit | ec1e8929c4e4c287d919945811475905e1391b7f (patch) | |
| tree | 5afde1bc0b1c41ed3b194f1206e0cc4176503a9e /main/streams/xp_socket.c | |
| parent | b997130a341f8ab724f470191adbef59a20797fd (diff) | |
| download | php-git-ec1e8929c4e4c287d919945811475905e1391b7f.tar.gz | |
Revert "suggest parentheses around ‘&&’ within ‘||’"
This reverts commit 4f2c0e045132de51473b643c68e07e5b2c2e218b.
Diffstat (limited to 'main/streams/xp_socket.c')
| -rw-r--r-- | main/streams/xp_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index e88bb91208..da80a0a850 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; } } |