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

diff --cc ext/openssl/xp_ssl.c
index 79d4a09f66130756ef22747b64edb84681fcea50,b2a939df3d15cace855955190c2aca023e26203f..5736caa2e5bbb814c73460391a01fffbe60d0095
--- 1/ext/openssl/xp_ssl.c
--- 2/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -881,20 -871,22 +881,22 @@@ 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);
-                                       }
+                               /* 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);
                                }
  
 -                              *(int *)ret = sslsock->s.socket;
 +                              *(php_socket_t *)ret = sslsock->s.socket;
                        }
                        return SUCCESS;