Fixed bug #73854 (Always true condition in php_openssl_sockop_io)

laruence · laruence · commit f7cb79431f62 · 2017-01-09T16:30:00.000+08:00
diff --git 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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1951,7 +1951,7 @@ static size_t php_openssl_sockop_io(int read, php_stream stream, char buf, siz`
`1951`	`1951`	`}`
`1952`	`1952`
`1953`	`1953`	`/* never use a timeout with non-blocking sockets */`
`1954`		`- if (began_blocked && &sslsock->s.timeout) {`
	`1954`	`+ if (began_blocked) {`
`1955`	`1955`	`timeout = &sslsock->s.timeout;`
`1956`	`1956`	`}`
`1957`	`1957`