diff options
| author | Julien Pauli <jpauli@php.net> | 2014-10-01 15:59:00 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-10-01 15:59:00 +0200 |
| commit | 28eccb918e9eb8080338b5aad6e60c3410d37781 (patch) | |
| tree | 45779916e30d6389a8ed7f8cb83c76dfd4656fe9 | |
| parent | 7319298ffe514aa0ddfbcd522a4f5286f6a6c3cc (diff) | |
| download | php-git-28eccb918e9eb8080338b5aad6e60c3410d37781.tar.gz | |
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
This reverts commit 372844918a318ad712e16f9ec636682424a65403.
| -rw-r--r-- | ext/openssl/xp_ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 5736caa2e5..0c097e90a9 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; |