diff options
| author | Felipe Pena <felipe@php.net> | 2009-11-16 10:36:27 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-11-16 10:36:27 +0000 |
| commit | f61a06350a03e3c8da7e9b3ba42f50e214b566d8 (patch) | |
| tree | 67b70c85c6e0b5e99ae0c66ace67487befc7a869 /main | |
| parent | 5411bb32a8f2da134ce38ec202aeff29d68da20d (diff) | |
| download | php-git-f61a06350a03e3c8da7e9b3ba42f50e214b566d8.tar.gz | |
- Switching to TSRMLS_FETCH version
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/php_stream_context.h | 2 | ||||
| -rwxr-xr-x | main/streams/streams.c | 3 | ||||
| -rw-r--r-- | main/streams/transports.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/main/streams/php_stream_context.h b/main/streams/php_stream_context.h index f1bd70986a..cfe3b56d9b 100644 --- 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 fbfc1af5ee..0df65b3bec 100755 --- 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 9a08ae4e5a..a52ee486bc 100644 --- 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 */ |