diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-09-24 10:12:56 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-09-24 10:12:56 +0200 |
| commit | 4310db437ae42c99ffea04e9b05f3dbe07f1bd6f (patch) | |
| tree | a911070da722fef5196390697254a19cd3ebb955 | |
| parent | 725748cd25a97beac5852f81def8c5bc98f6ab7c (diff) | |
| download | php-git-4310db437ae42c99ffea04e9b05f3dbe07f1bd6f.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 de9e9911c1..0fa1ecdf88 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1849,7 +1849,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; |