]> granicus.if.org Git - php/commitdiff
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
authorFerenc Kovacs <tyrael@php.net>
Wed, 15 Oct 2014 17:32:14 +0000 (19:32 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 15 Oct 2014 17:32:14 +0000 (19:32 +0200)
This reverts commit 372844918a318ad712e16f9ec636682424a65403.

ext/openssl/xp_ssl.c

index 2f81dc7e47bd3f6cb91109166d89df701078a978..feaf09d3c6e3ebf2f2055212c8e10be231119b35 100644 (file)
@@ -1852,7 +1852,7 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun
                   to hang forever. To avoid this scenario we poll with a timeout before performing
                   the actual read. If it times out we're finished.
                */
-               if (sock->is_blocked && SSL_pending(sslsock->ssl_handle) == 0) {
+               if (sock->is_blocked) {
                        php_openssl_stream_wait_for_data(sock);
                        if (sock->timeout_event) {
                                stream->eof = 1;