cvs: php-src(PHP_5_3) /ext/phar phar.phar /ext/phar/phar pharcommand.inc
| From: | Marcus Boerger | Date: | Sun, 01 Jun 2008 07:39:06 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar phar.phar /ext/phar/phar pharcommand.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50224@lists.php.net to get a copy of this message | ||
helly Sun Jun 1 07:39:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.phar
/php-src/ext/phar/phar pharcommand.inc
Log:
- Add Openssl support
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.2&r2=1.7.2.3&diff_format=u Index: php-src/ext/phar/phar.phar diff -u php-src/ext/phar/phar.phar:1.7.2.2 php-src/ext/phar/phar.phar:1.7.2.3 --- php-src/ext/phar/phar.phar:1.7.2.2 Sat May 31 18:40:05 2008 +++ php-src/ext/phar/phar.phar Sun Jun 1 07:39:06 2008 @@ -890,26 +890,16 @@ new PharCommand($argc, $argv); __HALT_COMPILER(); ?> -6--$m¤A ©¥ÄEê¤íÀõïÌ>È]î{Æ-¼#"ø'¯ÉåHc_b;e,cþଲõ6¾£é;~%ÃGäxy±z";¾¤'B"Ó8Ïiákò,¹¨ËÙjµôXz«Q'ýßÒ¯ivVLxðlõä=¡B'5è´¦ÈÝ lvHPÛÍI².sÊÖèG¾p-2&ÝhoL¬1 5í=8»° §¹z¿Ã(ãÁÖ׬êÞp·Æ+P#Ï7ñ\ -Î@BÓz×÷\ï¾#ºPË5ÝÒ!@V&nZ.ÙbÞ.þ2üê½Ôl,1~"#{ZP^ Y¤ùüt×5_N/´Äo(á.H¼ªDú R§ë(DêàÁ¹òDúXsG]WÊ^OªQ©LiìÙ -³íTß-£ÁWÅüfk®sÏqô~ÖýO3 -øñt-iå¾eÞË8Ñý9ÿXÂL¹¯m/¥üîÕMa¹Ò¢ÆÙYKÐpcºMZ»Æ Q<(c¼Læ/Q.ît?#A.ÃçbBµù±¸¹/ª[¤2GZçO¥wn÷Z[A¥¦éÊaµ¸1AöY:zþ1WKnF#¢Û¸Õ¦6Ëh¥ÂÈò¢üëN-)I¼9Õa]~¦| >ÜçÛf±Xÿéó?ÿõñ# ENl\FÀéC\@u»¡XdH»Ð ïk¨ñ ;ýz¿I´¢vDê²Êço:õéY¼ÕMG ð÷+`+®3Z,=Æj6®q]¡möÄj_*éWôò³ÃfPÔ*o¯¹_·K¼éá=?0ÅUc·¹¥ÙÀ¦ô|¤QB9½·Ó¯°ëÀ 6òl zQE(6Y-bL.@¦×NÏ ®h#*N>,°¨u¿ -ÉÆ09Sâ"º³YK6¢HÅ,ròðæ=üø[v*Ò[3zH8j°iµøX¬¶Ðä)4½r¡is1² n\áQ !Xr«$ݸ8 -C_þÇ»65Ð,QìüZE@×× ×WçBñ2óتÚCõ¦Üu'Ob:ôê0k'Øx_ÑôBq¼{xá?fQwd×Zÿe -ØÐÂ`ØÃÚ ëÛ,KTä#üÿ~kaÅGàè{i@´I4sz¹?9cçâÖ$N'ÙyAn) Rè²icìpbɤH*î^µ5+»Î-^ç°Ði®e Á¡ùç5-¨ÎHRZxÐË¿³8õ?´-ûÍ -ͱECbJ_æ\ii¯¢£Åx?¹dÆ -ëÓ!ù ~N£ÌoTfñ²é#¨çªG[ï×LÛá§á.#.øD«.Ì#ÅküÙê´Ðï"8ûbæTSí>m©¡*j*Lu*ð({ÔÒà?^4Ù>R3aæJbî<É-×N|!Ó|m]lD|>\úÃd&"ýç -5¨UiPøÁÄÌȹ¿ïáﯽT®$äò¿%%?&üÔ¯r,°Ø~ÉÁgèíøècðwôà gH]ßzÐßáAð>c{@÷å,òùÁrzìy÷ÁÿÃßÈ}1ºáKççd§ñ¾Ü8@[é¯8QÙÞ]âVk`1ÑDÝ -x<eK\ÄA+fhnåûuF÷Anð6Ï×1ÁÿSv3A5NëÝD/©[{¥ZW;Úá¨_Ïh&î]ØF¨R6ò#WÞÁ@øT#Ù(GÆäÎaÔU|©1ÂÙ5û)V§&ÇnÜøÂ§eã¨}"fnòFfÀguºpQ¾)tÓé´(öR»ö0¢ÒX8apîµl·nÏÀ¾Seíeù¡.'¥°ÙZ©Èè°L²ò¢6yÛª² -fej¯ôê<Á[û&BîÙ¡àȧÖÎY'±>+ݪæÕ£m i¤+®§ÃRòi+ÐÛíh`pqxËå,uðÉð1Érx<æDGjò]qϸr{2W[¢GTUWì8:¨Hʽ|¸«¾¸þ»( |LÒúõaRJV7)£×²4V]IZN#<ôm21_xAúÍóKù»;1A Muñ-yZVMjzm ªJnÛhà÷gÍß¶)L6-0êCÏ7w<43C-¾DCÎMXqDtñ¼Æ{@&hí¾ßa Á]'Ámý£Ó¼Ñm·æe7ö®*Ãç9ÎÚ³Bª:ê¨Á9vêÕª!-ШOf¦£? ?.Nþ+6++>ç°ÍÀ-}±HаE+sdDqùT{çºð^ça3©i2#¤tX#n© û$=ýknF#¢Û¸å¦6Ë¥ÂÈòªüN)i¼Ëê *?¾BBîĦ^l{%YèúüÏ>~¤ÓMʨ8ûePÝ®#Rî´¢èûj|áN¿Úo-©ºòùÛ¾J}fVoyÓQ¦a!¼Àý°×9Ërc5׸ªPÆ.{jµ¯ÕôKDfùÙa3(ê?å·?ÃWáWílzdÄ÷ Ñײ1ùp4KbòÃÓÝ,¤÷qú%v8ÆFC-EÒl0ÊÅÏæÀó{=!ô-#¦vÕ|pÏkM!øØÙ<H1& S,ëËNÏ .i#*I>°¨u¿¥Vgcâ"ºÓiK6¢HÉ,Hòðæ<üø[v¤3¾âlS8j°iµøX¶Ð)4½¥BiÚ\\¡Û/ð .$ÅenDRC_þÇWsmj¡Y Ùù+´Z¯¯A¯¯Îâÿdæ?q?´3MyÓy¬<µìÐËÃl`/£|EÓ+ÅÉ~pìAâ ÿ5FÝÝhý)`Ã` +a#Å&+¼®ÁB/£d¥+ -?¯+V+îø¡¬¡¡`ÏY1ê¤ Ã© 7+}S&¤Ò$Ò^GÊ~%j+¬Oûøg+,lÐ×6±+Óü¤>Üp8ãyÒÌêkvmþ¸ã~ÛÚd»ºÌ²K}\äNïбFbÞö^]½F²-MdÛhýÌcò¤û¨J"ùaq±t£ä˲-[ lÝ8mÜ}@²4Nï/åÃ_(h óC /ª*Ø´Ó*ºõ)ä²·¹¨?vÃ]×ïRÆ$ 6 +5j±¶0¨d«¥-ëçL ¢çö|ºì»rPýßd¨/ÕÈkÍü,Ry"ÄRÖzfu³ÑH¹õ×µJ)ml$÷xDJj*%U ·ÕSR^ÐÕ[1½vYºÓÛÖä½éiý76G +ÓÕ3Ì>л`äÅÍ¡Õ©É "Éu=vû"x:Ò9É5¦v'C¦Ãù¬¡ã2Z+K3½:yh²ýÖç]&7â¡D¯´þª#ñw^ f`J-$Üe(V¸Ã¢ô:ï÷/àÔK`8t+T'D$0Ì!`Ï{MCî WÅ<Í{`V9{òlÆE¯IXpû»»ÿͶéø!`VBÙ¹»³Ã~ûí79>¿*x2©*Ñ7[Q?üÿ{7r ic³bÎÅgK§ô})'''Ù]FqÌFr>aÓ,]¨Çºòqäi̱[°4ð)ËxºàL`ÌÇ«BÀgÓU2."è5TØùËQäzØh±ù'E`Ú(~Á³±½á.µ=»$W`¹ÅÑXãtÎf¼8;y³OÍ÷¶â½Û ³ÙYLûÔ\ÀÆ? Ñ*KX^dg_ò°è,æñ{Àöá¿?Âê?¢J?îÝD3düû=#öL=búÉË0 r"@Ç1¬`âk´/½»äñ÷43gúq9g|É;0øq(Ûîп®yIªÆûV~Æ©À§BçÈo¡Ï`øÜ&31-<X!æêWõ/b9«Ø8Jr)Ôòç^%MÜËy4ã£_顬ÏÓ'C_O¥¸^r¢?}@@ -919,36 +909,32 @@ Ô:èÌr@ÁÆaA¯/Ì CTè8IaIZ0eK â|í±MãA`F"b1ÉPøô9¬>záq²pñd.pdt!!º¾Qã(y±A7h*ð7VÂu¬Ï*à¢%y Hÿ2K°ÆQÀH& |yf×CvM£H_ó °æAXë´æC`6Aáø<-nýÇSå"À§Ù§à#69`Áó÷ ëM§÷Qw ÑÁ4ùÜüèÓþZ¸cû÷'0ìþÍò§ýzagáEÅÐ%çáCP '«å2Í@D³$Øç½þ£Ê£äLºdàymï÷_ -)¡5N~^E8ìOx0üì%uuØïööaØf´×ÄA*Lð³l¤ÉË <Ï{FîTêV|ί)-æTÖ"-ûOp@Ak»³l*U6¯§ñ9 ñÍÓX@ÄGï(bÂ׳Et t\?\1ôI 0Ñ»ûÌÒºh¤ú®3<-¾ÚÏãaYf F!EI'fL{ÄǪ÷¸ÂϧÙB 4p±ê_>5ÏÍÜ>%<³å¾",BÊX%Ðr¢9=S5¢ýZ UO(`ÒHÎ> qGݪA¼ñSOuZü#±ãË)Ö6À1*®|U¯3É`_¹HoñF9-BHsÂ×Ô@ç!àÃ-ß*e8ZmÇÑyMìÎ9Ä$ áã¡ÿ£Æx'Ç Ü¤^TÈ-lðs¦(X(ÈL¢=ÎñÕCõñ{ÌejXªÛª¥¤f;Äö¨Ùéª!ï ÔJ"X3µ«mÔùäö¹õ¶°^KúêMÂ'$E`ºÄùEy3n³Öü¶Zǰ)¼ÊëÄMGÇL(xâXUKæ¨×@¤WÖVp Fo÷¿¨B¹ø võÉ1mL¡ -è(hoz¸ 4Bß#ZºØýu!Ý×zµ.:!I@Fñû4`X,l^¸ü3ÜÐ*-d`ÛKÃH±ë*3Aëòʹ_hÂ2¥ -«V+6wÔ^OÅxådÂÒ?YUn5VQ»JB] ®A8?G`_al/sKYöR\¯´#ºj¥ÚѦ°jE;ÃÌÑJïÛ`«½õvõHú÷£¼]°cîS)EY²3d/¦l;B¶DµqÍϯ_þÅè@yNYÚ1H\eVX(*D©µú -A>YæYJÀÝ`¯~Whí¬ë/®ê¾mU-yÎyqÒ~FîÍ×'¼¬¨0¡]ÊïÕ#Þ¥Ú[ø;n -RÎ^æ¶åÎ.Õ-\á98wXãJé%'Gt&VÌá:¹i΢s::)4ß´"À¯ëùJò):))Û'Ç- a6(>µ²`{÷!+É¡qüEïmª,¡Iõ -§j8QÖcX¡· uÈÛ"Î -±hÃ%£Î¢âGG®Æ*¶O}¹«1Uì:G®ÆtÂÑ8v6:«ÖxéjLºÒ9w5¶ÕøÊÝ£Ç:d£mÙxZê\¾¢<)±À}»)<éød5rL U*=ÅÌôØ®ÀÊ©ë`Ê.]ú6brõ0Êô¤o I2k?(é©qÑeCÌ -~Ö%àX9]Ë6ä6@s¦úhl´7 ®òº&ë5ï¸S½³OV¢Wý-`ÉC*gþJÞJèù{ì¨Êð1qëWÔ{¯5ð÷ûÝFði¸µ¿þùõqÿQ+x«¤ÄÁY¤-DUË}¤¶ d·ªVr.+b«^ôvot,Ró&òÌCXÙÙ´ëS\þ-wá7àa«TE:ÃÚÔ¿ -Y§;¹c2e÷ßòñ*ËA2~T¬ªØE¡õ¨¥£j_öf¶FÈ\·àWA5 ©ur«6¶ZÅ&ðN¹PÃh-x8í¥Q&|*^Ò÷@]cÞvv0ÿÏf¥Ú¥y{²]4 µÆ4-Â_W9àím ¶Îô?·¿ÏÒÔÈJVê` -SNùU¶ic£WP:żI vw "õê¡R!êp¾5Ü¥¥JMQ¥Q6aWYÓ1!º¶T+¶ÝÛ¦ÞJmC9Ý´>[ÞÚ -KÅÙÕÇ꺮`(·Í¿jS}uþ©é.ARøØQ8m(}¾YѼYs6ò0ª]{à£êZ -»LYÅ#O>òv<*/+øÆWP#Ô6?n¸j¸Æé*)ÄcÌïµþ9!rÇë^»q^òÉÐq"Ú[¡'çÿîZW¸®b*AÑ¥eù¥µ]cÆ -»ÌMOÌ«®°ºÜ hoGYI|Ô¯¬2¢é®lhZob¸t6®t7[HØÝ6>(0ð4GtÅ>Hi4×ôì¡lá<.õFXßò-Õxm·[+q²cLbÕsU¨´å-©CjET× _ÂÒ'äE<[DÏÅO!Þ/O¸ïî2ëçy0¥õ^qêµt'¹¯Læ òqH²¸·EÏÊKظ2H$x¦äÊíLýl¯R¢%*´J¡ a)R±µÀtvH=Z®rW*Û`ê·ò©ú§Ë,*p㬽þUu vÃA}Æ&¯TUÛo׿·ÊÅ9nW×h¬Yy\ É}M~§KT\CÒ鿲ápHÓªº.]vHÏ×pr|É GÙ²ÿ#ýJW±Ð -&ËtÖÉß'¸~J»+pò¹·D®+7wlÝÔ =?ðm÷^ÞD'u1^<âöTMM £ßµz=B»¿ÚL£º·zl;«7qã î¤õÔU°$â>E²±±Ï[Uuí6·;lZèJÐvEí:VZrGÝ[,*¯ÊfåæµÈ®£NB0dLäT¹©¬®D²Å°AfëSa^gÆ*%_xõòNvVQê&a©§nO3Ö;uÚeÌ5 ÿÉÝñ³(vÝ"Aüûÿ£º_樮±7g+ -§Ñ,ùR¬ÄJ]e£ZºmÚÕMUù¥ÓÆ.í§êvºhÊu6/UyO6:¶¢&µëiÆâþ/\oÕYþk+ðýÈPýt+EÖ>æECAUü`3my2¹/ÌY_Õ`ÁÄ«09R²neâäµ`æ|c÷Cÿ¼~¹(·$5T+ê9ù®4ñ*E://@=|àÛ¢o2hÄÚ¬YãBeíK1çNT5énRGÏyA-ÏäwvxÁæê¾ªa}44ÞÐN³MFÌKÖNÃö;QξN¹µ éòÌ.z~Ã\]7:EÕ¥é4ÐMÖ^+Y}íó¢²¥C£KfZôSèò¯Mb«¹újÖ ¯·é+Â8µÆÂövUVÉ»¨,3?WÝ%WÊÂ_ÑÒ&fklýi0IíMð¢Ì${I>Áë)OæuÃIF½*SªºÒl¥Xêõô!®;9Úyg¢z¬³®ßtKJo X×ÙM¡Ò7Ð3Ê)kZ!Ü~~j¶3¯t5ÚéruGÚ£¶«»k"5°W)ìñä-q7+ ´¡Í¦1@`®o¬ ~ {CvdU´óâ/¦ Âsø¿ØE¯Y¯8"bMÔs±Ò*ºE¶¼Õ¥Äe¯]U·ÉY]]óóW·¡°k÷¥sëÄ£Ó_IÆr0ö:«z/án3rÐ- Z-Ï]-ìo=éCuǺN^(®z¡`¡ÔøïYØJãªË,»ÎÊÅ\ßyõ«Rk+¿xAé Ý`"_uõ[YD-z&¡|¼nS« ÿ¡ââùZЯûîLÓ»[òµZ ¡-!ÜÉUÃ:ݺ²ºËѪX¾õ-çÖ¿ÄÑên:Ä¡À5!¯S¦9ï̦ªûþªñ'@-lð¢ÚlX9¯9müÝ&ß-Þª»ÕP×¹£ùVÖg«g¼»®Ã×¾óÕÝZ_,'¥ -éæy[æ ¯½Òå¨fëû$ÐS¿K=½.¬ë_ß+ñ¹ XQznUÚ¶ßgç-à Ì-t/: xü?ï*4ÊÍ¡$²`o× >Ã0ñÆ'-IÑ\À-ñ0ùÒjR_Oq4 -$¶t¢Ct/d|µ\¦xizY½Û´ý{U¨Rè8²)¼2¯Ü¹³u.î·ÛÅ/ZÃ+îA.ô{ÿÝT4!ôy ÷y`~ÿ< gPÁ7"âQ Y_þ -\>ÂÌ/àô*Iè«×yF»#]ûßloýã~Îû&Ó&æ|¶g äj:àó]ùáñáÝÿAO@ Ï쯣6±T/4ÖÚ4ö)°qYÈì.jÿÝjj iË ÌûÞ¼}K¸×ET<(Àc¦A] OµMzEÛ«PÃZÄ^ز¦ÎíE¾¨` OqN;¢'çf6» «þ%zºmXVe69VqmÛþËúôdS×oN -ÝÐ_×÷Ön:Öv^]ÖJ²½®ì©Ú±\Og}·ã¥öá^) ²ÛÐ'F_±jUtÇBN~£s>0]\ªHXÄ$ £;}«CÿÂhtçx>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôݲÐ&¸3ï9°ÓVäQ~&ò}o|Ø!7@ç?Ù¾\ No newline at end of file +nýÇSå"À§Ù§à#69`Áó÷ ëM§÷Qw ÑÁ4ùÜüèÓþZ¸cû÷'0ìþÍò§ýzagáEÅÐ%çáCP '«å2Í@D³$Øç½þ#« +¾tp>Øöþwÿ¥2üì7L&Ã^ßííë^ø¹½×ÏK¼½ÔGàJç=WÐo[çüqtïK±\«;¸¦Qr&f Í&¡jëzÇ\yeI@i^ò¬'ÃÅ¡OÕEýì\JêÂ=¹2ÃÕÌÆÓYùVøÿaµBÞ£>}Ã2þUÖ.S#×PúìÞÁU²f±e°Ý1¶;Vz"ÅËaÿùÏ=MSIôé>jlt(Ø$z$ÿ"¨O23EÀÖËåIþ+øov6ïD¤Ìð1ÓÏ|Þ¯.aCåÖ8X;òCððIn.Øw.O%äæá5à4>g2#¾yøèe[Lø:?·®0_ë+O&z×`¥Ù@Ú0TÿÀAç¦fkʰ¢;!hй§ç<P3ò%qix³ý6|yÒSýúìà@Yoá1«)d°¾Âdöú©¬*¥I6ÞµxðóqD«/r5(!'b´¿³ gÏMxù§Ä5ÐÂ@£+뵤O¡Þ$|rÐ@R4+Ú°zÄÂ[¢ |ÇMAÊÙËܶÜd¥Jcñ+w/à CGÊÝcU?j#ÙØP»@ãÛ°}Úò ~wÏö¥örOÚû[ngú¢ÏVóZPA*zµÁ°=GÚ¸\ëèqfG{£ùm×Fß½b§ÊkÝC!TCÅ÷ü|aO +ÛaĤ~êâѸÞÞ£ÅÚ´<[iãZÌ;&þ÷-~j +áuoÐ ¹ÿ=,B6[í¨ÆVùÇÔÊÐ)Ïrd_1°²Á禧UùG 3ߢqy¯/÷úPÈn²Ëª´Ó`«´x´ÒiÝvU¼ÎûÏνxy|v6vT ^pcÜÇ¿^<CPcnâîL½ì|«O;5×¶æ7#s²q'ýmEêdR7iky2qYZòºÕ³nZ·ÛÙ6«;àÍ"nè+Å)¨®¾Ô:êêÔ¦ó9È,¾ÀyW:ÔwÐÂ1£<Ñ}TðiûLÙ¶lqG+#(o=[%mÄ2ûé9øG{3ò ˲ÚÑÊmÏsv|%Êhá98wXIKé%'Gt&VÌá:j΢s::l)4ß´"À¯ëùJò):))Û'Ç- a6(>µ²`{÷!+É¡qüEïmÑÙФzP S5¨2¬ÐÛÂjçíCg XRáQgQñ£ÌÆ#WcMÛ§>ÈÌÆÜÕê#Wc:²áh;Uk¼t5&]é»GÉ @Ûj|ånÑc²Ñ¶lL<-u._QXà¾Ý§|²N9&*bfzlW`åÔõF0eZ¿®J[irõ0Êô¤o I2k?(é©qÑeCÌ +~Ö%àX9]Ë6ä6@s¦úhl´7 ®òº&ë5ï¸S½³OV¢Wý-`ÉC*gþJÞJèù{ì¨Êð1qëWT¯5ð÷ûÝFði¸µ¿þùõqÿQ+x«FÄÁY/DUè~¤¶ d·ªVr.+b«^ôvotøRó&òdEXÙÙ´ëS\þ+Õb¦1"Iýu.JÊÑ3ÌðÏa©Cq +ä¦k&VxÑnêtÐÉ>=AýÆWeÕn¤ä +Q¤/¬îÂoÀ!>ÃV©tµ©²NwrÆdÊî¿åãUdü¨XU±BëQKGÕ¾ìÍl+.¹nÁ®j0,ARëäVmlµMàr¡Ñ+Y±jc°Lá-ã7a1ïQþZX¿7×õ6sàFÐNV#Wôú1¼Á(;¯QÜkq,y"²6yAu²0, ä/SËQ¡Ëv e¨Ôh®èk¨ï0h¶tñ[/cê ¾É jý£ÕO¨~âí2ú:Ð|t=;<w¨øúv@K¶ Ϲq}me¾)âá´DFð©xIßuÍRy/ØÙÁLþO<7jzbäímvÈvÑÔgÐ$:+6´±ºðBaA®²rGøäùûÞ0<C?yÿâÍ~ÇѽA³¤ë¥h$`Îpm½w«jûªn ßZ +oÍvåeXgTµ5d#.Àû Ê-ZÓ¦å^èÚ²ØÓÕ®Ni|j¢8zT»×^pí}mÚÃ×p¶ì2ÚS¼>-0"^2g%Êê@*³Ð+È^ªFÞZ¶_q+·F1O\ºWJ@ºÍ-$ìnEALx#ºb¤4kúGöP¶pz#¬oùj¼¶Û8Y1¦1ê¹*TÚòÔÍ!µ"ªë/aéõò¢-"JÇçâ§ï'ÜwwDõó<ÒÏz¯À8õZM:ÉCÂÜW&óùÉ8$YÜÛÖ¢gå%lMDÜJ$<Sråv¦~¶W)ÑZ¥PÐ0Í©XZ`C:;¤Î-W¹«ImJ0}§ÖÃMâË,*p㬽þUu vÃA}Æ&/nUÛo׿·ÊÅ9nW×h¬Yy\ É}M~§KT\CÒ鿲ápHÓªº.]vHÏ×pr|É GÙ²ÿ#ýJW±Ð +&ËtÖÉß'¸~J»+pò¹·D®+7wlÝÔ =?ðm÷^ÞD'u1^oâöTMM £ßµz=B»¿ÚL£º·zl;«7qã î¤×ÕU°$â5AE²±±Ï[Uuí6·;lZèJÐvEí:VZrGÝ[,*¯ÊfåæµÈ®£NB0dLäT¹©¬®D²Å°AfëSa^gÆ*%_xõòæwVQê&a©§nO3Ö{ÚeÌ5 ÿÉÝñ³(vÝ"Aüûÿ£º_樮±7g+ +§Ñ,ùR¬ÄJ]e£ZºmÚÕMUù¥ÓÆ.í§êvºhÊu6/UyO6:¶¢&µëiÆâþ/\oÕYþk+ðýÈPýt+EÖ>æECAUü`3my2¹/ÌY_Õ`ÁÄ09R²neâäµ`æ|c÷Cÿ¼~¹(·$5T+ê9ùF6ñÂE://@=|àëÛ¢o2hÄÚ¬YãBeíK1çNT5énRGÏyA-ÏäwvxÁæê¾ªa}44ÞÐN³MFÌKÖNÃö;QξN¹µ éòÌ.z~Ã\]7:EÕ¥é4ÐMÖ^+Y}íó¢²¥C£KfZôSèò¯Mb«¹újÖ ¯·é+Â8µÆÂövUVÉ»¨,3?WÝ%WÊÂ_ÑÒ&fklýi0IíMð¢Ì${I>Áë)OæuÃIF½*SªºÒl¥Xêõô!®;9Úyg¢z¬³®ßtKJo X×ÙM¡Ò7Ð3Ê)kZ!Ü~~j¶3¯t5ÚéruGÚ£¶«»k"5°W)ìñä+(mh³i$ë%+_¡ÇÞ!Yí¼ø ¥é"¨ðþ/vâk âä+¢È¡fõÜE¬´n-ou)±eàkWÕmrVW×üüÕm(ìæÄÚã}$'aéÜ:ñèôW±Ü+ í?K7þ"T<úK¾ Ù2ñI(¯Á¥ÛÔãjáh§¸øF¾ôë¾;ÓÆô.gë|VB(gËAwrÕð¡N·®l£îr´*o=G˹¥õ/q´ºq(pMÇGÈâë©fÎ;³©ªÅ¾¿jü a¼¨6VNäkN@ÿF·ÉwD·ên`5Bâuîh¾¦õÙêï®ëðu£¦ï|5C7§ÖæËI©BºyÞ¤yÂkïtù$ªÙú> ôÔïç@O¯K"ëú×÷J|nV[¥¶í÷Ùy'@eüYQ .}.y +S+:ñ²¹Ó,ï²=ËïË,nÇP»â)3vA%S¨ÿîû +7u4Ô¬ðEut(Cýc]:,²«AGì"ÎAî¤ÿ×¶Úø×QÓ¤LÓæMmÔºýP¤q/ èÀØtA#aä5¶#~Ré7@¿ö<DR±õkÎ4×2!f° +ç²Ç ÖÞKd^éñjÖà͹ ÖXþ#{ùÿþV|í ¾±_ö¼¦u_V}ªÍZou,ä!CU¬´Æ62vkL^ãñäºÜ$ö{æy$/UÆaX¦6±ïNâZN/Z_X7ë&Y»GáMTö[±ëm@îâ.] XMl·ÑÎ9®a»[]ù&Sé=éÊ +Tzl&¯+»ì}│+XÑÿ4 ÇTZëâ +ï¹ïõgÛtƪ\ñÍFy«;«ëìJ£øÿ3ñã#o/»ÙÖ¼lpC4ƾ»-WÎ_é¦ú¯ògó× óWùc½vÁó÷ÁÁ!¾éÉû}üd.¦: Ôå¦ :>Ò\E#¢ñàA|Ä&Ðzû0ÊLÎãGc'¤+ à®<íÖ[ðíígRó4và +ɵnÄ-ÓÁµÁ®rQÅ0ÍÍÁmÓn /Á7*¦½àáfß|7á¾x+-xì[¶·»Ûg;êÉCú^AñÃö,NGt,¦§Â0³@¹:`áY¬7æ®ÖGÝÂS¯®wE£þlä=ÝGkJ5VnyËÿ±â9&gDF¦ºùâº^©êÊeeÐjûZ²ÒuÁR\5ÆÉP4ô¨Ú/çÑxN×à5%ýáUOZãKâæ×HÌV4²à!Þ#/çaÑrd÷-±mVEß{ åël´nh\ð,w\mÇ6}pC¢¶fÄAïúÉÏ(K *ÚÂEÆLÂÝ$ðQÍ +"©æ#$ðõ#Õêû ÿ# ×ïÆÛð&ø?O°Ådô*±Ò-EÛÊÍwîàmÕjÑUËùR5Pè ´\M·ü"¯`&üÓp¸Ï¶Ý(ÿÏ»J'òcs(,Øà5¨Ïð"b¼ñ ÝQÞ¼¨@Â>ÑK|Uãm¼mR¹&!§NxÝ·hö®¡BR´°cK<b¾ôÔWæS- èÐÝÙ%_-)^^V¯ç6mÿF@ÕªTA'zì§ãB +ïæÌÀ+wîlûívñÖð{PÇýÞç¿a7ÕM}hå}Þ'á¿èY+TF0åøBhÖ¿£pó8½Jg úêuB§ÑîHWçþ7Û[¿á¸sƾÉÁt9íà`¹ø|W~x|x÷AO@ Ï쯣6±T/4ÖÚ4ö)°qYÈì.jÿÝjj iË ÌûÞ¼}K¸×ET<(Àc¦A] OµMzEÛ«PÃZÄ^ز¦ÎíE¾¨` OqN;¢'çf6» «þ%zºmXVe69VqmÛþËúôdS×oN +ÝÐ_×÷Ön:Öv^]ÖJ²½®ì©Ú±\Og}·ã¥öá^) ²ÛÐ'F_±jUtÇBN~£s>0]\ªHXÄ$ £;}«CÿÂhtçx>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôݲÐ&¸3ï9°ÓVäQ~&ò}o|Ø!7@ç?d\ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.2&r2=1.49.2.3&diff_format=u Index: php-src/ext/phar/phar/pharcommand.inc diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.2 php-src/ext/phar/phar/pharcommand.inc:1.49.2.3 --- php-src/ext/phar/phar/pharcommand.inc:1.49.2.2 Sat May 31 16:40:55 2008 +++ php-src/ext/phar/phar/pharcommand.inc Sun Jun 1 07:39:06 2008 @@ -150,12 +150,14 @@ } $hash_avail = Phar::getSupportedSignatures(); - if (in_array('SHA-256', $hash_avail)) { - $phar_args['h']['select']['sha256'] = 'SHA256'; - } - - if (in_array('SHA-512', Phar::getSupportedSignatures())) { - $phar_args['h']['select']['sha512'] = 'SHA512'; + $hash_optional = array('SHA-256' => 'SHA256', + 'SHA-512' => 'SHA512', + 'OpenSSL' => 'OpenSSL'); + foreach($hash_optional as $key => $name) + { + if (in_array($key, $hash_avail)) { + $phar_args['h']['select'][strtolower($name)] = $name; + } } $args = array(); @@ -1470,7 +1472,7 @@ $use_ext = extension_loaded('phar'); $version = array( 'PHP Version' => phpversion(), - 'phar.phar version' => '$Revision: 1.49.2.2 $', + 'phar.phar version' => '$Revision: 1.49.2.3 $', 'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available', 'Phar API version' => Phar::apiVersion(), 'Phar-based phar archives' => true,
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.2&r2=1.7.2.3&diff_format=u Index: php-src/ext/phar/phar.phar diff -u php-src/ext/phar/phar.phar:1.7.2.2 php-src/ext/phar/phar.phar:1.7.2.3 --- php-src/ext/phar/phar.phar:1.7.2.2 Sat May 31 18:40:05 2008 +++ php-src/ext/phar/phar.phar Sun Jun 1 07:39:06 2008 @@ -890,26 +890,16 @@ new PharCommand($argc, $argv); __HALT_COMPILER(); ?> -6--$m¤A ©¥ÄEê¤íÀõïÌ>È]î{Æ-¼#"ø'¯ÉåHc_b;e,cþଲõ6¾£é;~%ÃGäxy±z";¾¤'B"Ó8Ïiákò,¹¨ËÙjµôXz«Q'ýßÒ¯ivVLxðlõä=¡B'5è´¦ÈÝ lvHPÛÍI².sÊÖèG¾p-2&ÝhoL¬1 5í=8»° §¹z¿Ã(ãÁÖ׬êÞp·Æ+P#Ï7ñ\ -Î@BÓz×÷\ï¾#ºPË5ÝÒ!@V&nZ.ÙbÞ.þ2üê½Ôl,1~"#{ZP^ Y¤ùüt×5_N/´Äo(á.H¼ªDú R§ë(DêàÁ¹òDúXsG]WÊ^OªQ©LiìÙ -³íTß-£ÁWÅüfk®sÏqô~ÖýO3 -øñt-iå¾eÞË8Ñý9ÿXÂL¹¯m/¥üîÕMa¹Ò¢ÆÙYKÐpcºMZ»Æ Q<(c¼Læ/Q.ît?#A.ÃçbBµù±¸¹/ª[¤2GZçO¥wn÷Z[A¥¦éÊaµ¸1AöY:zþ1WKnF#¢Û¸Õ¦6Ëh¥ÂÈò¢üëN-)I¼9Õa]~¦| >ÜçÛf±Xÿéó?ÿõñ# ENl\FÀéC\@u»¡XdH»Ð ïk¨ñ ;ýz¿I´¢vDê²Êço:õéY¼ÕMG ð÷+`+®3Z,=Æj6®q]¡möÄj_*éWôò³ÃfPÔ*o¯¹_·K¼éá=?0ÅUc·¹¥ÙÀ¦ô|¤QB9½·Ó¯°ëÀ 6òl zQE(6Y-bL.@¦×NÏ ®h#*N>,°¨u¿ -ÉÆ09Sâ"º³YK6¢HÅ,ròðæ=üø[v*Ò[3zH8j°iµøX¬¶Ðä)4½r¡is1² n\áQ !Xr«$ݸ8 -C_þÇ»65Ð,QìüZE@×× ×WçBñ2óتÚCõ¦Üu'Ob:ôê0k'Øx_ÑôBq¼{xá?fQwd×Zÿe -ØÐÂ`ØÃÚ ëÛ,KTä#üÿ~kaÅGàè{i@´I4sz¹?9cçâÖ$N'ÙyAn) Rè²icìpbɤH*î^µ5+»Î-^ç°Ði®e Á¡ùç5-¨ÎHRZxÐË¿³8õ?´-ûÍ -ͱECbJ_æ\ii¯¢£Åx?¹dÆ -ëÓ!ù ~N£ÌoTfñ²é#¨çªG[ï×LÛá§á.#.øD«.Ì#ÅküÙê´Ðï"8ûbæTSí>m©¡*j*Lu*ð({ÔÒà?^4Ù>R3aæJbî<É-×N|!Ó|m]lD|>\úÃd&"ýç -5¨UiPøÁÄÌȹ¿ïáﯽT®$äò¿%%?&üÔ¯r,°Ø~ÉÁgèíøècðwôà gH]ßzÐßáAð>c{@÷å,òùÁrzìy÷ÁÿÃßÈ}1ºáKççd§ñ¾Ü8@[é¯8QÙÞ]âVk`1ÑDÝ -x<eK\ÄA+fhnåûuF÷Anð6Ï×1ÁÿSv3A5NëÝD/©[{¥ZW;Úá¨_Ïh&î]ØF¨R6ò#WÞÁ@øT#Ù(GÆäÎaÔU|©1ÂÙ5û)V§&ÇnÜøÂ§eã¨}"fnòFfÀguºpQ¾)tÓé´(öR»ö0¢ÒX8apîµl·nÏÀ¾Seíeù¡.'¥°ÙZ©Èè°L²ò¢6yÛª² -fej¯ôê<Á[û&BîÙ¡àȧÖÎY'±>+ݪæÕ£m i¤+®§ÃRòi+ÐÛíh`pqxËå,uðÉð1Érx<æDGjò]qϸr{2W[¢GTUWì8:¨Hʽ|¸«¾¸þ»( |LÒúõaRJV7)£×²4V]IZN#<ôm21_xAúÍóKù»;1A Muñ-yZVMjzm ªJnÛhà÷gÍß¶)L6-0êCÏ7w<43C-¾DCÎMXqDtñ¼Æ{@&hí¾ßa Á]'Ámý£Ó¼Ñm·æe7ö®*Ãç9ÎÚ³Bª:ê¨Á9vêÕª!-ШOf¦£? ?.Nþ+6++>ç°ÍÀ-}±HаE+sdDqùT{çºð^ça3©i2#¤tX#n© û$=ýknF#¢Û¸å¦6Ë¥ÂÈòªüN)i¼Ëê *?¾BBîĦ^l{%YèúüÏ>~¤ÓMʨ8ûePÝ®#Rî´¢èûj|áN¿Úo-©ºòùÛ¾J}fVoyÓQ¦a!¼Àý°×9Ërc5׸ªPÆ.{jµ¯ÕôKDfùÙa3(ê?å·?ÃWáWílzdÄ÷ Ñײ1ùp4KbòÃÓÝ,¤÷qú%v8ÆFC-EÒl0ÊÅÏæÀó{=!ô-#¦vÕ|pÏkM!øØÙ<H1& S,ëËNÏ .i#*I>°¨u¿¥Vgcâ"ºÓiK6¢HÉ,Hòðæ<üø[v¤3¾âlS8j°iµøX¶Ð)4½¥BiÚ\\¡Û/ð .$ÅenDRC_þÇWsmj¡Y Ùù+´Z¯¯A¯¯Îâÿdæ?q?´3MyÓy¬<µìÐËÃl`/£|EÓ+ÅÉ~pìAâ ÿ5FÝÝhý)`Ã` +a#Å&+¼®ÁB/£d¥+ -?¯+V+îø¡¬¡¡`ÏY1ê¤ Ã© 7+}S&¤Ò$Ò^GÊ~%j+¬Oûøg+,lÐ×6±+Óü¤>Üp8ãyÒÌêkvmþ¸ã~ÛÚd»ºÌ²K}\äNïбFbÞö^]½F²-MdÛhýÌcò¤û¨J"ùaq±t£ä˲-[ lÝ8mÜ}@²4Nï/åÃ_(h óC /ª*Ø´Ó*ºõ)ä²·¹¨?vÃ]×ïRÆ$ 6 +5j±¶0¨d«¥-ëçL ¢çö|ºì»rPýßd¨/ÕÈkÍü,Ry"ÄRÖzfu³ÑH¹õ×µJ)ml$÷xDJj*%U ·ÕSR^ÐÕ[1½vYºÓÛÖä½éiý76G +ÓÕ3Ì>л`äÅÍ¡Õ©É "Éu=vû"x:Ò9É5¦v'C¦Ãù¬¡ã2Z+K3½:yh²ýÖç]&7â¡D¯´þª#ñw^ f`J-$Üe(V¸Ã¢ô:ï÷/àÔK`8t+T'D$0Ì!`Ï{MCî WÅ<Í{`V9{òlÆE¯IXpû»»ÿͶéø!`VBÙ¹»³Ã~ûí79>¿*x2©*Ñ7[Q?üÿ{7r ic³bÎÅgK§ô})'''Ù]FqÌFr>aÓ,]¨Çºòqäi̱[°4ð)ËxºàL`ÌÇ«BÀgÓU2."è5TØùËQäzØh±ù'E`Ú(~Á³±½á.µ=»$W`¹ÅÑXãtÎf¼8;y³OÍ÷¶â½Û ³ÙYLûÔ\ÀÆ? Ñ*KX^dg_ò°è,æñ{Àöá¿?Âê?¢J?îÝD3düû=#öL=búÉË0 r"@Ç1¬`âk´/½»äñ÷43gúq9g|É;0øq(Ûîп®yIªÆûV~Æ©À§BçÈo¡Ï`øÜ&31-<X!æêWõ/b9«Ø8Jr)Ôòç^%MÜËy4ã£_顬ÏÓ'C_O¥¸^r¢?}@@ -919,36 +909,32 @@ Ô:èÌr@ÁÆaA¯/Ì CTè8IaIZ0eK â|í±MãA`F"b1ÉPøô9¬>záq²pñd.pdt!!º¾Qã(y±A7h*ð7VÂu¬Ï*à¢%y Hÿ2K°ÆQÀH& |yf×CvM£H_ó °æAXë´æC`6Aáø<-nýÇSå"À§Ù§à#69`Áó÷ ëM§÷Qw ÑÁ4ùÜüèÓþZ¸cû÷'0ìþÍò§ýzagáEÅÐ%çáCP '«å2Í@D³$Øç½þ£Ê£äLºdàymï÷_ -)¡5N~^E8ìOx0üì%uuØïööaØf´×ÄA*Lð³l¤ÉË <Ï{FîTêV|ί)-æTÖ"-ûOp@Ak»³l*U6¯§ñ9 ñÍÓX@ÄGï(bÂ׳Et t\?\1ôI 0Ñ»ûÌÒºh¤ú®3<-¾ÚÏãaYf F!EI'fL{ÄǪ÷¸ÂϧÙB 4p±ê_>5ÏÍÜ>%<³å¾",BÊX%Ðr¢9=S5¢ýZ UO(`ÒHÎ> qGݪA¼ñSOuZü#±ãË)Ö6À1*®|U¯3É`_¹HoñF9-BHsÂ×Ô@ç!àÃ-ß*e8ZmÇÑyMìÎ9Ä$ áã¡ÿ£Æx'Ç Ü¤^TÈ-lðs¦(X(ÈL¢=ÎñÕCõñ{ÌejXªÛª¥¤f;Äö¨Ùéª!ï ÔJ"X3µ«mÔùäö¹õ¶°^KúêMÂ'$E`ºÄùEy3n³Öü¶Zǰ)¼ÊëÄMGÇL(xâXUKæ¨×@¤WÖVp Fo÷¿¨B¹ø võÉ1mL¡ -è(hoz¸ 4Bß#ZºØýu!Ý×zµ.:!I@Fñû4`X,l^¸ü3ÜÐ*-d`ÛKÃH±ë*3Aëòʹ_hÂ2¥ -«V+6wÔ^OÅxådÂÒ?YUn5VQ»JB] ®A8?G`_al/sKYöR\¯´#ºj¥ÚѦ°jE;ÃÌÑJïÛ`«½õvõHú÷£¼]°cîS)EY²3d/¦l;B¶DµqÍϯ_þÅè@yNYÚ1H\eVX(*D©µú -A>YæYJÀÝ`¯~Whí¬ë/®ê¾mU-yÎyqÒ~FîÍ×'¼¬¨0¡]ÊïÕ#Þ¥Ú[ø;n -RÎ^æ¶åÎ.Õ-\á98wXãJé%'Gt&VÌá:¹i΢s::)4ß´"À¯ëùJò):))Û'Ç- a6(>µ²`{÷!+É¡qüEïmª,¡Iõ -§j8QÖcX¡· uÈÛ"Î -±hÃ%£Î¢âGG®Æ*¶O}¹«1Uì:G®ÆtÂÑ8v6:«ÖxéjLºÒ9w5¶ÕøÊÝ£Ç:d£mÙxZê\¾¢<)±À}»)<éød5rL U*=ÅÌôØ®ÀÊ©ë`Ê.]ú6brõ0Êô¤o I2k?(é©qÑeCÌ -~Ö%àX9]Ë6ä6@s¦úhl´7 ®òº&ë5ï¸S½³OV¢Wý-`ÉC*gþJÞJèù{ì¨Êð1qëWÔ{¯5ð÷ûÝFði¸µ¿þùõqÿQ+x«¤ÄÁY¤-DUË}¤¶ d·ªVr.+b«^ôvot,Ró&òÌCXÙÙ´ëS\þ-wá7àa«TE:ÃÚÔ¿ -Y§;¹c2e÷ßòñ*ËA2~T¬ªØE¡õ¨¥£j_öf¶FÈ\·àWA5 ©ur«6¶ZÅ&ðN¹PÃh-x8í¥Q&|*^Ò÷@]cÞvv0ÿÏf¥Ú¥y{²]4 µÆ4-Â_W9àím ¶Îô?·¿ÏÒÔÈJVê` -SNùU¶ic£WP:żI vw "õê¡R!êp¾5Ü¥¥JMQ¥Q6aWYÓ1!º¶T+¶ÝÛ¦ÞJmC9Ý´>[ÞÚ -KÅÙÕÇ꺮`(·Í¿jS}uþ©é.ARøØQ8m(}¾YѼYs6ò0ª]{à£êZ -»LYÅ#O>òv<*/+øÆWP#Ô6?n¸j¸Æé*)ÄcÌïµþ9!rÇë^»q^òÉÐq"Ú[¡'çÿîZW¸®b*AÑ¥eù¥µ]cÆ -»ÌMOÌ«®°ºÜ hoGYI|Ô¯¬2¢é®lhZob¸t6®t7[HØÝ6>(0ð4GtÅ>Hi4×ôì¡lá<.õFXßò-Õxm·[+q²cLbÕsU¨´å-©CjET× _ÂÒ'äE<[DÏÅO!Þ/O¸ïî2ëçy0¥õ^qêµt'¹¯Læ òqH²¸·EÏÊKظ2H$x¦äÊíLýl¯R¢%*´J¡ a)R±µÀtvH=Z®rW*Û`ê·ò©ú§Ë,*p㬽þUu vÃA}Æ&¯TUÛo׿·ÊÅ9nW×h¬Yy\ É}M~§KT\CÒ鿲ápHÓªº.]vHÏ×pr|É GÙ²ÿ#ýJW±Ð -&ËtÖÉß'¸~J»+pò¹·D®+7wlÝÔ =?ðm÷^ÞD'u1^<âöTMM £ßµz=B»¿ÚL£º·zl;«7qã î¤õÔU°$â>E²±±Ï[Uuí6·;lZèJÐvEí:VZrGÝ[,*¯ÊfåæµÈ®£NB0dLäT¹©¬®D²Å°AfëSa^gÆ*%_xõòNvVQê&a©§nO3Ö;uÚeÌ5 ÿÉÝñ³(vÝ"Aüûÿ£º_樮±7g+ -§Ñ,ùR¬ÄJ]e£ZºmÚÕMUù¥ÓÆ.í§êvºhÊu6/UyO6:¶¢&µëiÆâþ/\oÕYþk+ðýÈPýt+EÖ>æECAUü`3my2¹/ÌY_Õ`ÁÄ«09R²neâäµ`æ|c÷Cÿ¼~¹(·$5T+ê9ù®4ñ*E://@=|àÛ¢o2hÄÚ¬YãBeíK1çNT5énRGÏyA-ÏäwvxÁæê¾ªa}44ÞÐN³MFÌKÖNÃö;QξN¹µ éòÌ.z~Ã\]7:EÕ¥é4ÐMÖ^+Y}íó¢²¥C£KfZôSèò¯Mb«¹újÖ ¯·é+Â8µÆÂövUVÉ»¨,3?WÝ%WÊÂ_ÑÒ&fklýi0IíMð¢Ì${I>Áë)OæuÃIF½*SªºÒl¥Xêõô!®;9Úyg¢z¬³®ßtKJo X×ÙM¡Ò7Ð3Ê)kZ!Ü~~j¶3¯t5ÚéruGÚ£¶«»k"5°W)ìñä-q7+ ´¡Í¦1@`®o¬ ~ {CvdU´óâ/¦ Âsø¿ØE¯Y¯8"bMÔs±Ò*ºE¶¼Õ¥Äe¯]U·ÉY]]óóW·¡°k÷¥sëÄ£Ó_IÆr0ö:«z/án3rÐ- Z-Ï]-ìo=éCuǺN^(®z¡`¡ÔøïYØJãªË,»ÎÊÅ\ßyõ«Rk+¿xAé Ý`"_uõ[YD-z&¡|¼nS« ÿ¡ââùZЯûîLÓ»[òµZ ¡-!ÜÉUÃ:ݺ²ºËѪX¾õ-çÖ¿ÄÑên:Ä¡À5!¯S¦9ï̦ªûþªñ'@-lð¢ÚlX9¯9müÝ&ß-Þª»ÕP×¹£ùVÖg«g¼»®Ã×¾óÕÝZ_,'¥ -éæy[æ ¯½Òå¨fëû$ÐS¿K=½.¬ë_ß+ñ¹ XQznUÚ¶ßgç-à Ì-t/: xü?ï*4ÊÍ¡$²`o× >Ã0ñÆ'-IÑ\À-ñ0ùÒjR_Oq4 -$¶t¢Ct/d|µ\¦xizY½Û´ý{U¨Rè8²)¼2¯Ü¹³u.î·ÛÅ/ZÃ+îA.ô{ÿÝT4!ôy ÷y`~ÿ< gPÁ7"âQ Y_þ -\>ÂÌ/àô*Iè«×yF»#]ûßloýã~Îû&Ó&æ|¶g äj:àó]ùáñáÝÿAO@ Ï쯣6±T/4ÖÚ4ö)°qYÈì.jÿÝjj iË ÌûÞ¼}K¸×ET<(Àc¦A] OµMzEÛ«PÃZÄ^ز¦ÎíE¾¨` OqN;¢'çf6» «þ%zºmXVe69VqmÛþËúôdS×oN -ÝÐ_×÷Ön:Öv^]ÖJ²½®ì©Ú±\Og}·ã¥öá^) ²ÛÐ'F_±jUtÇBN~£s>0]\ªHXÄ$ £;}«CÿÂhtçx>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôݲÐ&¸3ï9°ÓVäQ~&ò}o|Ø!7@ç?Ù¾\ No newline at end of file +nýÇSå"À§Ù§à#69`Áó÷ ëM§÷Qw ÑÁ4ùÜüèÓþZ¸cû÷'0ìþÍò§ýzagáEÅÐ%çáCP '«å2Í@D³$Øç½þ#« +¾tp>Øöþwÿ¥2üì7L&Ã^ßííë^ø¹½×ÏK¼½ÔGàJç=WÐo[çüqtïK±\«;¸¦Qr&f Í&¡jëzÇ\yeI@i^ò¬'ÃÅ¡OÕEýì\JêÂ=¹2ÃÕÌÆÓYùVøÿaµBÞ£>}Ã2þUÖ.S#×PúìÞÁU²f±e°Ý1¶;Vz"ÅËaÿùÏ=MSIôé>jlt(Ø$z$ÿ"¨O23EÀÖËåIþ+øov6ïD¤Ìð1ÓÏ|Þ¯.aCåÖ8X;òCððIn.Øw.O%äæá5à4>g2#¾yøèe[Lø:?·®0_ë+O&z×`¥Ù@Ú0TÿÀAç¦fkʰ¢;!hй§ç<P3ò%qix³ý6|yÒSýúìà@Yoá1«)d°¾Âdöú©¬*¥I6ÞµxðóqD«/r5(!'b´¿³ gÏMxù§Ä5ÐÂ@£+뵤O¡Þ$|rÐ@R4+Ú°zÄÂ[¢ |ÇMAÊÙËܶÜd¥Jcñ+w/à CGÊÝcU?j#ÙØP»@ãÛ°}Úò ~wÏö¥örOÚû[ngú¢ÏVóZPA*zµÁ°=GÚ¸\ëèqfG{£ùm×Fß½b§ÊkÝC!TCÅ÷ü|aO +ÛaĤ~êâѸÞÞ£ÅÚ´<[iãZÌ;&þ÷-~j +áuoÐ ¹ÿ=,B6[í¨ÆVùÇÔÊÐ)Ïrd_1°²Á禧UùG 3ߢqy¯/÷úPÈn²Ëª´Ó`«´x´ÒiÝvU¼ÎûÏνxy|v6vT ^pcÜÇ¿^<CPcnâîL½ì|«O;5×¶æ7#s²q'ýmEêdR7iky2qYZòºÕ³nZ·ÛÙ6«;àÍ"nè+Å)¨®¾Ô:êêÔ¦ó9È,¾ÀyW:ÔwÐÂ1£<Ñ}TðiûLÙ¶lqG+#(o=[%mÄ2ûé9øG{3ò ˲ÚÑÊmÏsv|%Êhá98wXIKé%'Gt&VÌá:j΢s::l)4ß´"À¯ëùJò):))Û'Ç- a6(>µ²`{÷!+É¡qüEïmÑÙФzP S5¨2¬ÐÛÂjçíCg XRáQgQñ£ÌÆ#WcMÛ§>ÈÌÆÜÕê#Wc:²áh;Uk¼t5&]é»GÉ @Ûj|ånÑc²Ñ¶lL<-u._QXà¾Ý§|²N9&*bfzlW`åÔõF0eZ¿®J[irõ0Êô¤o I2k?(é©qÑeCÌ +~Ö%àX9]Ë6ä6@s¦úhl´7 ®òº&ë5ï¸S½³OV¢Wý-`ÉC*gþJÞJèù{ì¨Êð1qëWT¯5ð÷ûÝFði¸µ¿þùõqÿQ+x«FÄÁY/DUè~¤¶ d·ªVr.+b«^ôvotøRó&òdEXÙÙ´ëS\þ+Õb¦1"Iýu.JÊÑ3ÌðÏa©Cq +ä¦k&VxÑnêtÐÉ>=AýÆWeÕn¤ä +Q¤/¬îÂoÀ!>ÃV©tµ©²NwrÆdÊî¿åãUdü¨XU±BëQKGÕ¾ìÍl+.¹nÁ®j0,ARëäVmlµMàr¡Ñ+Y±jc°Lá-ã7a1ïQþZX¿7×õ6sàFÐNV#Wôú1¼Á(;¯QÜkq,y"²6yAu²0, ä/SËQ¡Ëv e¨Ôh®èk¨ï0h¶tñ[/cê ¾É jý£ÕO¨~âí2ú:Ð|t=;<w¨øúv@K¶ Ϲq}me¾)âá´DFð©xIßuÍRy/ØÙÁLþO<7jzbäímvÈvÑÔgÐ$:+6´±ºðBaA®²rGøäùûÞ0<C?yÿâÍ~ÇѽA³¤ë¥h$`Îpm½w«jûªn ßZ +oÍvåeXgTµ5d#.Àû Ê-ZÓ¦å^èÚ²ØÓÕ®Ni|j¢8zT»×^pí}mÚÃ×p¶ì2ÚS¼>-0"^2g%Êê@*³Ð+È^ªFÞZ¶_q+·F1O\ºWJ@ºÍ-$ìnEALx#ºb¤4kúGöP¶pz#¬oùj¼¶Û8Y1¦1ê¹*TÚòÔÍ!µ"ªë/aéõò¢-"JÇçâ§ï'ÜwwDõó<ÒÏz¯À8õZM:ÉCÂÜW&óùÉ8$YÜÛÖ¢gå%lMDÜJ$<Sråv¦~¶W)ÑZ¥PÐ0Í©XZ`C:;¤Î-W¹«ImJ0}§ÖÃMâË,*p㬽þUu vÃA}Æ&/nUÛo׿·ÊÅ9nW×h¬Yy\ É}M~§KT\CÒ鿲ápHÓªº.]vHÏ×pr|É GÙ²ÿ#ýJW±Ð +&ËtÖÉß'¸~J»+pò¹·D®+7wlÝÔ =?ðm÷^ÞD'u1^oâöTMM £ßµz=B»¿ÚL£º·zl;«7qã î¤×ÕU°$â5AE²±±Ï[Uuí6·;lZèJÐvEí:VZrGÝ[,*¯ÊfåæµÈ®£NB0dLäT¹©¬®D²Å°AfëSa^gÆ*%_xõòæwVQê&a©§nO3Ö{ÚeÌ5 ÿÉÝñ³(vÝ"Aüûÿ£º_樮±7g+ +§Ñ,ùR¬ÄJ]e£ZºmÚÕMUù¥ÓÆ.í§êvºhÊu6/UyO6:¶¢&µëiÆâþ/\oÕYþk+ðýÈPýt+EÖ>æECAUü`3my2¹/ÌY_Õ`ÁÄ09R²neâäµ`æ|c÷Cÿ¼~¹(·$5T+ê9ùF6ñÂE://@=|àëÛ¢o2hÄÚ¬YãBeíK1çNT5énRGÏyA-ÏäwvxÁæê¾ªa}44ÞÐN³MFÌKÖNÃö;QξN¹µ éòÌ.z~Ã\]7:EÕ¥é4ÐMÖ^+Y}íó¢²¥C£KfZôSèò¯Mb«¹újÖ ¯·é+Â8µÆÂövUVÉ»¨,3?WÝ%WÊÂ_ÑÒ&fklýi0IíMð¢Ì${I>Áë)OæuÃIF½*SªºÒl¥Xêõô!®;9Úyg¢z¬³®ßtKJo X×ÙM¡Ò7Ð3Ê)kZ!Ü~~j¶3¯t5ÚéruGÚ£¶«»k"5°W)ìñä+(mh³i$ë%+_¡ÇÞ!Yí¼ø ¥é"¨ðþ/vâk âä+¢È¡fõÜE¬´n-ou)±eàkWÕmrVW×üüÕm(ìæÄÚã}$'aéÜ:ñèôW±Ü+ í?K7þ"T<úK¾ Ù2ñI(¯Á¥ÛÔãjáh§¸øF¾ôë¾;ÓÆô.gë|VB(gËAwrÕð¡N·®l£îr´*o=G˹¥õ/q´ºq(pMÇGÈâë©fÎ;³©ªÅ¾¿jü a¼¨6VNäkN@ÿF·ÉwD·ên`5Bâuîh¾¦õÙêï®ëðu£¦ï|5C7§ÖæËI©BºyÞ¤yÂkïtù$ªÙú> ôÔïç@O¯K"ëú×÷J|nV[¥¶í÷Ùy'@eüYQ .}.y +S+:ñ²¹Ó,ï²=ËïË,nÇP»â)3vA%S¨ÿîû +7u4Ô¬ðEut(Cýc]:,²«AGì"ÎAî¤ÿ×¶Úø×QÓ¤LÓæMmÔºýP¤q/ èÀØtA#aä5¶#~Ré7@¿ö<DR±õkÎ4×2!f° +ç²Ç ÖÞKd^éñjÖà͹ ÖXþ#{ùÿþV|í ¾±_ö¼¦u_V}ªÍZou,ä!CU¬´Æ62vkL^ãñäºÜ$ö{æy$/UÆaX¦6±ïNâZN/Z_X7ë&Y»GáMTö[±ëm@îâ.] XMl·ÑÎ9®a»[]ù&Sé=éÊ +Tzl&¯+»ì}│+XÑÿ4 ÇTZëâ +ï¹ïõgÛtƪ\ñÍFy«;«ëìJ£øÿ3ñã#o/»ÙÖ¼lpC4ƾ»-WÎ_é¦ú¯ògó× óWùc½vÁó÷ÁÁ!¾éÉû}üd.¦: Ôå¦ :>Ò\E#¢ñàA|Ä&Ðzû0ÊLÎãGc'¤+ à®<íÖ[ðíígRó4và +ɵnÄ-ÓÁµÁ®rQÅ0ÍÍÁmÓn /Á7*¦½àáfß|7á¾x+-xì[¶·»Ûg;êÉCú^AñÃö,NGt,¦§Â0³@¹:`áY¬7æ®ÖGÝÂS¯®wE£þlä=ÝGkJ5VnyËÿ±â9&gDF¦ºùâº^©êÊeeÐjûZ²ÒuÁR\5ÆÉP4ô¨Ú/çÑxN×à5%ýáUOZãKâæ×HÌV4²à!Þ#/çaÑrd÷-±mVEß{ åël´nh\ð,w\mÇ6}pC¢¶fÄAïúÉÏ(K *ÚÂEÆLÂÝ$ðQÍ +"©æ#$ðõ#Õêû ÿ# ×ïÆÛð&ø?O°Ådô*±Ò-EÛÊÍwîàmÕjÑUËùR5Pè ´\M·ü"¯`&üÓp¸Ï¶Ý(ÿÏ»J'òcs(,Øà5¨Ïð"b¼ñ ÝQÞ¼¨@Â>ÑK|Uãm¼mR¹&!§NxÝ·hö®¡BR´°cK<b¾ôÔWæS- èÐÝÙ%_-)^^V¯ç6mÿF@ÕªTA'zì§ãB +ïæÌÀ+wîlûívñÖð{PÇýÞç¿a7ÕM}hå}Þ'á¿èY+TF0åøBhÖ¿£pó8½Jg úêuB§ÑîHWçþ7Û[¿á¸sƾÉÁt9íà`¹ø|W~x|x÷AO@ Ï쯣6±T/4ÖÚ4ö)°qYÈì.jÿÝjj iË ÌûÞ¼}K¸×ET<(Àc¦A] OµMzEÛ«PÃZÄ^ز¦ÎíE¾¨` OqN;¢'çf6» «þ%zºmXVe69VqmÛþËúôdS×oN +ÝÐ_×÷Ön:Öv^]ÖJ²½®ì©Ú±\Og}·ã¥öá^) ²ÛÐ'F_±jUtÇBN~£s>0]\ªHXÄ$ £;}«CÿÂhtçx>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôݲÐ&¸3ï9°ÓVäQ~&ò}o|Ø!7@ç?d\ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.2&r2=1.49.2.3&diff_format=u Index: php-src/ext/phar/phar/pharcommand.inc diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.2 php-src/ext/phar/phar/pharcommand.inc:1.49.2.3 --- php-src/ext/phar/phar/pharcommand.inc:1.49.2.2 Sat May 31 16:40:55 2008 +++ php-src/ext/phar/phar/pharcommand.inc Sun Jun 1 07:39:06 2008 @@ -150,12 +150,14 @@ } $hash_avail = Phar::getSupportedSignatures(); - if (in_array('SHA-256', $hash_avail)) { - $phar_args['h']['select']['sha256'] = 'SHA256'; - } - - if (in_array('SHA-512', Phar::getSupportedSignatures())) { - $phar_args['h']['select']['sha512'] = 'SHA512'; + $hash_optional = array('SHA-256' => 'SHA256', + 'SHA-512' => 'SHA512', + 'OpenSSL' => 'OpenSSL'); + foreach($hash_optional as $key => $name) + { + if (in_array($key, $hash_avail)) { + $phar_args['h']['select'][strtolower($name)] = $name; + } } $args = array(); @@ -1470,7 +1472,7 @@ $use_ext = extension_loaded('phar'); $version = array( 'PHP Version' => phpversion(), - 'phar.phar version' => '$Revision: 1.49.2.2 $', + 'phar.phar version' => '$Revision: 1.49.2.3 $', 'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available', 'Phar API version' => Phar::apiVersion(), 'Phar-based phar archives' => true,