[PHP-CVS] cvs: php-src /ext/fileinfo fileinfo.c

[Felipe Pena]

felipe          Fri Aug 29 15:17:26 2008 UTC

  Modified files:              
    /php-src/ext/fileinfo       fileinfo.c 
  Log:
  - Fixed build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.30&r2=1.31&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.30 
php-src/ext/fileinfo/fileinfo.c:1.31
--- php-src/ext/fileinfo/fileinfo.c:1.30        Fri Aug 29 13:48:26 2008
+++ php-src/ext/fileinfo/fileinfo.c     Fri Aug 29 15:17:25 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: fileinfo.c,v 1.30 2008/08/29 13:48:26 tony2001 Exp $ */
+/* $Id: fileinfo.c,v 1.31 2008/08/29 15:17:25 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -551,7 +551,7 @@
                                char resolved_path[MAXPATHLEN];
 
                                if (*Z_STRVAL_P(what) && 
VCWD_REALPATH(Z_STRVAL_P(what), resolved_path)) {
-                                       if ((PG(safe_mode) && 
(!php_checkuid(resolved_path, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || 
php_check_open_basedir(resolved_path TSRMLS_CC)) {
+                                       if 
(php_check_open_basedir(resolved_path TSRMLS_CC)) {
                                                goto cleanup;
                                        }
                                        ret_val = (char *) magic_file(magic, 
resolved_path);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php