cvs: php4 /main fopen_wrappers.c

rasmus Sat Sep 28 12:10:43 2002 EDT Modified files: /php4/main fopen_wrappers.c Log: Probable fix for bug #19292 Index: php4/main/fopen_wrappers.c diff -u php4/main/fopen_wrappers.c:1.148 php4/main/fopen_wrappers.c:1.149 --- php4/main/fopen_wrappers.c:1.148 Sun Sep 22 14:30:38 2002 +++ php4/main/fopen_wrappers.c Sat Sep 28 12:10:43 2002 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.c,v 1.148 2002/09/22 18:30:38 iliaa Exp $ */ +/* $Id: fopen_wrappers.c,v 1.149 2002/09/28 16:10:43 rasmus Exp $ */ /* {{{ includes */ @@ -199,8 +199,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) && + /* 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)) { char *pathbuf;