com php-src: Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams": ext/openssl/xp_ssl.c

Commit: 29eedc7048921d05141ef63f18e86074644752a3 Author: Julien Pauli <jpauli@php.net> Wed, 1 Oct 2014 15:59:26 +0200 Parents: 28eccb918e9eb8080338b5aad6e60c3410d37781 Branches: PHP-5.5.18 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29eedc7048921d05141ef63f18e86074644752a3 Log: Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams" This reverts commit f86b2193a483f56b0bd056570a0cdb57ebe66e2f. Bugs: https://bugs.php.net/67965 Changed paths: M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 0c097e9..79d4a09 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -881,19 +881,17 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS case PHP_STREAM_AS_FD_FOR_SELECT: if (ret) { - /* 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); + 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); + } } *(php_socket_t *)ret = sslsock->s.socket;