Merge branch 'PHP-8.0' into PHP-8.1

Author: devnexen

NEWS

@@ -8,6 +8,7 @@ PHP                                                                        NEWS
 
 - FPM:
   . Fixed zlog message prepend, free on incorrect address. (Heiko Weber)
+  . Fixed possible double free on configuration loading failure. (Heiko Weber).
 
 - GD:
   . Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument).

sapi/fpm/fpm/fpm_conf.c

@@ -1630,7 +1630,10 @@ int fpm_conf_load_ini_file(char *filename) /* {{{ */
 		tmp = zend_parse_ini_string(buf, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)fpm_conf_ini_parser, &error);
 		ini_filename = filename;
 		if (error || tmp == FAILURE) {
-			if (ini_include) free(ini_include);
+			if (ini_include) {
+				free(ini_include);
+				ini_include = NULL;
+			}
 			ini_recursion--;
 			close(fd);
 			free(buf);