- Switching to TSRMLS_FETCH version

diff --git a/ext/curl/streams.c b/ext/curl/streams.c
index 413f5af73725fa1cdefc95b6950a9621c4849c55..63d43c762326857aeca1a04644a694aea540b503 100644 (file)
--- a/ext/curl/streams.c
+++ b/ext/curl/streams.c
@@ -270,7 +270,7 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
        memset(curlstream, 0, sizeof(php_curl_stream));
 
        stream = php_stream_alloc(&php_curl_stream_ops, curlstream, 0, mode);
-       php_stream_context_set(stream, context TSRMLS_CC);
+       php_stream_context_set(stream, context);
 
        curlstream->curl = curl_easy_init();
        curlstream->multi = curl_multi_init();

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 42e1cd272f6d0046d24c45838ffe8b5a71f2939d..12ae11f3af4d938bebfff3a256664566cf8a4959 100644 (file)
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -143,7 +143,7 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, char *path
                goto connect_errexit;
        }
 
-       php_stream_context_set(stream, context TSRMLS_CC);
+       php_stream_context_set(stream, context);
        php_stream_notify_info(context, PHP_STREAM_NOTIFY_CONNECT, NULL, 0);
 
        /* Start talking to ftp server */
@@ -550,7 +550,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
                goto errexit;   
        }
        
-       php_stream_context_set(datastream, context TSRMLS_CC);
+       php_stream_context_set(datastream, context);
        php_stream_notify_progress_init(context, 0, file_size);
 
        if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream,
@@ -715,7 +715,7 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, char *path, cha
                goto opendir_errexit;   
        }
        
-       php_stream_context_set(datastream, context TSRMLS_CC);
+       php_stream_context_set(datastream, context);
 
        if (use_ssl_on_data && (php_stream_xport_crypto_setup(stream,
                        STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 ||

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index fe90fbc6c37b42f3b208bfb57aec8f827747059e..0e598909fa93256bedf9ea1bf71fefda55cf64b9 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -245,7 +245,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
        eol_detect = stream->flags & (PHP_STREAM_FLAG_DETECT_EOL | PHP_STREAM_FLAG_EOL_MAC);
        stream->flags &= ~(PHP_STREAM_FLAG_DETECT_EOL | PHP_STREAM_FLAG_EOL_MAC);
 
-       php_stream_context_set(stream, context TSRMLS_CC);
+       php_stream_context_set(stream, context);
 
        php_stream_notify_info(context, PHP_STREAM_NOTIFY_CONNECT, NULL, 0);
 

diff --git a/main/streams/php_stream_context.h b/main/streams/php_stream_context.h
index f1bd70986a7eaf9c017f2e98c3fb68ea7d2cd8ee..cfe3b56d9be5a3ece6b10b179a68c077f018cb88 100644 (file)
--- a/main/streams/php_stream_context.h
+++ b/main/streams/php_stream_context.h
@@ -95,7 +95,7 @@ END_EXTERN_C()
 BEGIN_EXTERN_C()
 PHPAPI void php_stream_notification_notify(php_stream_context *context, int notifycode, int severity,
                char *xmsg, int xcode, size_t bytes_sofar, size_t bytes_max, void * ptr TSRMLS_DC);
-PHPAPI php_stream_context *php_stream_context_set(php_stream *stream, php_stream_context *context TSRMLS_DC);
+PHPAPI php_stream_context *php_stream_context_set(php_stream *stream, php_stream_context *context);
 END_EXTERN_C()
 
 #define php_stream_notify_info(context, code, xmsg, xcode)     do { if ((context) && (context)->notifier) { \

diff --git a/main/streams/streams.c b/main/streams/streams.c
index fbfc1af5ee67d2a99db5ce7f7e9d65a071d51a7f..0df65b3bec13b44eeaf4eed45378238f95f55b89 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1958,9 +1958,10 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
 /* }}} */
 
 /* {{{ context API */
-PHPAPI php_stream_context *php_stream_context_set(php_stream *stream, php_stream_context *context TSRMLS_DC)
+PHPAPI php_stream_context *php_stream_context_set(php_stream *stream, php_stream_context *context)
 {
        php_stream_context *oldcontext = stream->context;
+       TSRMLS_FETCH();
 
        stream->context = context;
 

diff --git a/main/streams/transports.c b/main/streams/transports.c
index 9a08ae4e5a742d5d7c2d1624d195904e5d5c5978..a52ee486bc0ca806591b7cf094e6226380b5204f 100644 (file)
--- a/main/streams/transports.c
+++ b/main/streams/transports.c
@@ -134,7 +134,7 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, long namelen, int
                        context STREAMS_REL_CC TSRMLS_CC);
 
        if (stream) {
-               php_stream_context_set(stream, context TSRMLS_CC);
+               php_stream_context_set(stream, context);
 
                if ((flags & STREAM_XPORT_SERVER) == 0) {
                        /* client */