diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2002-09-28 16:27:10 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2002-09-28 16:27:10 +0000 |
| commit | 5a239ab0593f74610a3a554df93dbad3204cef6d (patch) | |
| tree | 192811c3aa368df189af6b6ea8ba9cb3d6f41ac5 | |
| parent | 5eab8abd35a740880ccbe879be69d13dbceba6c6 (diff) | |
| download | php-git-5a239ab0593f74610a3a554df93dbad3204cef6d.tar.gz | |
Uh, this is what I meant to do. Fix for #19292
| -rw-r--r-- | main/fopen_wrappers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index 00dec4e100..72b8e0a7bc 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -200,8 +200,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 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 @@ PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC) } /* Nothing to check... */ - return -1; + return 0; } /* }}} */ |