rasmus Sat Sep 28 12:27:10 2002 EDT
Modified files:
/php4/main fopen_wrappers.c
Log:
Uh, this is what I meant to do. Fix for #19292
Index: php4/main/fopen_wrappers.c
diff -u php4/main/fopen_wrappers.c:1.149 php4/main/fopen_wrappers.c:1.150
--- php4/main/fopen_wrappers.c:1.149 Sat Sep 28 12:10:43 2002
+++ php4/main/fopen_wrappers.c Sat Sep 28 12:27:10 2002
@@ -16,7 +16,7 @@
| Jim Winstead <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.149 2002/09/28 16:10:43 rasmus Exp $ */
+/* $Id: fopen_wrappers.c,v 1.150 2002/09/28 16:27:10 rasmus Exp $ */
/* {{{ includes
*/
@@ -200,8 +200,8 @@
PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC)
{
/* Only check when safe_mode or open_basedir is on and safe_mode_include_dir
is available */
- if (((PG(open_basedir) && *PG(open_basedir)) || 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;
@@ -242,7 +242,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
