diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-09-09 07:50:15 -0600 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-09-09 09:01:42 -0600 |
| commit | 372844918a318ad712e16f9ec636682424a65403 (patch) | |
| tree | 96316e5fb10653d4d385c6c67f30f82a04fc9c38 | |
| parent | f86b2193a483f56b0bd056570a0cdb57ebe66e2f (diff) | |
| download | php-git-372844918a318ad712e16f9ec636682424a65403.tar.gz | |
Bug #41631: Fix regression from first attempt (6569db8)
| -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 76095b4df2..b2a939df3d 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) { + if (sock->is_blocked && SSL_pending(sslsock->ssl_handle) == 0) { php_openssl_stream_wait_for_data(sock); if (sock->timeout_event) { stream->eof = 1; |