cvs: php-src /ext/fileinfo fileinfo.c
| From: | Felipe Pena | Date: | Fri, 25 Jul 2008 11:54:06 +0000 |
| Subject: | cvs: php-src /ext/fileinfo fileinfo.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-51584@lists.php.net to get a copy of this message | ||
felipe Fri Jul 25 11:54:06 2008 UTC
Modified files:
/php-src/ext/fileinfo fileinfo.c
Log:
- Fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.21 php-src/ext/fileinfo/fileinfo.c:1.22
--- php-src/ext/fileinfo/fileinfo.c:1.21 Fri Jul 25 09:16:09 2008
+++ php-src/ext/fileinfo/fileinfo.c Fri Jul 25 11:54:06 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fileinfo.c,v 1.21 2008/07/25 09:16:09 jani Exp $ */
+/* $Id: fileinfo.c,v 1.22 2008/07/25 11:54:06 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -267,7 +267,7 @@
}
file = resolved_path;
- if ((PG(safe_mode) && (!php_checkuid(file, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
php_check_open_basedir(file TSRMLS_CC)) {
+ if (php_check_open_basedir(file TSRMLS_CC)) {
RETURN_FALSE;
}
}