iliaa           Sun Aug 21 12:03:22 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src    NEWS 
    /php-src/ext/zlib   zlib.c 
  Log:
  MFH: Fixed bug #34191 (ob_gzhandler does not enforce trailing \0).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.21&r2=1.2027.2.22&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.21 php-src/NEWS:1.2027.2.22
--- php-src/NEWS:1.2027.2.21    Thu Aug 18 11:14:11 2005
+++ php-src/NEWS        Sun Aug 21 12:03:18 2005
@@ -12,6 +12,7 @@
 - Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
+- Fixed bug #34191 (ob_gzhandler does not enforce trailing \0). (Ilia)
 - Fixed bug #34156 (memory usage remains elevated after memory limit is 
   reached). (Ilia)
 - Fixed bug #34148 (+,- and . not supported as parts of scheme). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib.c?r1=1.183&r2=1.183.2.1&ty=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183 php-src/ext/zlib/zlib.c:1.183.2.1
--- php-src/ext/zlib/zlib.c:1.183       Wed Aug  3 10:08:23 2005
+++ php-src/ext/zlib/zlib.c     Sun Aug 21 12:03:21 2005
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: zlib.c,v 1.183 2005/08/03 14:08:23 sniper Exp $ */
+/* $Id: zlib.c,v 1.183.2.1 2005/08/21 16:03:21 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -644,6 +644,7 @@
 
        if (do_end) {
                err = deflate(&ZLIBG(stream), Z_FINISH);
+               buffer[outlen - ZLIBG(stream).avail_out] = '\0';
        }
 
        *p_buffer = buffer;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to