From: Daniel Lowrey <rdlowrey@php.net>
Date: Wed, 11 Mar 2015 15:45:28 +0000 (-0600)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~701
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=589374d02723ad71a35e0512fdd65a1c7d18bf69;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Don't block on crypto data inside stream_select()
---

589374d02723ad71a35e0512fdd65a1c7d18bf69
diff --cc ext/openssl/xp_ssl.c
index 3ef0360114,adef9120d6..5ae6084cf7
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -2459,20 -2284,16 +2459,16 @@@ static int php_openssl_sockop_cast(php_
  
  		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);
- 					}
+ 				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);
  				}
  
 -				*(int *)ret = sslsock->s.socket;
 +				*(php_socket_t *)ret = sslsock->s.socket;
  			}
  			return SUCCESS;