diff options
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/zlib.c | 4 | ||||
| -rw-r--r-- | ext/zlib/zlib_filter.c | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib_fopen_wrapper.c | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 3f66ed106d..e29a510870 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -572,7 +572,7 @@ static PHP_FUNCTION(gzfile) /* Now loop through the file and do the magic quotes thing if needed */ memset(buf, 0, sizeof(buf)); - + while (php_stream_gets(stream, buf, sizeof(buf) - 1) != NULL) { add_index_string(return_value, i++, buf); } @@ -938,7 +938,7 @@ static PHP_INI_MH(OnUpdate_zlib_output_handler) return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); } /* }}} */ - + /* {{{ INI */ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("zlib.output_compression", "0", PHP_INI_ALL, OnUpdate_zlib_output_compression, output_compression_default, zend_zlib_globals, zlib_globals) diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 6f7a872788..1c69ce7353 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -315,7 +315,7 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f pefree(data, persistent); return NULL; } - + data->strm.data_type = Z_ASCII; if (strcasecmp(filtername, "zlib.inflate") == 0) { diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index 329180bc3b..9c5bd4640e 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -36,14 +36,14 @@ static size_t php_gziop_read(php_stream *stream, char *buf, size_t count) { struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *) stream->abstract; int read; - + /* XXX this needs to be looped for the case count > UINT_MAX */ read = gzread(self->gz_file, buf, count); - + if (gzeof(self->gz_file)) { stream->eof = 1; } - + return (size_t)((read < 0) ? 0 : read); } @@ -77,7 +77,7 @@ static int php_gziop_close(php_stream *stream, int close_handle) { struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *) stream->abstract; int ret = EOF; - + if (close_handle) { if (self->gz_file) { ret = gzclose(self->gz_file); @@ -104,13 +104,13 @@ php_stream_ops php_stream_gzio_ops = { php_gziop_write, php_gziop_read, php_gziop_close, php_gziop_flush, "ZLIB", - php_gziop_seek, + php_gziop_seek, NULL, /* cast */ NULL, /* stat */ NULL /* set_option */ }; -php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, +php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC) { struct php_gz_stream_data_t *self; @@ -123,15 +123,15 @@ php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, con } return NULL; } - + if (strncasecmp("compress.zlib://", path, 16) == 0) { path += 16; } else if (strncasecmp("zlib:", path, 5) == 0) { path += 5; } - + innerstream = php_stream_open_wrapper_ex(path, mode, STREAM_MUST_SEEK | options | STREAM_WILL_CAST, opened_path, context); - + if (innerstream) { php_socket_t fd; |