diff options
author | Xinchen Hui <laruence@gmail.com> | 2017-01-09 16:30:48 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2017-01-09 16:30:48 +0800 |
commit | 697809d425b2d495e39c948b435bd93445ae36bb (patch) | |
tree | d2ce1dec7ec14004aba8127b7e9d40c5d5477c4c | |
parent | bf6eb656732ca7f09bcfdcc7e11fb3b64a3dcc7d (diff) | |
parent | f7cb79431f621381722f504e75d1e71e72df6de9 (diff) | |
download | php-git-697809d425b2d495e39c948b435bd93445ae36bb.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
-rw-r--r-- | ext/openssl/xp_ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 9e56915640..6fa25b505d 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1921,7 +1921,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz } /* never use a timeout with non-blocking sockets */ - if (began_blocked && &sslsock->s.timeout) { + if (began_blocked) { timeout = &sslsock->s.timeout; } |