pajoye Sun Aug 13 20:54:27 2006 UTC
Modified files:
/php-src/ext/zip php_zip.c
Log:
- remove all safe mode checks instead of borking the sources...Y
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.3 php-src/ext/zip/php_zip.c:1.4
--- php-src/ext/zip/php_zip.c:1.3 Sun Aug 13 20:16:48 2006
+++ php-src/ext/zip/php_zip.c Sun Aug 13 20:54:27 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.3 2006/08/13 20:16:48 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.4 2006/08/13 20:54:27 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -38,17 +38,6 @@
#define le_zip_entry_name "Zip Entry"
/* }}} */
-/* {{{ SAFEMODE_CHECKFILE(filename) */
-#if (PHP_MAJOR_VERSION < 6)
-#define SAFEMODE_CHECKFILE(filename) \
- if (PG(safe_mode) && (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC) { \
- RETURN_FALSE; \
- }
-#else
-#define SAFEMODE_CHECKFILE(filename);
-#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) { \
@@ -119,8 +108,6 @@
php_basename(file, file_len, NULL, 0, &file_basename, (int
*)&file_basename_len TSRMLS_CC);
- SAFEMODE_CHECKFILE(file_dirname_fullpath);
-
/* let see if the path already exists */
if (php_stream_stat_path(file_dirname_fullpath, &ssb) < 0) {
ret = php_stream_mkdir(file_dirname_fullpath, 0777,
PHP_STREAM_MKDIR_RECURSIVE, NULL);
@@ -145,12 +132,6 @@
return 0;
}
- /* check again the full path, not sure if it
- * is required, does a file can have a different
- * safemode status as its parent folder?
- */
- SAFEMODE_CHECKFILE(fullpath);
-
zf = zip_fopen(za, file, 0);
if (zf == NULL) {
efree(fullpath);
@@ -158,11 +139,9 @@
efree(file_basename);
return 0;
}
-#if (PHP_MAJOR_VERSION < 6)
- stream = php_stream_open_wrapper(fullpath, "w+b",
REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
-#else
+
stream = php_stream_open_wrapper(fullpath, "w+b", REPORT_ERRORS, NULL);
-#endif
+
n = 0;
if (stream) {
while ((n=zip_fread(zf, b, sizeof(b))) > 0)
php_stream_write(stream, b, n);
@@ -623,8 +602,6 @@
return;
}
- SAFEMODE_CHECKFILE(filename);
-
rsrc_int = (zip_rsrc *)emalloc(sizeof(zip_rsrc));
rsrc_int->za = zip_open(filename, mode, &err);
@@ -988,8 +965,6 @@
entry_name_len = filename_len;
}
- SAFEMODE_CHECKFILE(filename);
-
zs = zip_source_file(intern, filename, 0, 0);
if (!zs) {
RETURN_FALSE;
@@ -1959,7 +1934,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.3
2006/08/13 20:16:48 pajoye Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.4
2006/08/13 20:54:27 pajoye Exp $");
php_info_print_table_row(2, "Zip version", "1.4.0");
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
