diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/memory_streams.c | 43 | ||||
| -rw-r--r-- | main/network.c | 45 | ||||
| -rw-r--r-- | main/php_globals.h | 8 | ||||
| -rw-r--r-- | main/php_memory_streams.h | 24 | ||||
| -rw-r--r-- | main/php_network.h | 28 | ||||
| -rwxr-xr-x | main/php_streams.h | 152 | ||||
| -rwxr-xr-x | main/streams.c | 133 |
8 files changed, 237 insertions, 198 deletions
diff --git a/main/main.c b/main/main.c index 85f68371b6..b7abac4af2 100644 --- a/main/main.c +++ b/main/main.c @@ -570,7 +570,7 @@ static FILE *php_fopen_wrapper_for_zend(const char *filename, char **opened_path stream = php_stream_open_wrapper((char *)filename, "rb", USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS, opened_path); if (stream) { /* no need for us to check the stream type here */ - php_stream_sock_set_chunk_size(stream, 1); + php_stream_sock_set_chunk_size(stream, 1 TSRMLS_CC); /* when this succeeds, stream either has or will be freed automatically */ if (php_stream_cast(stream, PHP_STREAM_AS_STDIO|PHP_STREAM_CAST_TRY_HARD|PHP_STREAM_CAST_RELEASE, diff --git a/main/memory_streams.c b/main/memory_streams.c index fc28e63fc3..0ea76898b6 100644 --- a/main/memory_streams.c +++ b/main/memory_streams.c @@ -40,7 +40,7 @@ typedef struct { int mode; } php_stream_memory_data; -static size_t php_stream_memory_write(php_stream *stream, const char *buf, size_t count) { /* {{{ */ +static size_t php_stream_memory_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) { /* {{{ */ php_stream_memory_data *ms; assert(stream != NULL); @@ -75,7 +75,7 @@ static size_t php_stream_memory_write(php_stream *stream, const char *buf, size_ return count; } /* }}} */ -static size_t php_stream_memory_read(php_stream *stream, char *buf, size_t count) { /* {{{ */ +static size_t php_stream_memory_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) { /* {{{ */ php_stream_memory_data *ms; assert(stream != NULL); @@ -103,7 +103,7 @@ static size_t php_stream_memory_read(php_stream *stream, char *buf, size_t count } /* }}} */ -static int php_stream_memory_close(php_stream *stream, int close_handle) { /* {{{ */ +static int php_stream_memory_close(php_stream *stream, int close_handle TSRMLS_DC) { /* {{{ */ php_stream_memory_data *ms; assert(stream != NULL); @@ -120,13 +120,13 @@ static int php_stream_memory_close(php_stream *stream, int close_handle) { /* {{ } /* }}} */ -static int php_stream_memory_flush(php_stream *stream) { /* {{{ */ +static int php_stream_memory_flush(php_stream *stream TSRMLS_DC) { /* {{{ */ /* nothing to do here */ return 0; } /* }}} */ -static int php_stream_memory_seek(php_stream *stream, off_t offset, int whence) { /* {{{ */ +static int php_stream_memory_seek(php_stream *stream, off_t offset, int whence TSRMLS_DC) { /* {{{ */ php_stream_memory_data *ms; assert(stream != NULL); @@ -178,7 +178,7 @@ static int php_stream_memory_seek(php_stream *stream, off_t offset, int whence) } } /* }}} */ -static char *php_stream_memory_gets(php_stream *stream, char *buf, size_t maxlen) { /* {{{ */ +static char *php_stream_memory_gets(php_stream *stream, char *buf, size_t maxlen TSRMLS_DC) { /* {{{ */ size_t n = 1; char *c = buf; @@ -202,7 +202,7 @@ static char *php_stream_memory_gets(php_stream *stream, char *buf, size_t maxlen return buf; } /* }}} */ -static int php_stream_memory_cast(php_stream *stream, int castas, void **ret) { /* {{{ */ +static int php_stream_memory_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) { /* {{{ */ return FAILURE; } /* }}} */ @@ -215,7 +215,7 @@ php_stream_ops php_stream_memory_ops = { "MEMORY" }; -PHPAPI php_stream *_php_stream_memory_create(int mode STREAMS_DC) { /* {{{ */ +PHPAPI php_stream *_php_stream_memory_create(int mode STREAMS_DC TSRMLS_DC) { /* {{{ */ php_stream_memory_data *self; self = emalloc(sizeof(*self)); @@ -228,7 +228,7 @@ PHPAPI php_stream *_php_stream_memory_create(int mode STREAMS_DC) { /* {{{ */ return php_stream_alloc(&php_stream_memory_ops, self, 0, "rwb"); } /* }}} */ -PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length STREAMS_DC) { /* {{{ */ +PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length STREAMS_DC TSRMLS_DC) { /* {{{ */ php_stream *stream; php_stream_memory_data *ms; @@ -242,7 +242,7 @@ PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length ST return stream; } /* }}} */ -PHPAPI char *_php_stream_memory_get_buffer(php_stream *stream, size_t *length STREAMS_DC) { /* {{{ */ +PHPAPI char *_php_stream_memory_get_buffer(php_stream *stream, size_t *length STREAMS_DC TSRMLS_DC) { /* {{{ */ php_stream_memory_data *ms; assert(stream != NULL); @@ -264,9 +264,8 @@ typedef struct { int mode; } php_stream_temp_data; -static size_t php_stream_temp_write(php_stream *stream, const char *buf, size_t count) { /* {{{ */ +static size_t php_stream_temp_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) { /* {{{ */ php_stream_temp_data *ts; - TSRMLS_FETCH(); assert(stream != NULL); ts = stream->abstract; @@ -286,7 +285,7 @@ static size_t php_stream_temp_write(php_stream *stream, const char *buf, size_t return php_stream_write(ts->innerstream, buf, count); } /* }}} */ -static size_t php_stream_temp_read(php_stream *stream, char *buf, size_t count) { /* {{{ */ +static size_t php_stream_temp_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) { /* {{{ */ php_stream_temp_data *ts; assert(stream != NULL); @@ -297,7 +296,7 @@ static size_t php_stream_temp_read(php_stream *stream, char *buf, size_t count) } /* }}} */ -static int php_stream_temp_close(php_stream *stream, int close_handle) { /* {{{ */ +static int php_stream_temp_close(php_stream *stream, int close_handle TSRMLS_DC) { /* {{{ */ php_stream_temp_data *ts; assert(stream != NULL); @@ -308,7 +307,7 @@ static int php_stream_temp_close(php_stream *stream, int close_handle) { /* {{{ } /* }}} */ -static int php_stream_temp_flush(php_stream *stream) { /* {{{ */ +static int php_stream_temp_flush(php_stream *stream TSRMLS_DC) { /* {{{ */ php_stream_temp_data *ts; assert(stream != NULL); @@ -319,7 +318,7 @@ static int php_stream_temp_flush(php_stream *stream) { /* {{{ */ } /* }}} */ -static int php_stream_temp_seek(php_stream *stream, off_t offset, int whence) { /* {{{ */ +static int php_stream_temp_seek(php_stream *stream, off_t offset, int whence TSRMLS_DC) { /* {{{ */ php_stream_temp_data *ts; assert(stream != NULL); @@ -329,7 +328,7 @@ static int php_stream_temp_seek(php_stream *stream, off_t offset, int whence) { return php_stream_seek(ts->innerstream, offset, whence); } /* }}} */ -char *php_stream_temp_gets(php_stream *stream, char *buf, size_t maxlen) { /* {{{ */ +char *php_stream_temp_gets(php_stream *stream, char *buf, size_t maxlen TSRMLS_DC) { /* {{{ */ php_stream_temp_data *ts; assert(stream != NULL); @@ -339,7 +338,7 @@ char *php_stream_temp_gets(php_stream *stream, char *buf, size_t maxlen) { /* {{ return php_stream_gets(ts->innerstream, buf, maxlen); } /* }}} */ -static int php_stream_temp_cast(php_stream *stream, int castas, void **ret) { /* {{{ */ +static int php_stream_temp_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) { /* {{{ */ php_stream_temp_data *ts; assert(stream != NULL); @@ -358,7 +357,7 @@ php_stream_ops php_stream_temp_ops = { "TEMP" }; -PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STREAMS_DC) { /* {{{ */ +PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STREAMS_DC TSRMLS_DC) { /* {{{ */ php_stream_temp_data *self; php_stream *stream; @@ -368,18 +367,18 @@ PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STR self->mode = mode; stream = php_stream_alloc(&php_stream_temp_ops, self, 0, "rwb"); self->innerstream = php_stream_memory_create(mode); - php_stream_temp_write(stream, NULL, 0); + php_stream_temp_write(stream, NULL, 0 TSRMLS_CC); return stream; } /* }}} */ -PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char *buf, size_t length STREAMS_DC) { /* {{{ */ +PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char *buf, size_t length STREAMS_DC TSRMLS_DC) { /* {{{ */ php_stream *stream; php_stream_temp_data *ms; if ((stream = php_stream_temp_create_rel(mode & ~TEMP_STREAM_READONLY, max_memory_usage)) != NULL) { if (length) { assert(buf != NULL); - php_stream_temp_write(stream, buf, length); + php_stream_temp_write(stream, buf, length TSRMLS_CC); } ms = stream->abstract; assert(ms != NULL); diff --git a/main/network.c b/main/network.c index 3ae5861c74..e5bbbca57b 100644 --- a/main/network.c +++ b/main/network.c @@ -413,7 +413,7 @@ int php_sockaddr_size(php_sockaddr_storage *addr) } /* }}} */ -PHPAPI php_stream *_php_stream_sock_open_from_socket(int socket, int persistent STREAMS_DC) +PHPAPI php_stream *_php_stream_sock_open_from_socket(int socket, int persistent STREAMS_DC TSRMLS_DC) { php_stream *stream; php_netstream_data_t *sock; @@ -435,7 +435,7 @@ PHPAPI php_stream *_php_stream_sock_open_from_socket(int socket, int persistent } PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short port, - int socktype, int timeout, int persistent STREAMS_DC) + int socktype, int timeout, int persistent STREAMS_DC TSRMLS_DC) { int socket; @@ -448,7 +448,7 @@ PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short p } PHPAPI php_stream *_php_stream_sock_open_unix(const char *path, int pathlen, int persistent, - struct timeval *timeout STREAMS_DC) + struct timeval *timeout STREAMS_DC TSRMLS_DC) { #if defined(AF_UNIX) int socketd; @@ -484,7 +484,7 @@ PHPAPI php_stream *_php_stream_sock_open_unix(const char *path, int pathlen, int } #if HAVE_OPENSSL_EXT -PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method) +PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; SSL_CTX *ctx = NULL; @@ -524,7 +524,7 @@ PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int acti } #endif -PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *timeout) +PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *timeout TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; @@ -535,7 +535,7 @@ PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *time sock->timeout_event = 0; } -PHPAPI int php_stream_sock_set_blocking(php_stream *stream, int mode) +PHPAPI int php_stream_sock_set_blocking(php_stream *stream, int mode TSRMLS_DC) { int oldmode; php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; @@ -549,7 +549,7 @@ PHPAPI int php_stream_sock_set_blocking(php_stream *stream, int mode) return oldmode; } -PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size) +PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size TSRMLS_DC) { size_t oldsize; php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; @@ -567,7 +567,7 @@ PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size) #define READPTR(sock) ((sock)->readbuf + (sock)->readpos) #define WRITEPTR(sock) ((sock)->readbuf + (sock)->writepos) -static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count) +static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; #if HAVE_OPENSSL_EXT @@ -576,7 +576,7 @@ static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count #endif return send(sock->socket, buf, count, 0); } -static void php_sock_stream_wait_for_data(php_stream *stream, php_netstream_data_t *sock) +static void php_sock_stream_wait_for_data(php_stream *stream, php_netstream_data_t *sock TSRMLS_DC) { fd_set fdr, tfdr; int retval; @@ -605,7 +605,7 @@ static void php_sock_stream_wait_for_data(php_stream *stream, php_netstream_data } } -static size_t php_sock_stream_read_internal(php_stream *stream, php_netstream_data_t *sock) +static size_t php_sock_stream_read_internal(php_stream *stream, php_netstream_data_t *sock TSRMLS_DC) { char buf[PHP_SOCK_CHUNK_SIZE]; int nr_bytes; @@ -620,7 +620,7 @@ static size_t php_sock_stream_read_internal(php_stream *stream, php_netstream_da if(sock->is_blocked) { - php_sock_stream_wait_for_data(stream, sock); + php_sock_stream_wait_for_data(stream, sock TSRMLS_CC); if (sock->timeout_event) return 0; } @@ -649,14 +649,14 @@ static size_t php_sock_stream_read_internal(php_stream *stream, php_netstream_da } -static size_t php_sock_stream_read(php_stream *stream, php_netstream_data_t *sock) +static size_t php_sock_stream_read(php_stream *stream, php_netstream_data_t *sock TSRMLS_DC) { size_t nr_bytes; size_t nr_read = 0; int i; for(i = 0; !sock->eof && i < MAX_CHUNKS_PER_READ; i++) { - nr_bytes = php_sock_stream_read_internal(stream, sock); + nr_bytes = php_sock_stream_read_internal(stream, sock TSRMLS_CC); if(nr_bytes == 0) break; nr_read += nr_bytes; } @@ -664,17 +664,17 @@ static size_t php_sock_stream_read(php_stream *stream, php_netstream_data_t *soc return nr_read; } -static size_t php_sockop_read(php_stream *stream, char *buf, size_t count) +static size_t php_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; size_t ret = 0; if (sock->is_blocked) { while(!sock->eof && TOREAD(sock) < count && !sock->timeout_event) - php_sock_stream_read_internal(stream, sock); + php_sock_stream_read_internal(stream, sock TSRMLS_CC); } else - php_sock_stream_read(stream, sock); + php_sock_stream_read(stream, sock TSRMLS_CC); if(count < 0) return ret; @@ -688,7 +688,7 @@ static size_t php_sockop_read(php_stream *stream, char *buf, size_t count) return ret; } -static int php_sockop_close(php_stream *stream, int close_handle) +static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; @@ -714,16 +714,15 @@ static int php_sockop_close(php_stream *stream, int close_handle) return 0; } -static int php_sockop_flush(php_stream *stream) +static int php_sockop_flush(php_stream *stream TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; return fsync(sock->socket); } -static int php_sockop_cast(php_stream *stream, int castas, void **ret) +static int php_sockop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; - TSRMLS_FETCH(); switch(castas) { case PHP_STREAM_AS_STDIO: @@ -768,7 +767,7 @@ static int php_sockop_cast(php_stream *stream, int castas, void **ret) } while (0) -static char *php_sockop_gets(php_stream *stream, char *buf, size_t maxlen) +static char *php_sockop_gets(php_stream *stream, char *buf, size_t maxlen TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; char *p = NULL, *pe; @@ -785,11 +784,11 @@ static char *php_sockop_gets(php_stream *stream, char *buf, size_t maxlen) if(!p) { if(sock->is_blocked) { while(!p && !sock->eof && !sock->timeout_event && TOREAD(sock) < maxlen) { - php_sock_stream_read_internal(stream, sock); + php_sock_stream_read_internal(stream, sock TSRMLS_CC); SEARCHCR(); } } else { - php_sock_stream_read(stream, sock); + php_sock_stream_read(stream, sock TSRMLS_CC); SEARCHCR(); } } diff --git a/main/php_globals.h b/main/php_globals.h index eb7fb6339e..3ae3bbfd4c 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -131,6 +131,14 @@ struct _php_core_globals { zend_bool allow_url_fopen; zend_bool always_populate_raw_post_data; + +#if ZEND_DEBUG + long streams_call_depth; + char * streams_orig_filename; + long streams_orig_lineno; + char * streams_filename; + long streams_lineno; +#endif }; diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h index 64c7c7249d..11c63be622 100644 --- a/main/php_memory_streams.h +++ b/main/php_memory_streams.h @@ -21,22 +21,22 @@ #include "php_streams.h" -#define php_stream_memory_create(mode) _php_stream_memory_create((mode) STREAMS_CC) -#define php_stream_memory_create_rel(mode) _php_stream_memory_create((mode) STREAMS_REL_CC) -#define php_stream_memory_open(mode, buf, length) _php_stream_memory_open((mode), (buf), (length) STREAMS_CC) -#define php_stream_memory_get_buffer(stream, length) _php_stream_memory_get_buffer((stream), (length) STREAMS_CC) +#define php_stream_memory_create(mode) _php_stream_memory_create((mode) STREAMS_CC TSRMLS_CC) +#define php_stream_memory_create_rel(mode) _php_stream_memory_create((mode) STREAMS_REL_CC TSRMLS_CC) +#define php_stream_memory_open(mode, buf, length) _php_stream_memory_open((mode), (buf), (length) STREAMS_CC TSRMLS_CC) +#define php_stream_memory_get_buffer(stream, length) _php_stream_memory_get_buffer((stream), (length) STREAMS_CC TSRMLS_CC) -#define php_stream_temp_create(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_CC) -#define php_stream_temp_create_rel(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_REL_CC) -#define php_stream_temp_open(mode, max_memory_usage, buf, length) _php_stream_temp_open((mode), (max_memory_usage), (buf), (length) STREAMS_CC) +#define php_stream_temp_create(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_CC TSRMLS_CC) +#define php_stream_temp_create_rel(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_REL_CC TSRMLS_CC) +#define php_stream_temp_open(mode, max_memory_usage, buf, length) _php_stream_temp_open((mode), (max_memory_usage), (buf), (length) STREAMS_CC TSRMLS_CC) -PHPAPI php_stream *_php_stream_memory_create(int mode STREAMS_DC); -PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length STREAMS_DC); -PHPAPI char *_php_stream_memory_get_buffer(php_stream *stream, size_t *length STREAMS_DC); +PHPAPI php_stream *_php_stream_memory_create(int mode STREAMS_DC TSRMLS_DC); +PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length STREAMS_DC TSRMLS_DC); +PHPAPI char *_php_stream_memory_get_buffer(php_stream *stream, size_t *length STREAMS_DC TSRMLS_DC); -PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STREAMS_DC); -PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char *buf, size_t length STREAMS_DC); +PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STREAMS_DC TSRMLS_DC); +PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char *buf, size_t length STREAMS_DC TSRMLS_DC); #define TEMP_STREAM_DEFAULT 0 #define TEMP_STREAM_READONLY 1 diff --git a/main/php_network.h b/main/php_network.h index caae0a97d3..3d1f29a831 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -112,32 +112,32 @@ typedef struct _php_netstream_data_t php_netstream_data_t; extern php_stream_ops php_stream_socket_ops; #define PHP_STREAM_IS_SOCKET (&php_stream_socket_ops) -PHPAPI php_stream *_php_stream_sock_open_from_socket(int socket, int persistent STREAMS_DC); +PHPAPI php_stream *_php_stream_sock_open_from_socket(int socket, int persistent STREAMS_DC TSRMLS_DC ); /* open a connection to a host using php_hostconnect and return a stream */ PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short port, - int socktype, int timeout, int persistent STREAMS_DC); + int socktype, int timeout, int persistent STREAMS_DC TSRMLS_DC); PHPAPI php_stream *_php_stream_sock_open_unix(const char *path, int pathlen, int persistent, - struct timeval *timeout STREAMS_DC); + struct timeval *timeout STREAMS_DC TSRMLS_DC); -#define php_stream_sock_open_from_socket(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_CC) -#define php_stream_sock_open_host(host, port, socktype, timeout, persistent) _php_stream_sock_open_host((host), (port), (socktype), (timeout), (persistent) STREAMS_CC) -#define php_stream_sock_open_unix(path, pathlen, persistent, timeval) _php_stream_sock_open_unix((path), (pathlen), (persistent), (timeval) STREAMS_CC) +#define php_stream_sock_open_from_socket(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_CC TSRMLS_CC) +#define php_stream_sock_open_host(host, port, socktype, timeout, persistent) _php_stream_sock_open_host((host), (port), (socktype), (timeout), (persistent) STREAMS_CC TSRMLS_CC) +#define php_stream_sock_open_unix(path, pathlen, persistent, timeval) _php_stream_sock_open_unix((path), (pathlen), (persistent), (timeval) STREAMS_CC TSRMLS_CC) /* {{{ memory debug */ -#define php_stream_sock_open_from_socket_rel(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_REL_CC) -#define php_stream_sock_open_host_rel(host, port, socktype, timeout, persistent) _php_stream_sock_open_host((host), (port), (socktype), (timeout), (persistent) STREAMS_REL_CC) -#define php_stream_sock_open_unix_rel(path, pathlen, persistent, timeval) _php_stream_sock_open_unix((path), (pathlen), (persistent), (timeval) STREAMS_REL_CC) +#define php_stream_sock_open_from_socket_rel(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_REL_CC TSRMLS_CC) +#define php_stream_sock_open_host_rel(host, port, socktype, timeout, persistent) _php_stream_sock_open_host((host), (port), (socktype), (timeout), (persistent) STREAMS_REL_CC TSRMLS_CC) +#define php_stream_sock_open_unix_rel(path, pathlen, persistent, timeval) _php_stream_sock_open_unix((path), (pathlen), (persistent), (timeval) STREAMS_REL_CC TSRMLS_CC) /* }}} */ -PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *timeout); -PHPAPI int php_stream_sock_set_blocking(php_stream *stream, int mode); +PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *timeout TSRMLS_DC); +PHPAPI int php_stream_sock_set_blocking(php_stream *stream, int mode TSRMLS_DC); /* set the chunk size for the stream; return the old chunk size */ -PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size); +PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size TSRMLS_DC); #if HAVE_OPENSSL_EXT -PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method); -#define php_stream_sock_ssl_activate(stream, activate) php_stream_sock_ssl_activate_with_method((stream), (activate), SSLv23_client_method()) +PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method TSRMLS_DC); +#define php_stream_sock_ssl_activate(stream, activate) php_stream_sock_ssl_activate_with_method((stream), (activate), SSLv23_client_method() TSRMLS_CC) #endif diff --git a/main/php_streams.h b/main/php_streams.h index 9f2e4602e5..f346341e9f 100755 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -30,16 +30,16 @@ #if ZEND_DEBUG /* these have more of a dependency on the definitions of the zend macros than * I would prefer, but doing it this way saves loads of idefs :-/ */ -# define STREAMS_D int __php_stream_call_depth ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC -# define STREAMS_C 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC +# define STREAMS_D int __php_stream_call_depth ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC +# define STREAMS_C 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC # define STREAMS_REL_C __php_stream_call_depth + 1 ZEND_FILE_LINE_CC, \ __php_stream_call_depth ? __zend_orig_filename : __zend_filename, \ - __php_stream_call_depth ? __zend_orig_lineno : __zend_lineno \ - TSRMLS_CC + __php_stream_call_depth ? __zend_orig_lineno : __zend_lineno # define STREAMS_DC , STREAMS_D # define STREAMS_CC , STREAMS_C # define STREAMS_REL_CC , STREAMS_REL_C + #else # define STREAMS_D TSRMLS_D # define STREAMS_C TSRMLS_C @@ -51,25 +51,25 @@ /* these functions relay the file/line number information. They are depth aware, so they will pass * the ultimate ancestor, which is useful, because there can be several layers of calls */ -#define php_stream_alloc_rel(ops, thisptr, persistent, mode) _php_stream_alloc((ops), (thisptr), (persistent), (mode) STREAMS_REL_CC) +#define php_stream_alloc_rel(ops, thisptr, persistent, mode) _php_stream_alloc((ops), (thisptr), (persistent), (mode) STREAMS_REL_CC TSRMLS_CC) -#define php_stream_copy_to_mem_rel(src, buf, maxlen, persistent) _php_stream_copy_to_mem((src), (buf), (maxlen), (persistent) STREAMS_REL_CC) +#define php_stream_copy_to_mem_rel(src, buf, maxlen, persistent) _php_stream_copy_to_mem((src), (buf), (maxlen), (persistent) STREAMS_REL_CC TSRMLS_CC) -#define php_stream_fopen_rel(filename, mode, opened) _php_stream_fopen((filename), (mode), (opened) STREAMS_REL_CC) +#define php_stream_fopen_rel(filename, mode, opened) _php_stream_fopen((filename), (mode), (opened) STREAMS_REL_CC TSRMLS_CC) -#define php_stream_fopen_with_path_rel(filename, mode, path, opened) _php_stream_fopen_with_path((filename), (mode), (path), (opened) STREAMS_REL_CC) +#define php_stream_fopen_with_path_rel(filename, mode, path, opened) _php_stream_fopen_with_path((filename), (mode), (path), (opened) STREAMS_REL_CC TSRMLS_CC) -#define php_stream_fopen_from_file_rel(file, mode) _php_stream_fopen_from_file((file), (mode) STREAMS_REL_CC) +#define php_stream_fopen_from_file_rel(file, mode) _php_stream_fopen_from_file((file), (mode) STREAMS_REL_CC TSRMLS_CC) -#define php_stream_fopen_from_pipe_rel(file, mode) _php_stream_fopen_from_pipe((file), (mode) STREAMS_REL_CC) +#define php_stream_fopen_from_pipe_rel(file, mode) _php_stream_fopen_from_pipe((file), (mode) STREAMS_REL_CC TSRMLS_CC) -#define php_stream_fopen_tmpfile_rel() _php_stream_fopen_tmpfile(STREAMS_REL_C) +#define php_stream_fopen_tmpfile_rel() _php_stream_fopen_tmpfile(STREAMS_REL_C TSRMLS_CC) -#define php_stream_fopen_temporary_file_rel(dir, pfx, opened_path) _php_stream_fopen_temporary_file((dir), (pfx), (opened_path) STREAMS_REL_CC) +#define php_stream_fopen_temporary_file_rel(dir, pfx, opened_path) _php_stream_fopen_temporary_file((dir), (pfx), (opened_path) STREAMS_REL_CC TSRMLS_CC) -#define php_stream_open_wrapper_rel(path, mode, options, opened) _php_stream_open_wrapper((path), (mode), (options), (opened) STREAMS_REL_CC) +#define php_stream_open_wrapper_rel(path, mode, options, opened) _php_stream_open_wrapper((path), (mode), (options), (opened) STREAMS_REL_CC TSRMLS_CC) -#define php_stream_make_seekable_rel(origstream, newstream) _php_stream_make_seekable(origstream, newstream STREAMS_REL_CC) +#define php_stream_make_seekable_rel(origstream, newstream) _php_stream_make_seekable(origstream, newstream STREAMS_REL_CC TSRMLS_CC) /* }}} */ @@ -89,20 +89,20 @@ typedef struct _php_stream php_stream; typedef struct _php_stream_ops { /* stdio like functions - these are mandatory! */ - size_t (*write)(php_stream *stream, const char *buf, size_t count); - size_t (*read)(php_stream *stream, char *buf, size_t count); - int (*close)(php_stream *stream, int close_handle); - int (*flush)(php_stream *stream); + size_t (*write)(php_stream *stream, const char *buf, size_t count TSRMLS_DC); + size_t (*read)(php_stream *stream, char *buf, size_t count TSRMLS_DC); + int (*close)(php_stream *stream, int close_handle TSRMLS_DC); + int (*flush)(php_stream *stream TSRMLS_DC); /* these are optional */ - int (*seek)(php_stream *stream, off_t offset, int whence); - char *(*gets)(php_stream *stream, char *buf, size_t size); - int (*cast)(php_stream *stream, int castas, void **ret); + int (*seek)(php_stream *stream, off_t offset, int whence TSRMLS_DC); + char *(*gets)(php_stream *stream, char *buf, size_t size TSRMLS_DC); + int (*cast)(php_stream *stream, int castas, void **ret TSRMLS_DC); const char *label; /* label for this ops structure */ } php_stream_ops; /* options uses the IGNORE_URL family of defines from fopen_wrappers.h */ -typedef php_stream *(*php_stream_factory_func_t)(char *filename, char *mode, int options, char **opened_path STREAMS_DC); -typedef void (*php_stream_wrapper_dtor_func_t)(php_stream *stream); +typedef php_stream *(*php_stream_factory_func_t)(char *filename, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC); +typedef void (*php_stream_wrapper_dtor_func_t)(php_stream *stream TSRMLS_DC); typedef struct _php_stream_wrapper { php_stream_factory_func_t create; @@ -129,37 +129,62 @@ struct _php_stream { #define PHP_STREAM_FCLOSE_FDOPEN 1 #define PHP_STREAM_FCLOSE_FOPENCOOKIE 2 - /* allocate a new stream for a particular ops */ PHPAPI php_stream *_php_stream_alloc(php_stream_ops *ops, void *abstract, - int persistent, const char *mode STREAMS_DC); -#define php_stream_alloc(ops, thisptr, persistent, mode) _php_stream_alloc((ops), (thisptr), (persistent), (mode) STREAMS_CC) - -PHPAPI int php_stream_free(php_stream *stream, int call_dtor); -#define php_stream_close(stream) php_stream_free(stream, 1) - -PHPAPI int php_stream_seek(php_stream *stream, off_t offset, int whence); -#define php_stream_rewind(stream) php_stream_seek(stream, 0L, SEEK_SET) -PHPAPI off_t php_stream_tell(php_stream *stream); -PHPAPI size_t php_stream_read(php_stream *stream, char *buf, size_t count); -PHPAPI size_t php_stream_write(php_stream *stream, const char *buf, size_t count); -#define php_stream_write_string(stream, str) php_stream_write(stream, str, strlen(str)) -PHPAPI int php_stream_eof(php_stream *stream); -PHPAPI int php_stream_getc(php_stream *stream); -PHPAPI int php_stream_putc(php_stream *stream, int c); -PHPAPI int php_stream_flush(php_stream *stream); -PHPAPI char *php_stream_gets(php_stream *stream, char *buf, size_t maxlen); -PHPAPI int php_stream_puts(php_stream *stream, char *buf); + int persistent, const char *mode STREAMS_DC TSRMLS_DC); +#define php_stream_alloc(ops, thisptr, persistent, mode) _php_stream_alloc((ops), (thisptr), (persistent), (mode) STREAMS_CC TSRMLS_CC) + +#define PHP_STREAM_FREE_CALL_DTOR 1 /* call ops->close */ +#define PHP_STREAM_FREE_RELEASE_STREAM 2 /* pefree(stream) */ +#define PHP_STREAM_FREE_PRESERVE_HANDLE 4 /* tell ops->close to not close it's underlying handle */ +#define PHP_STREAM_FREE_CLOSE (PHP_STREAM_FREE_CALL_DTOR | PHP_STREAM_FREE_RELEASE_STREAM) +PHPAPI int _php_stream_free(php_stream *stream, int close_options TSRMLS_DC); +#define php_stream_free(stream, close_options) _php_stream_free((stream), (close_options) TSRMLS_CC) +#define php_stream_close(stream) _php_stream_free((stream), PHP_STREAM_FREE_CLOSE TSRMLS_CC) + +PHPAPI int _php_stream_seek(php_stream *stream, off_t offset, int whence TSRMLS_DC); +#define php_stream_rewind(stream) _php_stream_seek((stream), 0L, SEEK_SET TSRMLS_CC) +#define php_stream_seek(stream, offset, whence) _php_stream_seek((stream), (offset), (whence) TSRMLS_CC) + +PHPAPI off_t _php_stream_tell(php_stream *stream TSRMLS_DC); +#define php_stream_tell(stream) _php_stream_tell((stream) TSRMLS_CC) + +PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t count TSRMLS_DC); +#define php_stream_read(stream, buf, count) _php_stream_read((stream), (buf), (count) TSRMLS_CC) + +PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC); +#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 int _php_stream_eof(php_stream *stream TSRMLS_DC); +#define php_stream_eof(stream) _php_stream_eof((stream) TSRMLS_CC) + +PHPAPI int _php_stream_getc(php_stream *stream TSRMLS_DC); +#define php_stream_getc(stream) _php_stream_getc((stream) TSRMLS_CC) + +PHPAPI int _php_stream_putc(php_stream *stream, int c TSRMLS_DC); +#define php_stream_putc(stream, c) _php_stream_putc((stream), (c) TSRMLS_CC) + +PHPAPI int _php_stream_flush(php_stream *stream TSRMLS_DC); +#define php_stream_flush(stream) _php_stream_flush((stream) TSRMLS_CC) + +PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRMLS_DC); +#define php_stream_gets(stream, buf, maxlen) _php_stream_gets((stream), (buf), (maxlen) TSRMLS_CC) + +PHPAPI int _php_stream_puts(php_stream *stream, char *buf TSRMLS_DC); +#define php_stream_puts(stream, buf) _php_stream_puts((stream), (buf) TSRMLS_CC) /* copy up to maxlen bytes from src to dest. If maxlen is PHP_STREAM_COPY_ALL, copy until eof(src). * Uses mmap if the src is a plain file and at offset 0 */ #define PHP_STREAM_COPY_ALL -1 -PHPAPI size_t php_stream_copy_to_stream(php_stream *src, php_stream *dest, size_t maxlen); +PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size_t maxlen STREAMS_DC TSRMLS_DC); +#define php_stream_copy_to_stream(src, dest, maxlen) _php_stream_copy_to_stream((src), (dest), (maxlen) STREAMS_CC TSRMLS_CC) + /* read all data from stream and put into a buffer. Caller must free buffer when done. * The copy will use mmap if available. */ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen, - int persistent STREAMS_DC); -#define php_stream_copy_to_mem(src, buf, maxlen, persistent) _php_stream_copy_to_mem((src), (buf), (maxlen), (persistent) STREAMS_CC) + int persistent STREAMS_DC TSRMLS_DC); +#define php_stream_copy_to_mem(src, buf, maxlen, persistent) _php_stream_copy_to_mem((src), (buf), (maxlen), (persistent) STREAMS_CC TSRMLS_CC) /* maybe implement someday */ @@ -168,23 +193,23 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen /* operations for a stdio FILE; use the php_stream_fopen_XXX funcs below */ extern php_stream_ops php_stream_stdio_ops; /* like fopen, but returns a stream */ -PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, char **opened_path STREAMS_DC); -#define php_stream_fopen(filename, mode, opened) _php_stream_fopen((filename), (mode), (opened) STREAMS_CC) +PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, char **opened_path STREAMS_DC TSRMLS_DC); +#define php_stream_fopen(filename, mode, opened) _php_stream_fopen((filename), (mode), (opened) STREAMS_CC TSRMLS_CC) -PHPAPI php_stream *_php_stream_fopen_with_path(char *filename, char *mode, char *path, char **opened_path STREAMS_DC); -#define php_stream_fopen_with_path(filename, mode, path, opened) _php_stream_fopen_with_path((filename), (mode), (path), (opened) STREAMS_CC) +PHPAPI php_stream *_php_stream_fopen_with_path(char *filename, char *mode, char *path, char **opened_path STREAMS_DC TSRMLS_DC); +#define php_stream_fopen_with_path(filename, mode, path, opened) _php_stream_fopen_with_path((filename), (mode), (path), (opened) STREAMS_CC TSRMLS_CC) -PHPAPI php_stream *_php_stream_fopen_from_file(FILE *file, const char *mode STREAMS_DC); -#define php_stream_fopen_from_file(file, mode) _php_stream_fopen_from_file((file), (mode) STREAMS_CC) +PHPAPI php_stream *_php_stream_fopen_from_file(FILE *file, const char *mode STREAMS_DC TSRMLS_DC); +#define php_stream_fopen_from_file(file, mode) _php_stream_fopen_from_file((file), (mode) STREAMS_CC TSRMLS_CC) -PHPAPI php_stream *_php_stream_fopen_from_pipe(FILE *file, const char *mode STREAMS_DC); -#define php_stream_fopen_from_pipe(file, mode) _php_stream_fopen_from_pipe((file), (mode) STREAMS_CC) +PHPAPI php_stream *_php_stream_fopen_from_pipe(FILE *file, const char *mode STREAMS_DC TSRMLS_DC); +#define php_stream_fopen_from_pipe(file, mode) _php_stream_fopen_from_pipe((file), (mode) STREAMS_CC TSRMLS_CC) -PHPAPI php_stream *_php_stream_fopen_tmpfile(STREAMS_D); -#define php_stream_fopen_tmpfile() _php_stream_fopen_tmpfile(STREAMS_C) +PHPAPI php_stream *_php_stream_fopen_tmpfile(STREAMS_D TSRMLS_DC); +#define php_stream_fopen_tmpfile() _php_stream_fopen_tmpfile(STREAMS_C TSRMLS_CC) -PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char *pfx, char **opened_path STREAMS_DC); -#define php_stream_fopen_temporary_file(dir, pfx, opened_path) _php_stream_fopen_temporary_file((dir), (pfx), (opened_path) STREAMS_CC) +PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char *pfx, char **opened_path STREAMS_DC TSRMLS_DC); +#define php_stream_fopen_temporary_file(dir, pfx, opened_path) _php_stream_fopen_temporary_file((dir), (pfx), (opened_path) STREAMS_CC TSRMLS_CC) /* coerce the stream into some other form */ /* cast as a stdio FILE * */ @@ -198,9 +223,10 @@ PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char #define PHP_STREAM_CAST_TRY_HARD 0x80000000 #define PHP_STREAM_CAST_RELEASE 0x40000000 /* stream becomes invalid on success */ #define PHP_STREAM_CAST_MASK (PHP_STREAM_CAST_TRY_HARD | PHP_STREAM_CAST_RELEASE) -PHPAPI int php_stream_cast(php_stream *stream, int castas, void **ret, int show_err); +PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show_err TSRMLS_DC); /* use this to check if a stream can be cast into another form */ -#define php_stream_can_cast(stream, as) php_stream_cast(stream, as, NULL, 0) +#define php_stream_can_cast(stream, as) _php_stream_cast((stream), (as), NULL, 0 TSRMLS_CC) +#define php_stream_cast(stream, as, ret, show_err) _php_stream_cast((stream), (as), (ret), (show_err) TSRMLS_CC) /* use this to check if a stream is of a particular type: * PHPAPI int php_stream_is(php_stream *stream, php_stream_ops *ops); */ @@ -231,16 +257,16 @@ int php_init_stream_wrappers(TSRMLS_D); int php_shutdown_stream_wrappers(TSRMLS_D); PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper *wrapper TSRMLS_DC); PHPAPI int php_unregister_url_stream_wrapper(char *protocol TSRMLS_DC); -PHPAPI php_stream *_php_stream_open_wrapper(char *path, char *mode, int options, char **opened_path STREAMS_DC); -#define php_stream_open_wrapper(path, mode, options, opened) _php_stream_open_wrapper((path), (mode), (options), (opened) STREAMS_CC) +PHPAPI php_stream *_php_stream_open_wrapper(char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC); +#define php_stream_open_wrapper(path, mode, options, opened) _php_stream_open_wrapper((path), (mode), (options), (opened) STREAMS_CC TSRMLS_CC) #define PHP_STREAM_UNCHANGED 0 /* orig stream was seekable anyway */ #define PHP_STREAM_RELEASED 1 /* newstream should be used; origstream is no longer valid */ #define PHP_STREAM_FAILED 2 /* an error occurred while attempting conversion */ #define PHP_STREAM_CRITICAL 3 /* an error occurred; origstream is in an unknown state; you should close origstream */ /* DO NOT call this on streams that are referenced by resources! */ -PHPAPI int _php_stream_make_seekable(php_stream *origstream, php_stream **newstream STREAMS_DC); -#define php_stream_make_seekable(origstream, newstream) _php_stream_make_seekable(origstream, newstream STREAMS_CC) +PHPAPI int _php_stream_make_seekable(php_stream *origstream, php_stream **newstream STREAMS_DC TSRMLS_DC); +#define php_stream_make_seekable(origstream, newstream) _php_stream_make_seekable(origstream, newstream STREAMS_CC TSRMLS_CC) #endif diff --git a/main/streams.c b/main/streams.c index 51bc75cc88..d1cf227aef 100755 --- a/main/streams.c +++ b/main/streams.c @@ -46,12 +46,12 @@ /* some macros to help track leaks */ #define emalloc_rel_orig(size) \ ( __php_stream_call_depth == 0 \ - ? _emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_ORIG_RELAY_CC) \ + ? _emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_RELAY_CC) \ : _emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_ORIG_RELAY_CC) ) #define erealloc_rel_orig(ptr, size) \ ( __php_stream_call_depth == 0 \ - ? _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_ORIG_RELAY_CC) \ + ? _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_RELAY_CC) \ : _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_ORIG_RELAY_CC) ) @@ -66,7 +66,7 @@ static HashTable url_stream_wrappers_hash; /* allocate a new stream for a particular ops */ -PHPAPI php_stream *_php_stream_alloc(php_stream_ops *ops, void *abstract, int persistent, const char *mode STREAMS_DC) /* {{{ */ +PHPAPI php_stream *_php_stream_alloc(php_stream_ops *ops, void *abstract, int persistent, const char *mode STREAMS_DC TSRMLS_DC) /* {{{ */ { php_stream *ret; @@ -84,16 +84,11 @@ PHPAPI php_stream *_php_stream_alloc(php_stream_ops *ops, void *abstract, int pe } /* }}} */ -PHPAPI int php_stream_free(php_stream *stream, int call_dtor) /* {{{ */ +PHPAPI int _php_stream_free(php_stream *stream, int close_options TSRMLS_DC) /* {{{ */ { int ret = 1; - if (stream->wrapper && stream->wrapper->destroy) { - stream->wrapper->destroy(stream); - stream->wrapper = NULL; - } - - if (call_dtor) { + if (close_options & PHP_STREAM_FREE_CALL_DTOR) { if (stream->fclose_stdiocast == PHP_STREAM_FCLOSE_FOPENCOOKIE) { /* calling fclose on an fopencookied stream will ultimately call this very same function. If we were called via fclose, @@ -106,12 +101,10 @@ PHPAPI int php_stream_free(php_stream *stream, int call_dtor) /* {{{ */ } php_stream_flush(stream); - } - ret = stream->ops->close(stream, call_dtor); - stream->abstract = NULL; + ret = stream->ops->close(stream, close_options & PHP_STREAM_FREE_PRESERVE_HANDLE ? 0 : 1 TSRMLS_CC); + stream->abstract = NULL; - if (call_dtor) { /* tidy up any FILE* that might have been fdopened */ if (stream->fclose_stdiocast == PHP_STREAM_FCLOSE_FDOPEN && stream->stdiocast) { fclose(stream->stdiocast); @@ -119,31 +112,40 @@ PHPAPI int php_stream_free(php_stream *stream, int call_dtor) /* {{{ */ } } - if (stream->wrapperdata) { - FREE_ZVAL(stream->wrapperdata); - stream->wrapperdata = NULL; + if (close_options & PHP_STREAM_FREE_RELEASE_STREAM) { + + if (stream->wrapper && stream->wrapper->destroy) { + stream->wrapper->destroy(stream TSRMLS_CC); + stream->wrapper = NULL; + } + + if (stream->wrapperdata) { + FREE_ZVAL(stream->wrapperdata); + stream->wrapperdata = NULL; + } + + pefree(stream, stream->is_persistent); } - pefree(stream, stream->is_persistent); return ret; } /* }}} */ /* {{{ generic stream operations */ -PHPAPI size_t php_stream_read(php_stream *stream, char *buf, size_t size) +PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS_DC) { - return stream->ops->read(stream, buf, size); + return stream->ops->read(stream, buf, size TSRMLS_CC); } -PHPAPI int php_stream_eof(php_stream *stream) +PHPAPI int _php_stream_eof(php_stream *stream TSRMLS_DC) { /* we define our stream reading function so that it must return EOF when an EOF condition occurs, when working in unbuffered mode and called with these args */ - return stream->ops->read(stream, NULL, 0) == EOF ? 1 : 0; + return stream->ops->read(stream, NULL, 0 TSRMLS_CC) == EOF ? 1 : 0; } -PHPAPI int php_stream_putc(php_stream *stream, int c) +PHPAPI int _php_stream_putc(php_stream *stream, int c TSRMLS_DC) { unsigned char buf = c; @@ -153,7 +155,7 @@ PHPAPI int php_stream_putc(php_stream *stream, int c) return EOF; } -PHPAPI int php_stream_getc(php_stream *stream) +PHPAPI int _php_stream_getc(php_stream *stream TSRMLS_DC) { char buf; @@ -163,7 +165,7 @@ PHPAPI int php_stream_getc(php_stream *stream) return EOF; } -PHPAPI int php_stream_puts(php_stream *stream, char *buf) +PHPAPI int _php_stream_puts(php_stream *stream, char *buf TSRMLS_DC) { int len; char newline[2] = "\n"; /* is this OK for Win? */ @@ -175,7 +177,7 @@ PHPAPI int php_stream_puts(php_stream *stream, char *buf) return 0; } -PHPAPI char *php_stream_gets(php_stream *stream, char *buf, size_t maxlen) +PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRMLS_DC) { if (maxlen == 0) { @@ -184,7 +186,7 @@ PHPAPI char *php_stream_gets(php_stream *stream, char *buf, size_t maxlen) } if (stream->ops->gets) { - return stream->ops->gets(stream, buf, maxlen); + return stream->ops->gets(stream, buf, maxlen TSRMLS_CC); } else { /* unbuffered fgets - poor performance ! */ size_t n = 1; @@ -192,7 +194,7 @@ PHPAPI char *php_stream_gets(php_stream *stream, char *buf, size_t maxlen) /* TODO: look at error returns? */ - while(n < maxlen && stream->ops->read(stream, c, 1) > 0) { + while(n < maxlen && stream->ops->read(stream, c, 1 TSRMLS_CC) > 0) { n++; if (*c == '\n') { c++; @@ -205,33 +207,33 @@ PHPAPI char *php_stream_gets(php_stream *stream, char *buf, size_t maxlen) } } -PHPAPI int php_stream_flush(php_stream *stream) +PHPAPI int _php_stream_flush(php_stream *stream TSRMLS_DC) { if (stream->ops->flush) { - return stream->ops->flush(stream); + return stream->ops->flush(stream TSRMLS_CC); } return 0; } -PHPAPI size_t php_stream_write(php_stream *stream, const char *buf, size_t count) +PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) { - return stream->ops->write(stream, buf, count); + return stream->ops->write(stream, buf, count TSRMLS_CC); } -PHPAPI off_t php_stream_tell(php_stream *stream) +PHPAPI off_t _php_stream_tell(php_stream *stream TSRMLS_DC) { off_t ret = -1; if (stream->ops->seek) { - ret = stream->ops->seek(stream, 0, SEEK_CUR); + ret = stream->ops->seek(stream, 0, SEEK_CUR TSRMLS_CC); } return ret; } -PHPAPI int php_stream_seek(php_stream *stream, off_t offset, int whence) +PHPAPI int _php_stream_seek(php_stream *stream, off_t offset, int whence TSRMLS_DC) { if (stream->ops->seek) { - return stream->ops->seek(stream, offset, whence); + return stream->ops->seek(stream, offset, whence TSRMLS_CC); } /* emulate forward moving seeks with reads */ @@ -253,7 +255,7 @@ PHPAPI int php_stream_seek(php_stream *stream, off_t offset, int whence) return -1; } -PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen, int persistent STREAMS_DC) +PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen, int persistent STREAMS_DC TSRMLS_DC) { size_t ret = 0; char *ptr; @@ -328,7 +330,7 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen return len; } -PHPAPI size_t php_stream_copy_to_stream(php_stream *src, php_stream *dest, size_t maxlen) +PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size_t maxlen STREAMS_DC TSRMLS_DC) { char buf[CHUNK_SIZE]; size_t readchunk; @@ -427,7 +429,7 @@ typedef struct { #endif } php_stdio_stream_data; -PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char *pfx, char **opened_path STREAMS_DC) +PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char *pfx, char **opened_path STREAMS_DC TSRMLS_DC) { FILE *fp = php_open_temporary_file(dir, pfx, opened_path TSRMLS_CC); @@ -445,7 +447,7 @@ PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char return NULL; } -PHPAPI php_stream *_php_stream_fopen_tmpfile(STREAMS_D) +PHPAPI php_stream *_php_stream_fopen_tmpfile(STREAMS_D TSRMLS_DC) { FILE *fp; php_stream *stream; @@ -466,7 +468,7 @@ PHPAPI php_stream *_php_stream_fopen_tmpfile(STREAMS_D) -PHPAPI php_stream *_php_stream_fopen_from_file(FILE *file, const char *mode STREAMS_DC) +PHPAPI php_stream *_php_stream_fopen_from_file(FILE *file, const char *mode STREAMS_DC TSRMLS_DC) { php_stdio_stream_data *self; @@ -476,7 +478,7 @@ PHPAPI php_stream *_php_stream_fopen_from_file(FILE *file, const char *mode STRE return php_stream_alloc_rel(&php_stream_stdio_ops, self, 0, mode); } -PHPAPI php_stream *_php_stream_fopen_from_pipe(FILE *file, const char *mode STREAMS_DC) +PHPAPI php_stream *_php_stream_fopen_from_pipe(FILE *file, const char *mode STREAMS_DC TSRMLS_DC) { php_stdio_stream_data *self; @@ -485,7 +487,7 @@ PHPAPI php_stream *_php_stream_fopen_from_pipe(FILE *file, const char *mode STRE self->is_pipe = 1; return php_stream_alloc_rel(&php_stream_stdio_ops, self, 0, mode); } -static size_t php_stdiop_write(php_stream *stream, const char *buf, size_t count) +static size_t php_stdiop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) { php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract; @@ -501,7 +503,7 @@ static size_t php_stdiop_write(php_stream *stream, const char *buf, size_t count return fwrite(buf, 1, count, data->file); } -static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count) +static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) { php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract; @@ -524,7 +526,7 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count) return fread(buf, 1, count, data->file); } -static int php_stdiop_close(php_stream *stream, int close_handle) +static int php_stdiop_close(php_stream *stream, int close_handle TSRMLS_DC) { int ret; php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract; @@ -541,12 +543,13 @@ static int php_stdiop_close(php_stream *stream, int close_handle) ret = 0; } + /* STDIO streams are never persistent! */ efree(data); return ret; } -static int php_stdiop_flush(php_stream *stream) +static int php_stdiop_flush(php_stream *stream TSRMLS_DC) { php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract; @@ -555,7 +558,7 @@ static int php_stdiop_flush(php_stream *stream) return fflush(data->file); } -static int php_stdiop_seek(php_stream *stream, off_t offset, int whence) +static int php_stdiop_seek(php_stream *stream, off_t offset, int whence TSRMLS_DC) { php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract; @@ -567,7 +570,7 @@ static int php_stdiop_seek(php_stream *stream, off_t offset, int whence) return fseek(data->file, offset, whence); } -static char *php_stdiop_gets(php_stream *stream, char *buf, size_t size) +static char *php_stdiop_gets(php_stream *stream, char *buf, size_t size TSRMLS_DC) { php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract; @@ -581,7 +584,7 @@ static char *php_stdiop_gets(php_stream *stream, char *buf, size_t size) return fgets(buf, size, data->file); } -static int php_stdiop_cast(php_stream *stream, int castas, void **ret) +static int php_stdiop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) { int fd; php_stdio_stream_data *data = (php_stdio_stream_data*) stream->abstract; @@ -616,7 +619,7 @@ php_stream_ops php_stream_stdio_ops = { "STDIO" }; -PHPAPI php_stream *_php_stream_fopen_with_path(char *filename, char *mode, char *path, char **opened_path STREAMS_DC) /* {{{ */ +PHPAPI php_stream *_php_stream_fopen_with_path(char *filename, char *mode, char *path, char **opened_path STREAMS_DC TSRMLS_DC) /* {{{ */ { /* code ripped off from fopen_wrappers.c */ char *pathbuf, *ptr, *end; @@ -733,7 +736,7 @@ PHPAPI php_stream *_php_stream_fopen_with_path(char *filename, char *mode, char } /* }}} */ -PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, char **opened_path STREAMS_DC) +PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, char **opened_path STREAMS_DC TSRMLS_DC) { FILE *fp; char *realpath = NULL; @@ -767,18 +770,22 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, cha #if HAVE_FOPENCOOKIE static ssize_t stream_cookie_reader(void *cookie, char *buffer, size_t size) { - return php_stream_read(((php_stream *)cookie), buffer, size); + TSRMLS_FETCH(); + return php_stream_read(((php_stream *)cookie), buffer, size); } static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t size) { - return php_stream_write(((php_stream *)cookie), (char *)buffer, size); + TSRMLS_FETCH(); + return php_stream_write(((php_stream *)cookie), (char *)buffer, size); } static int stream_cookie_seeker(void *cookie, off_t position, int whence) { - return php_stream_seek(((php_stream *)cookie), position, whence); + TSRMLS_FETCH(); + return php_stream_seek(((php_stream *)cookie), position, whence); } static int stream_cookie_closer(void *cookie) { + TSRMLS_FETCH(); php_stream *stream = (php_stream*)cookie; /* prevent recursion */ stream->fclose_stdiocast = PHP_STREAM_FCLOSE_NONE; @@ -795,7 +802,7 @@ static COOKIE_IO_FUNCTIONS_T stream_cookie_functions = #endif /* }}} */ -PHPAPI int php_stream_cast(php_stream *stream, int castas, void **ret, int show_err) /* {{{ */ +PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show_err TSRMLS_DC) /* {{{ */ { int flags = castas & PHP_STREAM_CAST_MASK; castas &= ~PHP_STREAM_CAST_MASK; @@ -808,7 +815,7 @@ PHPAPI int php_stream_cast(php_stream *stream, int castas, void **ret, int show_ goto exit_success; } - if (stream->ops->cast && stream->ops->cast(stream, castas, ret) == SUCCESS) + if (stream->ops->cast && stream->ops->cast(stream, castas, ret TSRMLS_CC) == SUCCESS) goto exit_success; @@ -839,7 +846,7 @@ PHPAPI int php_stream_cast(php_stream *stream, int castas, void **ret, int show_ goto exit_fail; } - if (stream->ops->cast && stream->ops->cast(stream, castas, ret) == SUCCESS) + if (stream->ops->cast && stream->ops->cast(stream, castas, ret TSRMLS_CC) == SUCCESS) goto exit_success; @@ -873,7 +880,7 @@ exit_success: if (stream->fclose_stdiocast != PHP_STREAM_FCLOSE_FOPENCOOKIE) { /* ask the implementation to release resources other than * the underlying handle */ - php_stream_free(stream, 0); + php_stream_free(stream, PHP_STREAM_FREE_PRESERVE_HANDLE | PHP_STREAM_FREE_CLOSE); } } @@ -913,7 +920,7 @@ PHPAPI int php_unregister_url_stream_wrapper(char *protocol TSRMLS_DC) return SUCCESS; } -static php_stream *php_stream_open_url(char *path, char *mode, int options, char **opened_path STREAMS_DC) +static php_stream *php_stream_open_url(char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC) { php_stream_wrapper *wrapper; const char *p, *protocol = NULL; @@ -933,7 +940,7 @@ static php_stream *php_stream_open_url(char *path, char *mode, int options, char protocol = NULL; } if (wrapper) { - php_stream *stream = wrapper->create(path, mode, options, opened_path STREAMS_REL_CC); + php_stream *stream = wrapper->create(path, mode, options, opened_path STREAMS_REL_CC TSRMLS_CC); if (stream) stream->wrapper = wrapper; return stream; @@ -955,7 +962,7 @@ static php_stream *php_stream_open_url(char *path, char *mode, int options, char return NULL; } -PHPAPI php_stream *_php_stream_open_wrapper(char *path, char *mode, int options, char **opened_path STREAMS_DC) +PHPAPI php_stream *_php_stream_open_wrapper(char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC) { php_stream *stream = NULL; @@ -966,7 +973,7 @@ PHPAPI php_stream *_php_stream_open_wrapper(char *path, char *mode, int options, return NULL; if (PG(allow_url_fopen) && !(options & IGNORE_URL)) { - stream = php_stream_open_url(path, mode, options, opened_path STREAMS_REL_CC); + stream = php_stream_open_url(path, mode, options, opened_path STREAMS_REL_CC TSRMLS_CC); goto out; } @@ -1011,7 +1018,7 @@ out: return stream; } -PHPAPI int _php_stream_make_seekable(php_stream *origstream, php_stream **newstream STREAMS_DC) +PHPAPI int _php_stream_make_seekable(php_stream *origstream, php_stream **newstream STREAMS_DC TSRMLS_DC) { assert(newstream != NULL); |