From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 15 Oct 2014 17:32:46 +0000 (+0200)
Subject: Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
X-Git-Tag: php-5.6.3RC1~59^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=528e4166a69241a4e2536325d343ee0c33620954;p=php

Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"

This reverts commit f86b2193a483f56b0bd056570a0cdb57ebe66e2f.
---

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index feaf09d3c6..272a5b1f27 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -2179,19 +2179,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;