archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix GH-16199: GREP_HEADER() is broken

Browse source 
This also fixes the libxml version check when the libxml/xmlversion.h
is located elsewhere than libxml2 include directory.

Closes GH-15619.
This commit is contained in:
Peter Kokot 2024-08-28 17:08:30 +02:00 • committed by Christoph M. Becker
parent 50dfc436cd
commit e915ed75ea
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -71,6 +71,9 @@ PHP NEWS
. Fixed bug GH-15169 (stack overflow when var serialization in . Fixed bug GH-15169 (stack overflow when var serialization in
ext/standard/var). (nielsdos) ext/standard/var). (nielsdos)
- Windows:
. Fixed bug GH-16199 (GREP_HEADER() is broken). (Peter Kokot)
26 Sep 2024, PHP 8.4.0RC1 26 Sep 2024, PHP 8.4.0RC1
- BcMath: - BcMath:

9
win32/build/confutils.js
View file

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