diff options
| author | Xinchen Hui <laruence@php.net> | 2015-08-11 22:34:39 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-08-11 22:34:39 +0800 |
| commit | 9834cd93392fc94f307486e35f04fe5e8b7bba89 (patch) | |
| tree | 710ab38e38670f5f339a4c698a1203a2d1735f34 | |
| parent | 5a640d8aed0d7a2ff7a7b48b32c8269efc5cd2f0 (diff) | |
| download | php-git-9834cd93392fc94f307486e35f04fe5e8b7bba89.tar.gz | |
Revert "Revert "suggest parentheses around ‘&&’ within ‘||’""
This reverts commit ec1e8929c4e4c287d919945811475905e1391b7f.
| -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 da80a0a850..e88bb91208 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; } } |