iliaa Thu Aug 9 23:27:22 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/bz2 bz2_filter.c
/php-src NEWS
Log:
Fixed bug #42117 (bzip2.compress loses data in internal buffer)
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.3.2.2.2.4&r2=1.3.2.2.2.5&diff_format=u
Index: php-src/ext/bz2/bz2_filter.c
diff -u php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.4
php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5
--- php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.4 Thu Jan 25 12:22:21 2007
+++ php-src/ext/bz2/bz2_filter.c Thu Aug 9 23:27:22 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2_filter.c,v 1.3.2.2.2.4 2007/01/25 12:22:21 tony2001 Exp $ */
+/* $Id: bz2_filter.c,v 1.3.2.2.2.5 2007/08/09 23:27:22 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -228,8 +228,8 @@
if (flags & PSFS_FLAG_FLUSH_CLOSE) {
/* Spit it out! */
- status = BZ_OUTBUFF_FULL;
- while (status == BZ_OUTBUFF_FULL) {
+ status = BZ_FINISH_OK;
+ while (status == BZ_FINISH_OK) {
status = BZ2_bzCompress(&(data->strm), BZ_FINISH);
if (data->strm.avail_out < data->outbuf_len) {
size_t bucketlen = data->outbuf_len -
data->strm.avail_out;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.888&r2=1.2027.2.547.2.889&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.888 php-src/NEWS:1.2027.2.547.2.889
--- php-src/NEWS:1.2027.2.547.2.888 Thu Aug 9 08:43:09 2007
+++ php-src/NEWS Thu Aug 9 23:27:22 2007
@@ -13,6 +13,8 @@
- Fixed bug #42198 (SCRIPT_NAME and PHP_SELF truncated when inside a userdir
and using PATH_INFO). (Dmitry)
- Fixed bug #42195 (C++ compiler required always). (Jani)
+- Fixed bug #42117 (bzip2.compress loses data in internal buffer). (Philip,
+ Ilia)
- Fixed bug #42082 (NodeList length zero should be empty). (Hannes)
- Fixed bug #41973 (./configure --with-ldap=shared fails with
LDFLAGS="-Wl,--as-needed"). (Nuno)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
