cellog          Fri May 30 22:49:46 2008 UTC

  Modified files:              
    /php-src/ext/phar   phar.c 
    /php-src/ext/phar/tests/zip/files   frontcontroller.phar.zip 
                                        frontcontroller10.phar.zip 
                                        frontcontroller11.phar.zip 
                                        frontcontroller12.phar.zip 
                                        frontcontroller2.phar.zip 
                                        frontcontroller3.phar.zip 
                                        frontcontroller4.phar.zip 
                                        frontcontroller5.phar.zip 
                                        frontcontroller6.phar.zip 
                                        frontcontroller7.phar.zip 
                                        frontcontroller8.phar.zip 
                                        frontcontroller9.phar.zip 
  Log:
  MFB: fix corrupted zips, fix postprocess for compressed zip file
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.379&r2=1.380&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.379 php-src/ext/phar/phar.c:1.380
--- php-src/ext/phar/phar.c:1.379       Fri May 30 22:39:32 2008
+++ php-src/ext/phar/phar.c     Fri May 30 22:49:46 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar.c,v 1.379 2008/05/30 22:39:32 cellog Exp $ */
+/* $Id: phar.c,v 1.380 2008/05/30 22:49:46 cellog Exp $ */
 
 #define PHAR_MAIN 1
 #include "phar_internal.h"
@@ -1988,7 +1988,7 @@
                /* construct actual offset to file start - local extra_len can 
be different from central extra_len */
                entry->offset = entry->offset_abs =
                        sizeof(local) + entry->header_offset + 
PHAR_ZIP_16(local.filename_len) + PHAR_ZIP_16(local.extra_len);
-               if (idata->zero != entry->offset_abs) {
+               if (idata->zero && idata->zero != entry->offset_abs) {
                        idata->zero = entry->offset_abs;
                }
        }
@@ -3052,7 +3052,7 @@
        php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
        php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
        php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
-       php_info_print_table_row(2, "CVS revision", "$Revision: 1.379 $");
+       php_info_print_table_row(2, "CVS revision", "$Revision: 1.380 $");
        php_info_print_table_row(2, "Phar-based phar archives", "enabled");
        php_info_print_table_row(2, "Tar-based phar archives", "enabled");
        php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller10.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller10.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller11.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller11.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller12.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller12.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller2.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller2.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller3.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller3.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller4.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller4.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller5.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller5.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller6.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller6.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller7.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller7.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller8.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller8.phar.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/frontcontroller9.phar.zip?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/zip/files/frontcontroller9.phar.zip



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

Reply via email to