cvs: php-src(PHP_4_4) /ext/zlib zlib.c
| From: | Ilia Alshanetsky | Date: | Fri, 02 Sep 2005 17:25:33 +0000 |
| Subject: | cvs: php-src(PHP_4_4) /ext/zlib zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33777@lists.php.net to get a copy of this message | ||
iliaa Fri Sep 2 13:25:33 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.153.2.16.4.1&r2=1.153.2.16.4.2&ty=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.153.2.16.4.1 php-src/ext/zlib/zlib.c:1.153.2.16.4.2
--- php-src/ext/zlib/zlib.c:1.153.2.16.4.1 Sun Aug 21 12:05:35 2005
+++ php-src/ext/zlib/zlib.c Fri Sep 2 13:25:33 2005
@@ -18,7 +18,7 @@
| Jade Nicoletti <nicoletti@nns.ch> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.153.2.16.4.1 2005/08/21 16:05:35 iliaa Exp $ */
+/* $Id: zlib.c,v 1.153.2.16.4.2 2005/09/02 17:25:33 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -717,7 +717,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';
}