From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 11 Aug 2006 18:06:28 +0000 (+0000)
Subject: PHP 6 does not have safe_mode
X-Git-Tag: RELEASE_1_0_0RC1~1985
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd6521ce30d3cb49c59a47b9f19a9ce1cbc525d9;p=php

PHP 6 does not have safe_mode
---

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 5856ce95ba..d148fffad6 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -825,10 +825,8 @@ PHP_FUNCTION(imap_reopen)
 		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;
 	}