Revert "Merge branch 'PHP-5.4' into PHP-5.5"

This reverts commit 30a73658c63a91c413305a4c4d49882fda4dab3e, reversing
changes made to 7fac56e0729385bbd2bb040f06a20a697d9de5fd.

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 272a5b1f27496d439f2d099c297ca8d3bbd1af96..1a70fb93459746e28b2b7da1ba1ff7b8a1e76475 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -2179,19 +2179,6 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS
 
                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);
-                                       }
-                               }
-
                                *(php_socket_t *)ret = sslsock->s.socket;
                        }
                        return SUCCESS;

diff --git a/main/php_streams.h b/main/php_streams.h
index e90976cdca93eaf0d20643b9090f8ff521f1bbde..d1efa71988031630784f91e54c91d1795c233fce 100644 (file)
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -297,9 +297,6 @@ PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t coun
 #define php_stream_write_string(stream, str)   _php_stream_write(stream, str, strlen(str) TSRMLS_CC)
 #define php_stream_write(stream, buf, count)   _php_stream_write(stream, (buf), (count) TSRMLS_CC)
 
-PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC);
-#define php_stream_fill_read_buffer(stream, size)      _php_stream_fill_read_buffer((stream), (size) TSRMLS_CC)
-
 #ifdef ZTS
 PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
 #else

diff --git a/main/streams/streams.c b/main/streams/streams.c
index d0d4fffa0a97c53ae7847593216a9921caddb7ee..67a151014d6a22ebd44985a1b88ce9d86e5667ac 100644 (file)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -568,7 +568,7 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov
 
 /* {{{ generic stream operations */
 
-PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC)
+static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC)
 {
        /* allocate/fill the buffer */
 
@@ -736,7 +736,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
                                break;
                        }
                } else {
-                       php_stream_fill_read_buffer(stream, size);
+                       php_stream_fill_read_buffer(stream, size TSRMLS_CC);
 
                        toread = stream->writepos - stream->readpos;
                        if (toread > size) {
@@ -972,7 +972,7 @@ PHPAPI char *_php_stream_get_line(php_stream *stream, char *buf, size_t maxlen,
                                }
                        }
 
-                       php_stream_fill_read_buffer(stream, toread);
+                       php_stream_fill_read_buffer(stream, toread TSRMLS_CC);
 
                        if (stream->writepos - stream->readpos == 0) {
                                break;
@@ -1047,7 +1047,7 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re
 
                to_read_now = MIN(maxlen - buffered_len, stream->chunk_size);
 
-               php_stream_fill_read_buffer(stream, buffered_len + to_read_now);
+               php_stream_fill_read_buffer(stream, buffered_len + to_read_now TSRMLS_CC);
 
                just_read = STREAM_BUFFERED_AMOUNT(stream) - buffered_len;