cellog          Sun Oct 26 05:51:04 2008 UTC

  Modified files:              
    /php-src/ext/phar   phar.c 
  Log:
  last commit was an old patch, revert faulty line
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.391&r2=1.392&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.391 php-src/ext/phar/phar.c:1.392
--- php-src/ext/phar/phar.c:1.391       Sun Oct 26 05:49:24 2008
+++ php-src/ext/phar/phar.c     Sun Oct 26 05:51:04 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar.c,v 1.391 2008/10/26 05:49:24 cellog Exp $ */
+/* $Id: phar.c,v 1.392 2008/10/26 05:51:04 cellog Exp $ */
 
 #define PHAR_MAIN 1
 #include "phar_internal.h"
@@ -1035,7 +1035,6 @@
        /* check whether we have meta data, zero check works regardless of byte 
order */
        if (mydata->is_persistent) {
                PHAR_GET_32(buffer, mydata->metadata_len);
-               if (!mydata->metadata_len) buffer -= 4;
                if (phar_parse_metadata(&buffer, &mydata->metadata, 
mydata->metadata_len TSRMLS_CC) == FAILURE) {
                        MAPPHAR_FAIL("unable to read phar metadata in .phar 
file \"%s\"");
                }
@@ -3625,7 +3624,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.391 $");
+       php_info_print_table_row(2, "CVS revision", "$Revision: 1.392 $");
        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");



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

Reply via email to