Merge branch 'PHP-7.0' into PHP-7.1

laruence · laruence · commit 697809d425b2 · 2017-01-09T16:30:48.000+08:00
* PHP-7.0:
  Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
diff --git 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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1921,7 +1921,7 @@ static size_t php_openssl_sockop_io(int read, php_stream stream, char buf, siz`
`1921`	`1921`	`}`
`1922`	`1922`
`1923`	`1923`	`/* never use a timeout with non-blocking sockets */`
`1924`		`- if (began_blocked && &sslsock->s.timeout) {`
	`1924`	`+ if (began_blocked) {`
`1925`	`1925`	`timeout = &sslsock->s.timeout;`
`1926`	`1926`	`}`
`1927`	`1927`