fix #36869 (memory leak in output buffering when using chunked output)

diff --git a/NEWS b/NEWS
index 615dcd0afeacfa2e046ab82c4d7da485f35d8aa8..d6fb0e9d34e2a054005b259ae1f76d3155ea9890 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ PHP                                                                        NEWS
 - 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

diff --git a/main/output.c b/main/output.c
index 9f62418914d0b94f6cae6f1d2bed0154c5cd0661..522ff35b0cb866dc9ceabf3b2412d9167e7da77d 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -606,11 +606,7 @@ static inline void php_ob_append(const char *text, uint text_length TSRMLS_DC)
        /* 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;
        }