]> granicus.if.org Git - php/commitdiff
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
authorXinchen Hui <laruence@gmail.com>
Mon, 9 Jan 2017 08:30:00 +0000 (16:30 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 9 Jan 2017 08:30:00 +0000 (16:30 +0800)
ext/openssl/xp_ssl.c

index 4c6ef9f829dbaf1020da6356bc99231d8bf71ba2..b4387cd7383bf8796eda69aa89dd38490f1979a1 100644 (file)
@@ -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;
                }