Skip to content

Commit 21cbdf6

Browse files
committed
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix configure error
2 parents c56378b + 660250f commit 21cbdf6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PHP NEWS
55
- Core:
66
. Fixed bug #74780 (parse_url() borken when query string contains colon).
77
(jhdxr)
8+
. Fixed bug #74761 (Unary operator expected error on some systems). (petk)
89

910
- SPL:
1011
. Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)

acinclude.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -2687,7 +2687,7 @@ EOF
26872687
done
26882688
26892689
echo "'[$]0' \\" >> $1
2690-
if test `expr -- [$]0 : "'.*"` = 0; then
2690+
if test `expr " [$]0" : " '.*"` = 0; then
26912691
CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'"
26922692
else
26932693
CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0"

0 commit comments

Comments
 (0)