diff options
| author | Michael Wallner <mike@php.net> | 2014-08-21 22:42:14 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-08-21 22:43:25 +0200 |
| commit | c4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53 (patch) | |
| tree | c8472f27483ae7da03407019f6e592746002ff48 | |
| parent | dbbf1c2a3cff5908afd5229c58e52440073116f8 (diff) | |
| parent | 54fbbded372b771cf281a73e1981cde642107924 (diff) | |
| download | php-git-c4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #67865
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/zlib/zlib_filter.c | 3 |
2 files changed, 2 insertions, 2 deletions
@@ -34,6 +34,7 @@ PHP NEWS - Zlib: . Fixed bug #67724 (chained zlib filters silently fail with large amounts of data). (Mike) + . Fixed bug #67865 (internal corruption phar error). Mike 21 Aug 2014, PHP 5.5.16 diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 4bde5f63cd..c815008546 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -302,8 +302,7 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f data->strm.zalloc = (alloc_func) php_zlib_alloc; data->strm.zfree = (free_func) php_zlib_free; - data->strm.avail_out = data->outbuf_len = 0x8000; - data->inbuf_len = 2048; + data->strm.avail_out = data->outbuf_len = data->inbuf_len = 0x8000; data->strm.next_in = data->inbuf = (Bytef *) pemalloc(data->inbuf_len, persistent); if (!data->inbuf) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes", data->inbuf_len); |