tony2001 Mon Mar 27 08:26:10 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main output.c
/php-src NEWS
Log:
fix #36869 (memory leak in output buffering when using chunked output)
http://cvs.php.net/viewcvs.cgi/php-src/main/output.c?r1=1.167.2.2&r2=1.167.2.3&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.2 php-src/main/output.c:1.167.2.3
--- php-src/main/output.c:1.167.2.2 Sun Jan 1 12:50:17 2006
+++ php-src/main/output.c Mon Mar 27 08:26:10 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.167.2.2 2006/01/01 12:50:17 sniper Exp $ */
+/* $Id: output.c,v 1.167.2.3 2006/03/27 08:26:10 tony2001 Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -606,11 +606,7 @@
/* If implicit_flush is On or chunked buffering, send contents to next
buffer and return. */
if (OG(active_ob_buffer).chunk_size
&& OG(active_ob_buffer).text_length >=
OG(active_ob_buffer).chunk_size) {
- zval *output_handler = OG(active_ob_buffer).output_handler;
- if (output_handler) {
- output_handler->refcount++;
- }
php_end_ob_buffer(1, 1 TSRMLS_CC);
return;
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.482&r2=1.2027.2.483&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.482 php-src/NEWS:1.2027.2.483
--- php-src/NEWS:1.2027.2.482 Sun Mar 26 17:12:05 2006
+++ php-src/NEWS Mon Mar 27 08:26:10 2006
@@ -11,6 +11,8 @@
- Removed the E_STRICT deprecation notice from "var". (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed SoapFault::getMessage(). (Dmitry)
+- Fixed bug #36869 (memory leak in output buffering when using chunked output).
+ (Tony)
- Fixed bug #36859 (DOMElement crashes when calling __construct when
clone'ing). (Tony)
- Fixed bug #36857 (Added support for partial content fetching to the HTTP
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
