cvs: php-src(PHP_5_1) /ext/zlib zlib.c
| From: | Ilia Alshanetsky | Date: | Fri, 02 Sep 2005 17:25:16 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/zlib zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33775@lists.php.net to get a copy of this message | ||
iliaa Fri Sep 2 13:25:16 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/zlib zlib.c
Log:
MFH: Resolved bug #34240.
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib.c?r1=1.183.2.1&r2=1.183.2.2&ty=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.1 php-src/ext/zlib/zlib.c:1.183.2.2
--- php-src/ext/zlib/zlib.c:1.183.2.1 Sun Aug 21 12:03:21 2005
+++ php-src/ext/zlib/zlib.c Fri Sep 2 13:25:16 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.183.2.1 2005/08/21 16:03:21 iliaa Exp $ */
+/* $Id: zlib.c,v 1.183.2.2 2005/09/02 17:25:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -644,7 +644,7 @@
if (do_end) {
err = deflate(&ZLIBG(stream), Z_FINISH);
- buffer[outlen - ZLIBG(stream).avail_out] = '\0';
+ buffer[outlen + start_offset - ZLIBG(stream).avail_out] = '\0';
}
*p_buffer = buffer;