cvs: php-src /ext/imap php_imap.c

iliaa Fri Aug 11 18:06:28 2006 UTC Modified files: /php-src/ext/imap php_imap.c Log: PHP 6 does not have safe_mode http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.219&r2=1.220&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.219 php-src/ext/imap/php_imap.c:1.220 --- php-src/ext/imap/php_imap.c:1.219 Fri Aug 11 15:09:43 2006 +++ php-src/ext/imap/php_imap.c Fri Aug 11 18:06:28 2006 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.219 2006/08/11 15:09:43 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.220 2006/08/11 18:06:28 iliaa Exp $ */ #define IMAP41 @@ -825,10 +825,8 @@ imap_le_struct->flags = cl_flags; } - /* local filename, need to perform open_basedir and safe_mode checks */ - if (Z_STRVAL_PP(mailbox)[0] != '{' && - (php_check_open_basedir(Z_STRVAL_PP(mailbox) TSRMLS_CC) || - (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(mailbox), NULL, CHECKUID_CHECK_FILE_AND_DIR)))) { + /* local filename, need to perform open_basedir checks */ + if (Z_STRVAL_PP(mailbox)[0] != '{' && php_check_open_basedir(Z_STRVAL_PP(mailbox) TSRMLS_CC)) { RETURN_FALSE; }