diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-05-08 12:08:17 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-05-08 12:08:17 +0000 |
| commit | eec0b67cd834b7040e58a4a5c3bf39fa2fdcc318 (patch) | |
| tree | a6b1a72dd33ca41da28060f061c67add2350f7e3 | |
| parent | 420352d8b5320730689ac3f3772c372c78af3a74 (diff) | |
| download | php-git-eec0b67cd834b7040e58a4a5c3bf39fa2fdcc318.tar.gz | |
Fixed bug #41304 (compress.zlib temp files left)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/zlib/zlib_fopen_wrapper.c | 4 | ||||
| -rwxr-xr-x | main/streams/streams.c | 3 |
3 files changed, 6 insertions, 2 deletions
@@ -7,6 +7,7 @@ PHP NEWS (Ilia) - Fixed altering $this via argument named "this". (Dmitry) - Fixed PHP CLI to use the php.ini from the binary location. (Hannes) +- Fixed bug #41304 (compress.zlib temp files left). (Dmitry) - Fixed bug #41293 (Fixed creation of HTTP_RAW_POST_DATA when there is no default post handler). (Ilia) - Fixed gd build when used with freetype 1.x (Pierre, Tony) diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index 5e45edc31f..bab79b9740 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -76,7 +76,7 @@ static int php_gziop_close(php_stream *stream, int close_handle TSRMLS_DC) self->gz_file = NULL; } if (self->stream) { - php_stream_free(self->stream, PHP_STREAM_FREE_CLOSE | PHP_STREAM_FREE_PRESERVE_HANDLE); + php_stream_close(self->stream); self->stream = NULL; } } @@ -130,7 +130,7 @@ php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mod int fd; if (SUCCESS == php_stream_cast(innerstream, PHP_STREAM_AS_FD, (void **) &fd, REPORT_ERRORS)) { - self->gz_file = gzdopen(fd, mode); + self->gz_file = gzdopen(dup(fd), mode); self->stream = innerstream; if (self->gz_file) { stream = php_stream_alloc_rel(&php_stream_gzio_ops, self, 0, mode); diff --git a/main/streams/streams.c b/main/streams/streams.c index 188e4a9c65..8a0a925f99 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1809,6 +1809,9 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio case PHP_STREAM_UNCHANGED: return stream; case PHP_STREAM_RELEASED: + if (newstream->orig_path) { + pefree(newstream->orig_path, persistent); + } newstream->orig_path = pestrdup(path, persistent); return newstream; default: |