From: Stanislav Malyshev <stas@php.net>
Date: Tue, 10 Jul 2007 17:58:19 +0000 (+0000)
Subject: suppress warnings to avoid potential loop
X-Git-Tag: php-5.2.4RC1~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f1b3ea73ada600de1f2c781a4a33b18b0cf5ffd;p=php

suppress warnings to avoid potential loop
---

diff --git a/main/main.c b/main/main.c
index ee70a04f88..6322230ede 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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;
 		}