Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix configure error
This commit is contained in:
Joe Watkins 2017-06-22 14:01:54 +01:00
commit 0f15a03026
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
2 changed files with 2 additions and 1 deletions

1
NEWS
View file

@ -5,6 +5,7 @@ PHP NEWS
- Core:
. Fixed bug #74780 (parse_url() borken when query string contains colon).
(jhdxr)
. Fixed bug #74761 (Unary operator expected error on some systems). (petk)
- SPL:
. Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)

View file

@ -2676,7 +2676,7 @@ EOF
done
echo "'[$]0' \\" >> $1
if test `expr -- [$]0 : "'.*"` = 0; then
if test `expr " [$]0" : " '.*"` = 0; then
CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'"
else
CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0"