Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79489: .user.ini does not inherit

Author: cmb69

NEWS

@@ -4,6 +4,7 @@ PHP                                                                        NEWS
 
 - Core:
   . Fixed bug #79566 (Private SHM is not private on Windows). (cmb)
+  . Fixed bug #79489 (.user.ini does not inherit). (cmb)
 
 - FFI:
   . Fixed bug #79571 (FFI: var_dumping unions may segfault). (cmb)

sapi/cgi/cgi_main.c

@@ -835,7 +835,11 @@ static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const
 		if (strncmp(s1, s2, s_len) == 0) {
 #endif
 			char *ptr = s2 + doc_root_len;
+#ifdef PHP_WIN32
+			while ((ptr = strpbrk(ptr, "\\/")) != NULL) {
+#else
 			while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
+#endif
 				*ptr = 0;
 				php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config);
 				*ptr = '/';