com php-src: Revert "Bug #41631: Fix regression from first attempt (6569db8)": ext/openssl/xp_ssl.c

Commit: 28eccb918e9eb8080338b5aad6e60c3410d37781 Author: Julien Pauli <jpauli@php.net> Wed, 1 Oct 2014 15:59:00 +0200 Parents: 7319298ffe514aa0ddfbcd522a4f5286f6a6c3cc Branches: PHP-5.5.18 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=28eccb918e9eb8080338b5aad6e60c3410d37781 Log: Revert "Bug #41631: Fix regression from first attempt (6569db8)" This reverts commit 372844918a318ad712e16f9ec636682424a65403. Bugs: https://bugs.php.net/41631 Changed paths: M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 5736caa..0c097e9 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -249,7 +249,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;