diff options
author | Daniel Lowrey <rdlowrey@php.net> | 2014-09-09 09:27:20 -0600 |
---|---|---|
committer | Daniel Lowrey <rdlowrey@php.net> | 2014-09-09 09:27:20 -0600 |
commit | bf2f80b22356cd93748dd7551dfa0b54fb53e5b5 (patch) | |
tree | 6e92c2abce8ebc686e1081f74d0c7382137f32a0 | |
parent | b9ac5e23fb1b347b5eab250832999e291d65807a (diff) | |
parent | 372844918a318ad712e16f9ec636682424a65403 (diff) | |
download | php-git-bf2f80b22356cd93748dd7551dfa0b54fb53e5b5.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #41631: Fix regression from first attempt (6569db8)
Bug #67965: Fix blocking behavior in non-blocking crypto streams
-rw-r--r-- | ext/openssl/xp_ssl.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 79d4a09f66..5736caa2e5 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; @@ -881,17 +881,19 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS case PHP_STREAM_AS_FD_FOR_SELECT: if (ret) { - if (sslsock->ssl_active) { - /* OpenSSL has an internal buffer which select() cannot see. If we don't - fetch it into the stream's buffer, no activity will be reported on the - stream even though there is data waiting to be read - but we only fetch - the number of bytes OpenSSL has ready to give us since we weren't asked - for any data at this stage. This is only likely to cause issues with - non-blocking streams, but it's harmless to always do it. */ - int bytes; - while ((bytes = SSL_pending(sslsock->ssl_handle)) > 0) { - php_stream_fill_read_buffer(stream, (size_t)bytes); - } + /* OpenSSL has an internal buffer which select() cannot see. If we don't + * fetch it into the stream's buffer, no activity will be reported on the + * stream even though there is data waiting to be read - but we only fetch + * the lower of bytes OpenSSL has ready to give us or chunk_size since we + * weren't asked for any data at this stage. This is only likely to cause + * issues with non-blocking streams, but it's harmless to always do it. */ + size_t pending; + if (stream->writepos == stream->readpos + && sslsock->ssl_active + && (pending = (size_t)SSL_pending(sslsock->ssl_handle)) > 0) { + php_stream_fill_read_buffer(stream, pending < stream->chunk_size + ? pending + : stream->chunk_size); } *(php_socket_t *)ret = sslsock->s.socket; |