Merge branch 'PHP-5.6'

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

diff --cc ext/openssl/xp_ssl.c
index 3ef03601140ecc54938a4bf662c686b0e679e39e,adef9120d614985d9593dc1411fab262f1a05cbc..5ae6084cf79ad8c79adadf6fea74f3282733a3aa
--- 1/ext/openssl/xp_ssl.c
--- 2/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;