Browse Source

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix configure error
pull/2588/merge
Joe Watkins 9 years ago
parent
commit
21cbdf6984
No known key found for this signature in database GPG Key ID: F9BA0ADA31CBD89E
  1. 1
      NEWS
  2. 2
      acinclude.m4

1
NEWS

@ -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)

2
acinclude.m4

@ -2687,7 +2687,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"

Loading…
Cancel
Save