Uh, this is what I meant to do. Fix for #19292

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 00dec4e1008ac2f9492d3395e6bd2e333f1e505d..72b8e0a7bceedd82d4014f27f4eec3e23cb1af09 100644 (file)
--- 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;
 }
 /* }}} */