diff options
author | Joe Watkins <krakjoe@php.net> | 2018-05-23 22:23:53 +0200 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2018-05-23 22:23:53 +0200 |
commit | a422b1e60c15df8de8aead584e5d6f565426918b (patch) | |
tree | 8484e15045286868fcec594864027f81a48c67c8 | |
parent | a9d00be0244207d1562a1c31df84a293ff32a64f (diff) | |
parent | be11b354f4a25f75c0ac1ecebc8f9caed2a0a301 (diff) | |
download | php-git-a422b1e60c15df8de8aead584e5d6f565426918b.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix phpdbg disabling chroot support
-rw-r--r-- | ext/standard/config.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 87ee059bd3..b800aaa12f 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -318,7 +318,7 @@ case "$PHP_SAPI" in none) for PROG in $PHP_BINARIES; do case "$PROG" in - cgi|cli) + cgi|cli|phpdbg) PHP_ENABLE_CHROOT_FUNC=yes ;; |