[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip php_zip.c

[Pierre-Alain Joye]

pajoye          Fri Aug  8 15:37:38 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/zip    php_zip.c 
  Log:
  - use OPENBASEDIR_CHECKPATH instead of SAFEMODE_CHECKFILE, easier to keep 
code synced with HEAD
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.13&r2=1.1.2.38.2.14&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.38.2.13 
php-src/ext/zip/php_zip.c:1.1.2.38.2.14
--- php-src/ext/zip/php_zip.c:1.1.2.38.2.13     Fri Aug  8 10:12:27 2008
+++ php-src/ext/zip/php_zip.c   Fri Aug  8 15:37:37 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_zip.c,v 1.1.2.38.2.13 2008/08/08 10:12:27 tony2001 Exp $ */
+/* $Id: php_zip.c,v 1.1.2.38.2.14 2008/08/08 15:37:37 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -59,15 +59,6 @@
 #define le_zip_entry_name "Zip Entry"
 /* }}} */
 
-/* {{{ SAFEMODE_CHECKFILE(filename) */
-#if (PHP_MAJOR_VERSION < 6)
-#define SAFEMODE_CHECKFILE(filename) \
-       (PG(safe_mode) && (!php_checkuid(filename, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)
-#else 
-#define SAFEMODE_CHECKFILE(filename) (0)
-#endif
-/* }}} */
-
 /* {{{ PHP_ZIP_STAT_INDEX(za, index, flags, sb) */
 #define PHP_ZIP_STAT_INDEX(za, index, flags, sb) \
        if (zip_stat_index(za, index, flags, &sb) != 0) { \
@@ -142,7 +133,7 @@
 
                php_basename(file, file_len, NULL, 0, &file_basename, (unsigned 
int *)&file_basename_len TSRMLS_CC);
 
-               if (SAFEMODE_CHECKFILE(file_dirname_fullpath)) {
+               if (OPENBASEDIR_CHECKPATH(file_dirname_fullpath)) {
                        efree(file_dirname_fullpath);
                        efree(file_basename);
                        return 0;
@@ -191,7 +182,7 @@
         * is required, does a file can have a different
         * safemode status as its parent folder?
         */
-       if (SAFEMODE_CHECKFILE(fullpath)) {
+       if (OPENBASEDIR_CHECKPATH(fullpath)) {
                efree(file_dirname_fullpath);
                efree(file_basename);
                return 0;
@@ -236,7 +227,7 @@
        char resolved_path[MAXPATHLEN];
 
 
-       if (SAFEMODE_CHECKFILE(filename)) {
+       if (OPENBASEDIR_CHECKPATH(filename)) {
                return -1;
        }
 
@@ -1103,7 +1094,7 @@
                return;
        }
 
-       if (SAFEMODE_CHECKFILE(filename)) {
+       if (OPENBASEDIR_CHECKPATH(filename)) {
                RETURN_FALSE;
        }
 
@@ -2618,7 +2609,7 @@
        php_info_print_table_start();
 
        php_info_print_table_row(2, "Zip", "enabled");
-       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.38.2.13 2008/08/08 10:12:27 tony2001 Exp $");
+       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.38.2.14 2008/08/08 15:37:37 pajoye Exp $");
        php_info_print_table_row(2, "Zip version", "@PACKAGE_VERSION@");
        php_info_print_table_row(2, "Libzip version", "0.7.1");
 



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