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.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Fix GH-11522: PHP version check fails with '-' separator
This commit is contained in:
Niels Dossche
2023-06-27 18:29:09 +02:00
parent 1288c07ba6 3483229199
commit ac60c5c70c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.2.9
- Build:
. Fix GH-11522: PHP version check fails with '-' separator. (SVGAnimate)
- CLI:
. Fix interrupted CLI output causing the process to exit. (nielsdos)

2
build/php.m4
View File

@@ -1892,7 +1892,7 @@ AC_DEFUN([PHP_PROG_PHP],[
if test -n "$PHP"; then
AC_MSG_CHECKING([for php version])
php_version=$($PHP -v | head -n1 | cut -d ' ' -f 2)
php_version=$($PHP -v | head -n1 | cut -d ' ' -f 2 | cut -d '-' -f 1)
if test -z "$php_version"; then
php_version=0.0.0
fi