There might be more systems which do not support chroot, so we check

for the existence of it.

Additionally, if chroot is not supported, the warn_not_available function
is invoked now.

diff --git a/configure.in b/configure.in
index b8012d0d2e36db9a9f991c16d71539500a219d91..3588023ccd6d1a20c2f476525d0e0799f4923868 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -358,6 +358,7 @@ dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(
 asctime_r \
+chroot \
 crypt \
 ctime_r \
 cuserid \

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 303d3b46390cf40830aa60eb43f03bb4f8e23868..855457b815b0fb902dbc9443e988346ee4fd587a 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -465,8 +465,10 @@ function_entry basic_functions[] = {
        PHP_FE(opendir,                         NULL)
        PHP_FE(closedir,                        NULL)
        PHP_FE(chdir,                           NULL)
-#if !defined(ZEND_WIN32)&&!defined(ZTS)
+#if defined(HAVE_CHROOT) && !defined(ZTS)
        PHP_FE(chroot,                          NULL)
+#else
+       PHP_FALIAS(chroot, warn_not_available, NULL)
 #endif
        PHP_FE(getcwd,                          NULL)
        PHP_FE(rewinddir,                       NULL)

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 39df84b267abb6ce499116eff6954dd89b88ce68..89f4f797c046af741e1f910efd5575036a2c35f7 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -223,7 +223,7 @@ PHP_FUNCTION(closedir)
 
 /* }}} */
 
-#if !defined(ZEND_WIN32)&&!defined(ZTS)
+#if defined(HAVE_CHROOT) && !defined(ZTS)
 /* {{{ proto int chroot(string directory)
    Change root directory */
 

diff --git a/ext/standard/php_dir.h b/ext/standard/php_dir.h
index 3326b94a0a92dfa22ea3654df7b6dec85da42369..7bef9249e775a8e865ef3e0303da4e247d0adb5b 100644 (file)
--- a/ext/standard/php_dir.h
+++ b/ext/standard/php_dir.h
@@ -28,7 +28,7 @@ PHP_RINIT_FUNCTION(dir);
 PHP_FUNCTION(opendir);
 PHP_FUNCTION(closedir);
 PHP_FUNCTION(chdir);
-#if !defined(ZEND_WIN32)&&!defined(ZTS)
+#if defined(HAVE_CHROOT) && !defined(ZTS)
 PHP_FUNCTION(chroot);
 #endif
 PHP_FUNCTION(getcwd);