diff options
| author | Anatol Belski <ab@php.net> | 2013-07-11 00:48:12 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-07-11 00:48:12 +0200 |
| commit | 2acc38627092123ac462f3a23780bf887bf69286 (patch) | |
| tree | 298028b3d5b31dc2ba2ba9ab7311201ccf68cff0 | |
| parent | 96f77f845a91858021a4e339d356ee5f734883ed (diff) | |
| download | php-git-2acc38627092123ac462f3a23780bf887bf69286.tar.gz | |
Fixed bug #65226 chroot() does not get enabled
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/standard/config.m4 | 24 |
2 files changed, 24 insertions, 1 deletions
@@ -13,6 +13,7 @@ PHP NEWS . Fixed bug #62475 (variant_* functions causes crash when null given as an argument). (Felipe) . Fixed bug #60732 (php_error_docref links to invalid pages). (Jakub Vrana) + . Fixed bug #65226 (chroot() does not get enabled). (Anatol) - CGI: . Fixed Bug #65143 (Missing php-cgi man page). (Remi) diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index c33ae1e05c..c1f5aff7c2 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -358,7 +358,29 @@ else AC_MSG_RESULT(no) fi -if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then +PHP_ENABLE_CHROOT_FUNC=no +case "$PHP_SAPI" in + embed) + PHP_ENABLE_CHROOT_FUNC=yes + ;; + + none) + for PROG in $PHP_BINARIES; do + case "$PROG" in + cgi|cli) + PHP_ENABLE_CHROOT_FUNC=yes + ;; + + *) + PHP_ENABLE_CHROOT_FUNC=no + break + ;; + esac + done + ;; +esac + +if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function]) fi |