Merge branch 'PHP-8.5'

iluuu1994 · iluuu1994 · commit 17652409b8a0 · 2025-10-21T01:25:36.000+02:00
* PHP-8.5: [skip ci] Also skip check_default_conf_path.phpt on Windows & 8.2 Revert "Fix Windows test for openssl-3.5 upgrade (php#19384)"
diff --git a/ext/openssl/tests/check_default_conf_path.phpt b/ext/openssl/tests/check_default_conf_path.phpt
@@ -21,7 +21,7 @@ ob_end_clean();
 preg_match(",Openssl default config [^ ]* (.*),", $info, $m);
 
 if (isset($m[1])) {
-    var_dump(str_replace('\\/', '\\', strtolower($m[1])));
+    var_dump(str_replace('/', '\\', strtolower($m[1])));
 } else {
     echo $info;
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ ob_end_clean();`
`21`	`21`	`preg_match(",Openssl default config [^ ]* (.*),", $info, $m);`
`22`	`22`
`23`	`23`	`if (isset($m[1])) {`
`24`		`- var_dump(str_replace('\\/', '\\', strtolower($m[1])));`
	`24`	`+ var_dump(str_replace('/', '\\', strtolower($m[1])));`
`25`	`25`	`} else {`
`26`	`26`	`echo $info;`
`27`	`27`	`}`