Skip to content

Commit ad5f31d

remicollet remicollet

committed

Merge branch 'PHP-8.4'

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

2 parents 1ac91f5 + 3a88977 commit ad5f31dCopy full SHA for ad5f31d

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
`@@ -54,7 +54,11 @@ AC_DEFUN([PHP_EXPAND_PATH],[`
`54`	`54`	`changequote({,})`
`55`	`55`	`ep_dir=$(echo 1ドル\|$SED 's%/[^/][^/]/*$%%')`
`56`	`56`	`changequote([,])`
`57`		`- ep_realdir=$(cd "$ep_dir" && pwd)`
	`57`	`+ if test -z $ep_dir ; then`
	`58`	`+ ep_realdir=$(pwd)`
	`59`	`+ else`
	`60`	`+ ep_realdir=$(cd "$ep_dir" && pwd)`
	`61`	`+ fi`
`58`	`62`	`2ドル="$ep_realdir"/$(basename "1ドル")`
`59`	`63`	`fi`
`60`	`64`	`])`

0 commit comments

Comments

(0)