Fix GH-7953: ob_clean() only does not set Content-Encoding

If an output handler has not yet been started, calling `ob_clean()`
causes it to start.  If that happens, we must not forget to set the
`Content-Encoding` and `Vary` headers.

Closes GH-7960.

Author: cmb69

NEWS

@@ -2,6 +2,11 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2022, PHP 8.0.17
 
+- Iconv:
+  . Fixed bug GH-7953 (ob_clean() only does not set Content-Encoding). (cmb)
+
+- Zlib:
+  . Fixed bug GH-7953 (ob_clean() only does not set Content-Encoding). (cmb)
 
 17 Feb 2022, PHP 8.0.16
 

ext/iconv/iconv.c

@@ -311,7 +311,7 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c
 			mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE;
 		}
 
-		if (mimetype != NULL && !(output_context->op & PHP_OUTPUT_HANDLER_CLEAN)) {
+		if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || (output_context->op & PHP_OUTPUT_HANDLER_START))) {
 			size_t len;
 			char *p = strstr(get_output_encoding(), "//");
 

ext/iconv/tests/gh7953.phpt

@@ -0,0 +1,21 @@
+--TEST--
+GH-7953 (ob_clean() only may not set Content-* header)
+--SKIPIF--
+<?php
+if (!extension_loaded("iconv")) die("skip iconv extension not available");
+?>
+--INI--
+input_encoding=UTF-8
+output_encoding=ISO-8859-1
+--CGI--
+--FILE--
+<?php
+ob_start('ob_iconv_handler');
+ob_clean();
+
+echo 'Hello World';
+?>
+--EXPECTF--
+%a
+--EXPECTHEADERS--
+Content-Type: text/html; charset=ISO-8859-1

ext/zlib/tests/gh7953.phpt

@@ -0,0 +1,21 @@
+--TEST--
+GH-7953 (ob_clean() only may not set Content-* header)
+--SKIPIF--
+<?php
+if (!extension_loaded("zlib")) die("skip zlib extension not available");
+?>
+--CGI--
+--ENV--
+HTTP_ACCEPT_ENCODING=gzip
+--FILE--
+<?php
+ob_start('ob_gzhandler');
+ob_clean();
+
+echo 'Hello World';
+?>
+--EXPECTF--
+%a
+--EXPECTHEADERS--
+Content-Encoding: gzip
+Vary: Accept-Encoding

ext/zlib/zlib.c

@@ -281,7 +281,7 @@ static int php_zlib_output_handler(void **handler_context, php_output_context *o
 		return FAILURE;
 	}
 
-	if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN)) {
+	if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || (output_context->op & PHP_OUTPUT_HANDLER_START)) {
 		int flags;
 
 		if (SUCCESS == php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, &flags)) {