summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2002-09-28 16:10:43 +0000
committerRasmus Lerdorf <rasmus@php.net>2002-09-28 16:10:43 +0000
commit5eab8abd35a740880ccbe879be69d13dbceba6c6 (patch)
treeed0c0840bc303844ca7e42b401b4b79712f208ee
parent37b31b3e0819a6881471a2c7db5451c7db3e6823 (diff)
downloadphp-git-5eab8abd35a740880ccbe879be69d13dbceba6c6.tar.gz
Probable fix for bug #19292
-rw-r--r--main/fopen_wrappers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 0d25142f20..00dec4e100 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -199,8 +199,8 @@ PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
*/
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;