fix zts build...

diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index 8552c4f3c0a284216ad7f2896dbc94bea9a57d4e..420be9aa07063c6dcecca7f9b673083751178ace 100644 (file)
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -160,7 +160,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 
                switch(php_stream_from_persistent_id(hashkey, &stream TSRMLS_CC)) {
                        case PHP_STREAM_PERSISTENT_SUCCESS:
-                               if (_php_network_is_stream_alive(stream)) {
+                               if (_php_network_is_stream_alive(stream TSRMLS_CC)) {
                                        php_stream_to_zval(stream, return_value);
                                } else {
                                        /* it died; we need to replace it */

diff --git a/main/network.c b/main/network.c
index 01354cea3d33b1cb1f164687bc7b0bb079e158b8..0b815ff3bbc6f7d2cc9a8c9e4d577a2574673271 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -1133,7 +1133,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
 }
 
 /* private API; don't use in extensions */
-int _php_network_is_stream_alive(php_stream *stream)
+int _php_network_is_stream_alive(php_stream *stream TSRMLS_DC)
 {
        php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
        int alive = 1;

diff --git a/main/php_network.h b/main/php_network.h
index 65646ab50a04012a4368d25cbd02cccf59c87a4f..5ca34f13084c3c1520b6f9e5ad91109f20989825 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -156,7 +156,7 @@ PHPAPI php_stream *_php_stream_sock_open_unix(const char *path, int pathlen, con
 /* }}} */
 
 /* private API; don't use in extensions */
-int _php_network_is_stream_alive(php_stream *stream);
+int _php_network_is_stream_alive(php_stream *stream TSRMLS_DC);
 
 #ifdef HAVE_OPENSSL_EXT
 PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method, php_stream *session_stream TSRMLS_DC);

diff --git a/main/streams.c b/main/streams.c
index 76647f1db6d837f295bbec951af1af9d97dd32f6..da7f91635a420a8bbfbc02118d4154fdc4cd8961 100755 (executable)
--- a/main/streams.c
+++ b/main/streams.c
@@ -660,7 +660,7 @@ PHPAPI int _php_stream_eof(php_stream *stream TSRMLS_DC)
                return 0;
 
        if (!stream->eof && php_stream_is(stream, PHP_STREAM_IS_SOCKET)) {
-               stream->eof = !_php_network_is_stream_alive(stream);
+               stream->eof = !_php_network_is_stream_alive(stream TSRMLS_CC);
        }
        
        return stream->eof;