Merge branch 'PHP-8.1'

cmb69 · cmb69 · commit f107f968ec5e · 2022-04-25T14:30:26.000+02:00
* PHP-8.1: Fix GH-8218: ob_end_clean does not reset Content-Encoding header
diff --git a/ext/iconv/iconv.c b/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) || (output_context->op & PHP_OUTPUT_HANDLER_START))) {
+		if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL)))) {
 			size_t len;
 			char *p = strstr(get_output_encoding(), "//");
 
diff --git a/ext/zlib/zlib.c b/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) || (output_context->op & PHP_OUTPUT_HANDLER_START)) {
+	if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL))) {
 		int flags;
 
 		if (SUCCESS == php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, &flags)) {

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ static int php_iconv_output_handler(void *nothing, php_output_context output_c`
`311`	`311`	`mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE;`
`312`	`312`	`}`
`313`	`313`
`314`		`- if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) \|\| (output_context->op & PHP_OUTPUT_HANDLER_START))) {`
	`314`	`+ if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) \|\| ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL)))) {`
`315`	`315`	`size_t len;`
`316`	`316`	`char *p = strstr(get_output_encoding(), "//");`
`317`	`317`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ static int php_zlib_output_handler(void *handler_context, php_output_context o`
`281`	`281`	`return FAILURE;`
`282`	`282`	`}`
`283`	`283`
`284`		`- if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) \|\| (output_context->op & PHP_OUTPUT_HANDLER_START)) {`
	`284`	`+ if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) \|\| ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL))) {`
`285`	`285`	`int flags;`
`286`	`286`
`287`	`287`	`if (SUCCESS == php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, &flags)) {`