rasmus Sat Sep 28 12:27:53 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/main fopen_wrappers.c
Log:
MFH fix for bug 19292
Index: php4/main/fopen_wrappers.c
diff -u php4/main/fopen_wrappers.c:1.142.2.3 php4/main/fopen_wrappers.c:1.142.2.4
--- php4/main/fopen_wrappers.c:1.142.2.3 Fri Aug 23 04:00:49 2002
+++ php4/main/fopen_wrappers.c Sat Sep 28 12:27:53 2002
@@ -16,7 +16,7 @@
| Jim Winstead <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.142.2.3 2002/08/23 08:00:49 zeev Exp $ */
+/* $Id: fopen_wrappers.c,v 1.142.2.4 2002/09/28 16:27:53 rasmus Exp $ */
/* {{{ includes
*/
@@ -226,8 +226,8 @@
PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC)
{
/* Only check when safe_mode on and safe_mode_include_dir is available */
- if (PG(safe_mode) && PG(safe_mode_include_dir) &&
- *PG(safe_mode_include_dir))
+ if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode))
+ && PG(safe_mode_include_dir) && *PG(safe_mode_include_dir))
{
char *pathbuf;
char *ptr;
@@ -268,7 +268,7 @@
}
/* Nothing to check... */
- return -1;
+ return 0;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
