cvs: php-src(PHP_5_3) /ext/phar phar.c phar.phar

cellog Sun Aug 31 06:28:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.c phar.phar Log: remove superfluous double variable declaration, merge from pecl/phar http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.42&r2=1.370.2.43&diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.370.2.42 php-src/ext/phar/phar.c:1.370.2.43 --- php-src/ext/phar/phar.c:1.370.2.42 Sun Aug 31 06:13:42 2008 +++ php-src/ext/phar/phar.c Sun Aug 31 06:28:01 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar.c,v 1.370.2.42 2008/08/31 06:13:42 cellog Exp $ */ +/* $Id: phar.c,v 1.370.2.43 2008/08/31 06:28:01 cellog Exp $ */ #define PHAR_MAIN 1 #include "phar_internal.h" @@ -3182,7 +3182,6 @@ } if (phar->flags & PHAR_FILE_COMPRESSED_GZ) { - php_stream_filter *filter; /* to properly compress, we have to tell zlib to add a zlib header */ zval filterparams; @@ -3206,8 +3205,6 @@ /* use the temp stream as our base */ phar->fp = newfile; } else if (phar->flags & PHAR_FILE_COMPRESSED_BZ2) { - php_stream_filter *filter; - filter = php_stream_filter_create("bzip2.compress", NULL, php_stream_is_persistent(phar->fp) TSRMLS_CC); php_stream_filter_append(&phar->fp->writefilters, filter); php_stream_copy_to_stream(newfile, phar->fp, PHP_STREAM_COPY_ALL); @@ -3613,7 +3610,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.370.2.42 $"); + php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.43 $"); 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/phar.phar?r1=1.7.2.36&r2=1.7.2.37&diff_format=u Index: php-src/ext/phar/phar.phar diff -u php-src/ext/phar/phar.phar:1.7.2.36 php-src/ext/phar/phar.phar:1.7.2.37 --- php-src/ext/phar/phar.phar:1.7.2.36 Sun Aug 31 06:26:19 2008 +++ php-src/ext/phar/phar.phar Sun Aug 31 06:28:01 2008 @@ -1171,8 +1171,8 @@ new PharCommand($argc, $argv); __HALT_COMPILER(); ?> -6
-+6
+ ž¶Â²Ø䂱÷¡ˆJÉþžs±æêÔ*,8ƒW——?°!~ý븅ˆY…åBós„.coîd!¨`w¡ŽóLæȹBÀ’í.å[ža‘äÙs\í¹ gßœ× „ób„náNŸ@@ -1229,4 +1229,4 @@ ùU™NøÖ þ­î_ê!@Îå°"¦ÚڐFóõOÿ¨ÊLG3@§=DM¡bP½5ùâ ¬ËaYšº
[Ã⎬mòvOë<ý]¸¹)×soS…jßZæ/]ûô‚Þv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ŒÐӛ*€Çê=KÕO)ò)‘«Ë-ԍ]µLí‹·¡7µ¾Í¨.zÿ.jß?8Tù®,˜:«Äa·éï¤Á»hg• ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4ʃ¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,­°„í]@¿úÁëÀu8á3nã\WÊíÑ藵ïtúÎþ®øÚ÷Eí»ú¡ÃÏà›Ÿ‚ÇGx‰îӟ᧾óãæ]Ž¢Õ~f–I|øðP› j„7l1ØÛPšH†üéÅiGH¬5´¯’$ß/rªýëІ~ѐ›úgìªz²¢ÎÛ¦pu€Šùäûù;â9³™䂯;pUµ–T°¬\ÍÏà騫éóÀ¨Ð}º{këáCz·«t8Ǜ6
¬ò“.ÑZ^ÂøIw®N$_ÿ¸@P…Ê•¡ðÙÎö¯ØïÇBˆÏ -Pàø3C°\ No newline at end of file +Pàø3C°\ No newline at end of file