com php-src: Fixed bug #73854 (Always true condition in php_openssl_sockop_io): ext/openssl/xp_ssl.c
| From: | Xinchen Hui | Date: | Mon, 09 Jan 2017 08:30:00 +0000 |
| Subject: | com php-src: Fixed bug #73854 (Always true condition in php_openssl_sockop_io): ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96645@lists.php.net to get a copy of this message | ||
Commit: f7cb79431f621381722f504e75d1e71e72df6de9
Author: Xinchen Hui <laruence@gmail.com> Mon, 9 Jan 2017 16:30:00 +0800
Parents: 8dd523a21604bfb0c8ac70367396507ce9fe77cb
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f7cb79431f621381722f504e75d1e71e72df6de9
Log:
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
Bugs:
https://bugs.php.net/73854
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 4c6ef9f..b4387cd 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -1951,7 +1951,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;
}