diff options
| author | Michael Wallner <mike@php.net> | 2014-08-21 22:46:03 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-08-21 22:46:03 +0200 |
| commit | 7fca659a7bd73a62c1f46ad04de995a6bfa1c994 (patch) | |
| tree | 4d0a23d4337bf5c89edc4fcdb3fac28cadc92cda | |
| parent | b9a5db2b5534f696ca102fc161b302eabacd401f (diff) | |
| parent | 3b82c4e52063e74abaca637811629b521754de3d (diff) | |
| download | php-git-7fca659a7bd73a62c1f46ad04de995a6bfa1c994.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix bug #67865
updated NEWS to fit last release
NEWS
Fix bug #67878 program_prefix not honoured in man pages
NEWS
Fix bug #67878 program_prefix not honoured in man pages
| -rw-r--r-- | ext/zlib/zlib_filter.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 0b91edfb02..a7ce895646 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); |