From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 15 Oct 2014 17:32:14 +0000 (+0200)
Subject: Revert "Bug #41631: Fix regression from first attempt (6569db8)"
X-Git-Tag: php-5.6.3RC1~59^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff91a48f6ea074ff53a37069b3454840bd08c946;p=php

Revert "Bug #41631: Fix regression from first attempt (6569db8)"

This reverts commit 372844918a318ad712e16f9ec636682424a65403.
---

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 2f81dc7e47..feaf09d3c6 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -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;