php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix GH-16199: GREP_HEADER() is broken
This commit is contained in:
Christoph M. Becker
2024-10-03 18:33:37 +02:00
parent d7f09eb0ed e915ed75ea
commit 850a5a49ee
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
win32/build/confutils.js
View File

@@ -965,14 +965,19 @@ function GREP_HEADER(header_name, regex, path_to_check)
if (!c) {
/* look in the include path */
if (path_to_check == null) {
path_to_check = php_usual_include_suspects;
} else {
path_to_check += ";" + php_usual_include_suspects;
}
var p = search_paths(header_name, path_to_check, "INCLUDE");
if (typeof(p) == "string") {
c = file_get_contents(p);
c = file_get_contents(p + "\\" + header_name);
} else if (p == false) {
p = search_paths(header_name, PHP_EXTRA_INCLUDES, null);
if (typeof(p) == "string") {
c = file_get_contents(p);
c = file_get_contents(p + "\\" + header_name);
}
}
if (!c) {