ZTS is 0 or 1 but always defined.
So that needs to be changed. I'd do it but I'm very late for something and
need to run.
Andi
At 05:21 AM 2/15/2001 +0000, Sascha Schumann wrote:
>sas Wed Feb 14 21:21:28 2001 EDT
>
> Modified files:
> /php4 configure.in
> /php4/ext/standard php_dir.h dir.c basic_functions.c
> Log:
> 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.
>
>
>Index: php4/configure.in
>diff -u php4/configure.in:1.217 php4/configure.in:1.218
>--- php4/configure.in:1.217 Mon Feb 5 16:03:44 2001
>+++ php4/configure.in Wed Feb 14 21:21:27 2001
>@@ -1,4 +1,4 @@
>-dnl ## $Id: configure.in,v 1.217 2001/02/06 00:03:44 svanegmond Exp $ -*-
>sh -*-
>+dnl ## $Id: configure.in,v 1.218 2001/02/15 05:21:27 sas Exp $ -*- sh -*-
> dnl ## Process this file with autoconf to produce a configure script.
>
> divert(1)
>@@ -358,6 +358,7 @@
> AC_FUNC_VPRINTF
> AC_CHECK_FUNCS(
> asctime_r \
>+chroot \
> crypt \
> ctime_r \
> cuserid \
>Index: php4/ext/standard/php_dir.h
>diff -u php4/ext/standard/php_dir.h:1.13 php4/ext/standard/php_dir.h:1.14
>--- php4/ext/standard/php_dir.h:1.13 Wed Feb 14 16:43:44 2001
>+++ php4/ext/standard/php_dir.h Wed Feb 14 21:21:27 2001
>@@ -17,7 +17,7 @@
> +----------------------------------------------------------------------+
> */
>
>-/* $Id: php_dir.h,v 1.13 2001/02/15 00:43:44 derick Exp $ */
>+/* $Id: php_dir.h,v 1.14 2001/02/15 05:21:27 sas Exp $ */
>
> #ifndef PHP_DIR_H
> #define PHP_DIR_H
>@@ -28,7 +28,7 @@
> 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);
>Index: php4/ext/standard/dir.c
>diff -u php4/ext/standard/dir.c:1.55 php4/ext/standard/dir.c:1.56
>--- php4/ext/standard/dir.c:1.55 Wed Feb 14 16:43:44 2001
>+++ php4/ext/standard/dir.c Wed Feb 14 21:21:27 2001
>@@ -17,7 +17,7 @@
> +----------------------------------------------------------------------+
> */
>
>-/* $Id: dir.c,v 1.55 2001/02/15 00:43:44 derick Exp $ */
>+/* $Id: dir.c,v 1.56 2001/02/15 05:21:27 sas Exp $ */
>
> /* {{{ includes/startup/misc */
>
>@@ -223,7 +223,7 @@
>
> /* }}} */
>
>-#if !defined(ZEND_WIN32)&&!defined(ZTS)
>+#if defined(HAVE_CHROOT) && !defined(ZTS)
> /* {{{ proto int chroot(string directory)
> Change root directory */
>
>Index: php4/ext/standard/basic_functions.c
>diff -u php4/ext/standard/basic_functions.c:1.304
>php4/ext/standard/basic_functions.c:1.305
>--- php4/ext/standard/basic_functions.c:1.304 Wed Feb 14 16:43:44 2001
>+++ php4/ext/standard/basic_functions.c Wed Feb 14 21:21:27 2001
>@@ -17,7 +17,7 @@
> +----------------------------------------------------------------------+
> */
>
>-/* $Id: basic_functions.c,v 1.304 2001/02/15 00:43:44 derick Exp $ */
>+/* $Id: basic_functions.c,v 1.305 2001/02/15 05:21:27 sas Exp $ */
>
> #include "php.h"
> #include "php_main.h"
>@@ -465,8 +465,10 @@
> 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)
>
>
>
>--
>PHP CVS Mailing List (http://www.php.net/)
>To unsubscribe, e-mail: [EMAIL PROTECTED]
>For additional commands, e-mail: [EMAIL PROTECTED]
>To contact the list administrators, e-mail: [EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
