Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix GH-8208: mb_encode_mimeheader: $indent functionality broken

Author: cmb69

NEWS

@@ -14,6 +14,10 @@ PHP                                                                        NEWS
     classes). (ilutov)
   . Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
 
+- MBString:
+  . Fixed bug GH-8208 (mb_encode_mimeheader: $indent functionality broken).
+    (cmb)
+
 - MySQLi:
   . Fixed bug GH-8068 (mysqli_fetch_object creates inaccessible properties).
     (cmb)

ext/mbstring/libmbfl/mbfl/mbfilter.c

@@ -1732,7 +1732,7 @@ mime_header_encoder_result(struct mime_header_encoder_data *pe, mbfl_string *res
 		mbfl_memory_device_strncat(&pe->outdev, "\x3f\x3d", 2);		/* ?= */
 	} else if (pe->tmpdev.pos > 0) {
 		if (pe->outdev.pos > 0) {
-			if ((pe->outdev.pos - pe->linehead + pe->tmpdev.pos) > 74) {
+			if ((pe->outdev.pos - pe->linehead + pe->tmpdev.pos + pe->firstindent) > 74) {
 				mbfl_memory_device_strncat(&pe->outdev, pe->lwsp, pe->lwsplen);
 			} else {
 				mbfl_memory_device_output(0x20, &pe->outdev);

ext/mbstring/tests/gh8208.phpt

@@ -0,0 +1,18 @@
+--TEST--
+GH-8208 (mb_encode_mimeheader: $indent functionality broken)
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+$s = "[service-Aufgaben S&W-Team][#19415] VM''s aufsetzen mit unterschiedlichen";
+$p = 'Subject: ';
+var_dump(
+    $p . mb_encode_mimeheader($s, 'UTF-8', 'Q', "\015\012", strlen($p)),
+    mb_encode_mimeheader($p . $s, 'UTF-8', 'Q', "\015\012", 0)
+);
+?>
+--EXPECT--
+string(84) "Subject: [service-Aufgaben S&W-Team][#19415] VM''s aufsetzen mit
+ unterschiedlichen"
+string(84) "Subject: [service-Aufgaben S&W-Team][#19415] VM''s aufsetzen mit
+ unterschiedlichen"