felipe Mon, 16 Nov 2009 10:36:27 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=290803
Log: - Switching to TSRMLS_FETCH version Changed paths: U php/php-src/branches/PHP_5_3/ext/curl/streams.c U php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c U php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h U php/php-src/branches/PHP_5_3/main/streams/streams.c U php/php-src/branches/PHP_5_3/main/streams/transports.c Modified: php/php-src/branches/PHP_5_3/ext/curl/streams.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/streams.c 2009-11-16 06:06:29 UTC (rev 290802) +++ php/php-src/branches/PHP_5_3/ext/curl/streams.c 2009-11-16 10:36:27 UTC (rev 290803) @@ -270,7 +270,7 @@ 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(); Modified: php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c 2009-11-16 06:06:29 UTC (rev 290802) +++ php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c 2009-11-16 10:36:27 UTC (rev 290803) @@ -143,7 +143,7 @@ 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 @@ 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 @@ 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 || Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2009-11-16 06:06:29 UTC (rev 290802) +++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2009-11-16 10:36:27 UTC (rev 290803) @@ -245,7 +245,7 @@ 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); Modified: php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h =================================================================== --- php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h 2009-11-16 06:06:29 UTC (rev 290802) +++ php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h 2009-11-16 10:36:27 UTC (rev 290803) @@ -95,7 +95,7 @@ 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) { \ Modified: php/php-src/branches/PHP_5_3/main/streams/streams.c =================================================================== --- php/php-src/branches/PHP_5_3/main/streams/streams.c 2009-11-16 06:06:29 UTC (rev 290802) +++ php/php-src/branches/PHP_5_3/main/streams/streams.c 2009-11-16 10:36:27 UTC (rev 290803) @@ -1958,9 +1958,10 @@ /* }}} */ /* {{{ 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; Modified: php/php-src/branches/PHP_5_3/main/streams/transports.c =================================================================== --- php/php-src/branches/PHP_5_3/main/streams/transports.c 2009-11-16 06:06:29 UTC (rev 290802) +++ php/php-src/branches/PHP_5_3/main/streams/transports.c 2009-11-16 10:36:27 UTC (rev 290803) @@ -134,7 +134,7 @@ 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 */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php