Skip to content

Commit 3a88977

remicollet remicollet

committed

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix GH-19681 PHP_EXPAND_PATH broken with bash 5.3.0

2 parents f0c5315 + 98d2b92 commit 3a88977Copy full SHA for 3a88977

File tree

1 file changed

+5

-1

lines changed

build
- php.m4

1 file changed

+5

-1

lines changed

`‎build/php.m4`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,11 @@ AC_DEFUN([PHP_EXPAND_PATH],[`
`63`	`63`	`changequote({,})`
`64`	`64`	`ep_dir=$(echo 1ドル\|$SED 's%/[^/][^/]/*$%%')`
`65`	`65`	`changequote([,])`
`66`		`- ep_realdir=$(cd "$ep_dir" && pwd)`
	`66`	`+ if test -z $ep_dir ; then`
	`67`	`+ ep_realdir=$(pwd)`
	`68`	`+ else`
	`69`	`+ ep_realdir=$(cd "$ep_dir" && pwd)`
	`70`	`+ fi`
`67`	`71`	`2ドル="$ep_realdir"/$(basename "1ドル")`
`68`	`72`	`fi`
`69`	`73`	`])`

0 commit comments

Comments

(0)