cvs: php-src(PHP_5_2) /main main.c

From: Date: Tue, 10 Jul 2007 17:58:19 +0000
Subject: cvs: php-src(PHP_5_2) /main main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-45183@lists.php.net to get a copy of this message
stas Tue Jul 10 17:58:19 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/main main.c Log: suppress warnings to avoid potential loop http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.40&r2=1.640.2.23.2.41&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.40 php-src/main/main.c:1.640.2.23.2.41 --- php-src/main/main.c:1.640.2.23.2.40 Tue Jul 10 17:42:29 2007 +++ php-src/main/main.c Tue Jul 10 17:58:19 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.40 2007/07/10 17:42:29 stas Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.41 2007/07/10 17:58:19 stas Exp $ */ /* {{{ includes */ @@ -356,11 +356,11 @@ 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; }

« previous php.cvs (#45183) next »