]> granicus.if.org Git - php/commitdiff
suppress warnings to avoid potential loop
authorStanislav Malyshev <stas@php.net>
Tue, 10 Jul 2007 17:58:19 +0000 (17:58 +0000)
committerStanislav Malyshev <stas@php.net>
Tue, 10 Jul 2007 17:58:19 +0000 (17:58 +0000)
main/main.c

index ee70a04f88204a07433e3f6d9079ecd5af5cd675..6322230edecad673297ec6bed197732d270e831e 100644 (file)
@@ -356,11 +356,11 @@ PHPAPI void php_log_err(char *log_message TSRMLS_DC)
                        return;
                }
 #endif
-               if (PG(safe_mode) && (!php_checkuid(PG(error_log), NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+               if (PG(safe_mode) && (!php_checkuid(PG(error_log), NULL, CHECKUID_CHECK_FILE_AND_DIR|CHECKUID_NO_ERRORS))) {
                        return FAILURE;
                }
 
-               if (PG(open_basedir) && php_check_open_basedir(PG(error_log) TSRMLS_CC)) {
+               if (PG(open_basedir) && php_check_open_basedir_ex(PG(error_log), 0 TSRMLS_CC)) {
                        return FAILURE;
                }