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

From: Date: Mon, 02 Jun 2008 13:24:15 +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-50252@lists.php.net to get a copy of this message
helly Mon Jun 2 13:24:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.phar /php-src/ext/phar/phar pharcommand.inc Log: - Fix issue with -y parameter hanlding

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.4&r2=1.7.2.5&diff_format=u Index: php-src/ext/phar/phar.phar diff -u php-src/ext/phar/phar.phar:1.7.2.4 php-src/ext/phar/phar.phar:1.7.2.5 --- php-src/ext/phar/phar.phar:1.7.2.4 Sun Jun 1 17:16:40 2008 +++ php-src/ext/phar/phar.phar Mon Jun 2 13:24:15 2008 @@ -890,8 +890,9 @@ new PharCommand($argc, $argv); __HALT_COMPILER(); ?> -6-+6++Q¶ >環͏À-}±HаE+sdDqùT{çºð^ça‹3©i2#¤tX#nœ© û$=ý˜knF# ¢Û¸å¦6˥ŸÈòªü›N­)i¼Ëê *?“¾BBîĦ^l†{%Yèúüϟ>~¤ӉMʨ8ûePÝ®#Rî´¢èûj|áN¿Úo-©‘ºœòùÛ¾J}fV„oyÓQ¦a!¼Àý°×9Ëržc5׸ªPÆ.{jµ¯ÕôKDfùÙa3(ê?å·?ÃWáWí’lzdÄ÷œ…Ñײ1ù­p4K›bòÃӄݓ,Œ™¤÷qú%v8ÆFCŸ-EÒl0ÊÅÏæÀó{=!ô-#¦vÕ|pÏkŽM!øØÙ<H1& S,ë˂NÏ .i#*I>Œ°–¨u¿¥ŠVgcŸâ"ºÓiK6¢­HÉ,™Hòðæ­<ü‚ø[v¤3¾âlS8j°iŒµøX­¶Ð”) 4½¥Biڗ\Œ\¡Û/ð .$Åe ’nDRœC_þÇWsmj¡Y Ùù+´Š€Z¯¯A¯¯Î•âÿdæ?q?•´3†šMyÓy¬Ÿ<µìÐËÃlœ`/ˆ£|EÓ+ÅÉ~pìAâ…ÿ˜5FݑÝhýŸ•)`Ã` ƒa#Å& ¼®ÁB/£d¥+ -?¯@@ -900,39 +901,37 @@ ,”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‰$÷x–D“ƒJj*%U ·ÕSR­^ÐÕ[1Œ½v„Y­ºÓÛֆä½é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ŸÌ!`ςˆ­{M„Cî-¥?vÃîO¢²þ}ɞÅ{Î ¦1ýä›e˜… Ĺ ¿ãV0ñ5z$½½âñ%÷4’3gúq9g|ŒÉ™˜;0—øq(ÛîÒ¿®yIªÆ6%­üŒSO-„Î‘ß B#3ŸÃð¹MfbZx°BÍÕ¯ê_ÅrV)°q”ä,!S"¨åϽJš¸Wóh<ÇG?Ó5$CYŸ§9O†¾ž8Jq³äDú-ŒS0qW RõržEà7|-üUð'GÝkÁ3  -ø¤hIC€ÃÁÁ¿ÊÂå¬q0’ _ž‡Ù͐bÓ(!ÒÆ<(ì‡yÖz[÷C„`6A€–áø"œ‰-íYúô-îÍø¿VÚAjºL]&„Òg÷Øì±5‹mƒ%쎱ݱÒ)^ûÛo%({š0g’è Ó}ÒØè,P°IòôHþEPŸäž[opœLòŸÁsÍÊ}ÌS±Yˆ™~nìdþ "îí¨]Evž<àü#|’€ƒVQ¶Wݬâyx8/˜Ü€ß<D|ô–ö™Løzgr]c¦×W }¾$(LônÀ?Ifi½ ´RýƒÐž- d¸¡—L£Ù*±ø8Kìÿ†¸7Iøú“úAæÂ6gUæù–¶T‰š×¾Nê‚¶Óf-—‡¦ÄІ1¥‰ XúöJöf­†ê@d½é©O+hWíÉNCôgM„Ðt‚ÑÎ*IªU'Éåt¯–€å狠 ÊÿÆÑ¿|/-[{™Ü÷àDm™çŒÒóðRnK萉Cœ -šú€BU~Á¸%N~…eË8ÞÔf짗×ˤ½q%õül/ë@FMÆSLqTûy<,Ë,3Á(D³()óÀŒé²!WL|¬z+ü Ñ{š-dF«ÞøÅèSóÜÌô4áIœ-óBˆ°ŠKb•@ˉæôLÕ¬ˆökI‚V=M¢€;¼ŽˆœpöIˆK<êVEÈ⍟z¬ÓÂT$ä§$‰Œ.§XÛ-6&ƒ}|=æ"½°Íå´l!UÌ \SÇ€ Ã/^áFäŒ÷úðÓ—DÞVøVYÜ,{Ä)Ðj'Ž.jb÷lÎ!&) ý5Æ[9ímJêE…,-- ‡ªÍ0yãnOªM1cãn -OŒ¦haò<–l¼Eÿ#ß¼œ¤ZKœYùy«b¸ž‰:,~°’™äbíÀ²‚Э­÷¶ô— -ž?ž¿ uc¶ÕM·Ž¬”>_ªíuƒw^”ºŠ-ËíwÚ:b^Ö…#œ -öÂg"DÚâ81ܛvce"Øó8}N0UP Õ Â`¶4>0ªBvr&²ø´ÿŸTSø(+#ŽÍ-d`;Kà M±ë®±³Xn"®c‹q9ÐD¸ø…V!,wÃÐÖÕªÕå’Q^P¥ +~ONÎDXº¶k±ŠÂ­Æ**!)¤±¬AÂÑø{ð!—ùõî É}¯ÀeèDZ. <œ«jðOW”UûS#*|P­¨ú9Z霶ÚXO©@B¤?JÀÓÔÅtfE•9•åtCöbÊv"äëHTbÛüøúåߌ´G.Ë®f°‰«‹¸…l Ù±î A_#hч Ë=º °·ØëßVZ uýŵBÝSžUەóâÅýœ\W›±OyYÓSáBû˜Vxx[£ØÆß1¡Lù™‘ zªÏ¿¸ò>2±€-±Ã%£F§âG™G®Æ*œ¶O}™¹«±Üô©5¾q5¦Ò{äÈ՘NE9ÇÎÆBÁÕ/]I±: ç®ÆQr)ж_»c¨Y‡l´½·%Ü­jÞ°ghHÒU\ç™Ôʒ Të-Ö:“"wñÕOŽºᄪG*…åtÇZ‚ÓeE€Õspö‹ÞÞ­.ç˜Ô¼Î£É¤<ùVòïvvÄåy ÷‡Îé:vpO·˜géj¦«äñ\#<É%=h”ä<+Äæu¡ê•¼¾‹H0R“\â£ÎcŠ;-©îX¡^ZoS/ñMÏ£©£¶hò®ü†ÛˆQ‚çËøõ š~šµŒ.M y‘\r<TéolÚ ŒEjóS½_/«#³i&NÈñ•xîzÀº@TlˆQšÆ<Lˆ$Uøg™bC4à r -<'©­Vê䛮E™XL»m¨ÓAo+ê ê_4¾jÿÎá°J® hHÆ -žQy9üâ3q•Ú]gÀQ›‘úW!ë>µc2å¼áãU–ƒd|§XU±‹BëIKGÕ¾ìÍl{.Í‘¹nË®‚j0,ARëäVmlµŠMàr¡†Ñ-J8æUÉZ×T¤6X@ÈŸ¦â¨B-—í -Ë ¬Ñ\ÑôPß1Òlé,+ã·0_2ÔA|“ejÕ*]«Ÿ(fRýÄ7Jhú:Ð|t=;<¥žšwùú—v@õ”¶ ‡øÄ¸ÞɅ¶2ŸÂñpÚ"K£LøT¼¤ïº-ǼìîâžþO<7˜•*ìzbävÈöЀÔ'%%:-ÔÕ´ê½T¼y?c.¯Yųîþ†=¸·ÎeÊ8¢3gÚmPPÖ6i]åÝ0ñ²„,.µ×‹5M¹V.ö}t­²s«,Zv š2Fm3~³Jœ“Å̕¹qZ×î]òUÎI{ÁV ÝPTµÙx›q­Þê7yÒ.ýA­Sê=ê ¬Í¢}-à-ØL•X¼-ŸW9àŸ¨Ïm[/œéßv¾ÎÒÔØï>¬Ôò4¦œòë/4nÓ(ÇF3¯ 8tŠyS!%¶n4ÚÝŠDÔ«S$†J…¨Ë)¬á6Ð((UjŠ*½ŒÒ»TœŽÉIÔÕ°¾C-ÒçobtoWL>šzËÍåtÛsy+4, ˜W«kõ‚¡,>7ÿªMõ-{ú§2¤-Gœ¬ÅS†˜F`*%Óåé)usNí°‹ê:áKX@z±¼è„g‹ˆ6úsñSˆ÷+Åî»;¥Üõó<˜ÒÏ: aœú®n:ÉcOÂÜW&ó-ò“qH¸¸·­EÏڗ°5q+í ‘à™’+¥úÙ~¥rLŽ•BAà 4S¤bjé4ø:{´\å®2Uz*ÁôZÓÏWYT`J®½þUu vÃA}Æ&¯lV‰½‰ëNó[åËâá5$ë.å>.ä&ߌÓ%H*®¡éô_Ùp8¤iUÝV—Æ.;¤k8¹M¾ä„#ÁlÙÿŽ~¥«ˆ(UC'"Ãò4 uò½Á ®_"Ôîß -œ|îm ‘«`fÆÊÁí[75(›¾­òÞ˛¸Àá¤.ƋÜžª© ä™Ú¢â»V¯i÷W›iT÷Vmgõ6n\³Ð½™ô"°Z° -–D¼ ¬  H662Èå[W»ÝaóÐBW›¶û(*ŸYiÉ›ìނTùܸ¿X%ËʇMµp·‘]G„`Șȩ2]­®³Å°Afë”Sñ_gÆú'_xŠ•ò¬<ã-£ÔMÂROE ,”­wvµË˜kþãÇãï£Øv‹ñïÿšãÆÆbÜ6ž­(œFF³äK²F+jHtýŽjé.ãiWN6UéyK§g dEPM¹NòRu9-Îß·ÊߏL)ÕOwR¾íc^4tR-]þµ¡Il5×Q_ÍôÕó6}åSX§vÓXÐÞ­Êj y•eîÏU³DòjMYRŒ ºQÚÄl4Ñ¿‘sÔN‚Ÿ–e&ÙKò ^OéŒ5_¨kºL2ê¥P;¥ª+ÍÁVŠ¥¾XOâ*¸7G;g&ªGGëúM·¤íMëJž‘Ô*}=£œ²¦Âôó3³y¥±ÑNÂ;6 =Zé¨!]Ý]•EÁM¤°Ç3Y-ã_–C«ZFqÙ¯ñnÚZ»ÕæÊa9´ ÎY½›^ -@ÞàVe˜ј²â}íònâ‹!ZÞ Šì M#Ãpî[‰—Â7w‡J‘„ò•ÓÀ‰+ý‘:cjôî”]ñÜ2\Á-(åÏÙ4Ìõ-͒įÐcȎ¬Šv^üÅÂÒtTxÿI«ø†e¡8‹£(r(¦ÙÄ"t+mZdË[ÌJlYî'¶[‡69«[~ñê.LÄ·àÚ·žýQg¦ÆcE^IÆr0R‹—pw¨è–B@­–®–ÄvËÅí3]ú ßÄq€¯“ÃK§¹«/Ø*µ"þ #¶Óx¢Ê@Ë®³r1×w–DýfâZçÊ/^PzB·˜Èg@ý"[#o  ZËæ‚W†B®(añòP™ã”Kˆ·æ+̧7¿e 18ŒE¯7FέvÌ|@-[Ò ª)–ÓHmÝ£ßÚoCld`‹û URïÄ«¦‚кM¹O‹Õ¶…«¹Ùz~œô¢§§R¦Õ¿kË@К;’ܼ(1}<,:݀–l…ÛÅ«ç,ĵ/ÿi^ž¾ŸSŒ¯ŠDkchW(LlÿYºqtΡâIcò©¦—‰—B•ôLBùx.ݦW ÿC;ÅÅ·òµ _÷dPÓ»œ­;òµZ ¡œ-!Ü{¹†u¶}mu—£U±|ë9ZÎ Úïâhu7òAë9>B_§L5s^3NE4ö« ªÆŸ-Vô? è1•¿Öºx£Âû╈øºã:RGEµ¯|}lTÓºwu! ]i”³-©‹»aYæûZ7b‹–éàÚ`×¹NÃ¨Æb˜ææ`–v(/( çKð’Ši/øbø§Ù_à<‚/žÂJ û’íïíõÙ®zò˜¾×GPü°3‹Ó‡`†ª0 Âl-IÑò—'[â)ó=&Ô¤¾2âhHléÔF‡>è^È.ùj¹Lñ¶ö²t>·iûÏ4ªP¥ -:Ñk}d?!R 4d^ÙÚÚ¾ëíá­á÷ Ž¿ú½ÏÅnªšú<ÐÊû¢O0?ÂÒ³V¨Œ`Ê«ñ/Ь/.Fáæpz;Ð$@ôÕ»P„N£mIWçÁ;Û¿â¸sƾÈÁt€‰¹‚íà`¹šøxO~xzxAOƒ@…Ï쯘£6±T/4Öڋš4ö˜) °qYÈì.jˆÿ݁jj i˅ÌûÞ¼}K¸Ÿ×E­T<™(˜Àc¦A] OµMzEۜ«PÃZÄ^ز¦ ƒÎíE ¾¨`…œOqN;”¢'çf6»…«þ%z‡ºmXVe‰6•9Vq mÛþËúôdSž×o N -ÝÐ_מ÷Ön:Öv^]ֆJ²½®ì©Ú±\Og}·ã¥öá^) ²ÛЋ'F_±jU”›tÇBN~£s‹>0]\ªHXÄ$“… £;}«CÿÂhtçx™>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôݲÐ&•¸3ï9°ÓVäQ~&ò}o|؎!7@ç?\ó“m®‡Wæ4ÀÏÛʕD¿Ì6\ No newline at end of file +•f`J-$Üe(V¸Ã¢ô:ï÷/àԔK”`8t+T„'D$0ŸÌ!`ςˆ­{M„Cî+ éyÆQX£f‹«0¦¯zùÒñxH+ŒÑO, —œÍAÍèuBƒ°av0é‰vr»ғ0Y+H:£90áí°ƒÅæ½¦¦UÕ&“C,v*´ªô»´ò0¦ÙóE¿å º ÊK¾Ô쐝(å(‚^Ь”ô“`9ûBÀ|õíÁ((.Â}ñýô‡£ý ý¢~óÍù‚ßl4]‚ph®PÞÃbÃñ-G¨÷£$[•´nEÇj]~­%3ûjRLóˆ,£kŒ5jÅ5î‡+ˆ\®{­ˆ¢£Œ¯–0èl€Ür>Co¤XM”“€¤ä¦d"Ö )A•+„?ê&X žUÀ'EKòþufXë(`$¾¢óÛ1;ÄæQB¤/yPØó ¬õ¶î‡Ál‚+éè‹êà’ß’?f<9=}Ɋh‘ঀ_÷CØ®?kh;'{NZn6~£I0Ñ&þUçïϔŸ¿ï±É ¾ÿ,‘é’?ë$ÊL;]ÈO~}²îØþ½ÀýöÉݐŸ+Úw¹C >*¶Z«-\Ó(9³Âæ#“PuÝ2—䢶$ áË4N¯y>ÃáâЧú¢~p.NmcŔ=¹jÿ'«™Mç‹ó­ð!þ0Âj…6g@}†‡åüï«m5ÍRc'¡ ÙÃ6›iÍbÛ` »clw¬õDŠWÃþã({š0g’è Ó}ÖÚè,P°I:ôHþEPŸä¾[o§pœÌŠŸÁ»ͪ½ÆS±¡‡™~nì6þ Á?¶˜¼Ô||’€–K¶·ö ÕváEx 8M/™Ü$ß<D|ô–ö‚Løz÷pÝ`6×W ý²$(MônÁ‡H#ia ´Rÿƒðž+šú€BU}ÁØ%N~…0 ekØÂ–ˆÔf짗×ˤ½q%õül/ë@FMÆSLCÔûy<,Ë,3Á(D³(©rÀŒi֒Ï%>V½§5~†;͗²T¢…‹Uoübôixnf +™ð$Ζ¹DX®±* åDsz¦êJDûµ$A«ž6QÀ]XGÔL8û$Ä%M«"dñÆOÖiajòSNDÖ—S¬m€cu> ]ûª^f›’Á>¾™r‘Øæ­rZ5„*æ„ ®©ÎSÀ‡ÐÎ!ñ¯p³pÁCøé‘K"ï*|«<n—=âhµG—±{~Á!&)ý5Æ[9í?JêE¥Lミ3§DÁ¢@Aî¦Úãß<U¿ÄýÜCíKuPŘtÂ|—Ø5Û3ÝÒ1s¡Q5ä]t›š@ R$k¦2ûFݕOnߚéÇ…õZÒ§Po>9h )+–¤R&T+öÂgbs)JhsîÄpÌ»Ý,Á'\yt‚I®ú Xnª.l¥=äß#£æh§`¢F„2WI½@ee±Ài@‘…òm¥DE‰±„Q±±;‹òbìêþ6eÓRPźŠW¨’HehNŽa2Vš÷è\àû,2°ÌŸRìºkì‰WÛßëI\Ô×.~¡U«}\4<³rÉHõªwÍc/È« l-VQ¸5XE¥Ò…4V'‚p2ý¢Ÿ¬¸¹ÅM¹c8­ŽHðSÙuց*jðO×+ÖûS#*«Q­¨¶†9Zél5¶ÚYO©üF¤?J FÒ¥šf½ÑUŚcöbÎv"äëHÔùÛüøúå_Œ”Ý‘E} XÄU`‹G„l Ù±ªAß hч ËÝå + °·ØëßÖZ¥ ú‹k…ú'ëë¶«àå9Šû9]6cŸòªb¬Æ…ö!.¬ñð¶8¤³¿c)e*eFOºtúCüâÊXʔhæ"§Ð‘2–xÒ +ÕʑlìØ U¹ïéˆíØJt¿{èLvQ{YÉí)诊8|¡€™ÅS“óÆ4ƒuôƒ?fûŽdYµÖÐÓ:̞+>"¨1‡rЮ‘ág#(w=_%]¡ÄI•óñƦŒ´<|˜Õ;ÚÁCUìQpΎoÄцex Ξn Çôš“#:K+èpÙ7gÑ:D1€šo ZàÆ·Í]Ôú6F„:##Û–§ÀDôŒMp[/‚>%µ²`{w™jˆÉ|ø4L~Σ’6ÂhÄlhR=¨rÑNFTEÇ´Ö%o㠔Cg…XHá’Q]Vó£ÌÆWcNۍç>È́ƅ«±Üôi4¾u5¦ƒȑ«1¹s4Ž…‚k4Î\I±: ®ÆQr%ж߸c¨Ù„l´}°%Ü­zÞ²ghHÒU\gHÕʒ Ôè+dºmC“z[QOPÿ¢ñUûw‡UrEC2VöL¤M‹sàŸ‰«U;ŽÆŒÔ¿ +Y§ãºc2å¼áÓU^€d|«XU±‹BëYGGÕ¾êÍl{.Í‘¹iË®‚j0,ARëäVmlµŠmàr¡†Ñ+Žñ ÕbØÆ'ay1 :jaýÞ~n¢3+4•ßÿébïØ½Ã1È^÷+ʺ&­Ë¯[&^•ÅU£îz±¶)7Êž‹nTvn•ÇAÇT[ƨkÆoV‰s²˜¹27N›Ú½O¾Ê9i/Øz¡Šª6os®Õ[ó~,OÚe8jTcJ½G$µY´/¼› ¢‹—€q‡|±·ªW¼Èˆ™%¯$•‘ÄQd)ãÝ*^€Wñ>pßh÷$‘]dÒÙM«#-˜QÂ~zó’‰Ââþ%m´øˆ"ÚEQcöÚ_RƒMA’×äT+·ÈÃì"²·Kk®Eí{l«dm-}Ð[-8 ½Z™²¾º¡†ð§Uø'êóCÛÖ gú;_æijìwÖjyÚ +SNùM‰×ewi”c£™WP:ż“†[7íþ +E"êÕ)C¥BÔµ*Öph””ª4E^Fé‡]*N<%êjXß¡éó·1ºw+&M½åæ†rºk¹¼s– ÌëÕ¥ÁXŸ›õ¦úGýS +Òý’‚¤ðq £pJU½ Æï‚¡Y•½Y!v›6ò0 ª]{à£úZ +»Lû•GžÎûñ¨¼¬ â_aDƒt"fR¥˜˜pÕ¡MÓURŠÇ¸¿ßy‡ÅI ‘;¾\+±“º–&ènGûøhØXíQЦ{²¡U,¾=‰y"àÒÕqظVfÒßh¶$§°»m}Q0aàiŽèŠ Ke4×ôì¡lá<®ôFØL&Wj¼‘G× +GsÅS†˜F`*%Óåé)uçS㰋ê:ã, ½6I^ÑÃóeDý…ø)ěÁâ÷ÝúSíúyÌég…0î+¨o:ÉcOÂÜ×&óò“qb·¸w­ÅÀڗ°5q+í ‘à™’+¥úÙ~­rLŽUBAà 4S¤bjéƒ1uöh¹Ú-{ªôT‚:µ¦Ÿ¯ó¨Ä”\wü«ë@톃úŒgL^®{3×m>æ·Ú—å%&ÂH´Ö]Ê}\ É#M¾ž¦H*®¡éô_Ùx<¦iÕÝV—Æ®:¤—k8¹m¾äŒ#ÁlÙÿ–~¥K´(UC'"Ãê4 u ½Å n^Õíß +œ|îm ‘«afÆÊÁÝ[75(›¾­òÞõaLt8©‹ñÚ,·§jjy¦¶¬ù®õ‹mºýÕv5½ÕcÛY½‹×Â,tã+½f®¬‚%¯Ÿ+)(’ ruà֕ÇîvØ<´ÐÕ¦Ý>ŠÊgÖZrÇ&»· U>_%´Gn&˪‡mµpw‘]G„`Șȩ2]­.³³Å°EfëœSñ_oÆú'_xŠ•ò"¬:ã-£ÔMÂROE ,”­7Âu˘kþãÇÓï¢Øö‹ñïÿœãÆÆbÜ5ž­)œVF³äK²F+jHtýŽjé.ãéVN6UéyK§Mg dEPM¹NòRõ9+În•¿™JêŸî¥|ÛǼh(è¤+aúù¹ÙÎX%³.„wl@{´ÒQKºº¿&ªŠ‚=šHag²+zý­éy¤$Ñ%”§ª¡ÏˆÕ ˆMÅhËô›Öã‡Ûû°]³'ÇÑÇd:š×¸¯¥îÂÂgGØ?éf˜/CYïn…»H3¾.½kïýJzúisï¢Mž{ ­B¢Up—ú…îUˆ*ŒU­jÅe¿Æ;ÞikíN›o(‡ÕÐþ-8dõ†uzé¸+·‹×ÌYˆk_þݼ<}?§_‰6ÆÐ®P˜Øþ³tãèœ1BœÆä RM/¯3«(虄òñZ\ºM=®þ‡vŠ‹ïäkA¿þÉ .¦w9[÷äkuB9[B¸÷rêlûÆ6ê.G«fùÖs´œ´Š£ÕßtÈw­çøY|2ÕÌyÍ8ÑØ¯.¨dØÂ/ªË†Uù”ÐÆ¿ÕmòÝ8Ñá­ºXå x;šo­is¶zÆ{ë:|ý¨©á;ßfÑÏ©µùÅrRêî¾ULÒ<㍗»|Õl}Ÿzêá×sI §×%‘ÇÖ÷J|n°^Z¬¶í÷Ùy'@eü»:¢è]ú,.\Š_G/$'^6wšå=–¢gpáşåýj7S<gFÒU2…:QÐ?íº¬qSOCÝ +ÕPwH‡2Ôß6¥Ã2È+éiãUNæÍŸ¯fn؜ ÚÙ`å?²—ÿ_qáïeÁ×^è;û%hÏZ÷eÝ'y¡Ú¬õ&ÌRžiTµQkd®±[ë‰é…ˆÑú9ßÜVIa¿³´("yÛ­2¦ ›Är+aûî$®UPõ¢ó•‘M³n’µÞFÕ¦a¿»ÞE+ŠWx âëŽwèHÕ¾þñõ±QMëÞÕuv¥QÎz“´øñ™·—ÝÁlkÞm8- cHß=ƒ–+ç¯t1HóWù³ÁùëÒù+–…ñB¯]ðý/ÁÁ!¾?ê›_žà's1Õy¤>[Ði%ææ[-Çëä#6Ö;‡Q¡ÊùÌmŠå¬mI0 ø§‚vб¯Ã¤yÆÖõtÞԏ¤ÝÒì½ Á_­ð±T­{+ÝÐ_מ÷Ön:Öv^]ֆJ²½®ì©Ú±\Og}·ã¥öá^) ²ÛЋ'F_±jU”›tÇBN~£s‹>0]\ªHXÄ$“… £;}«CÿÂhtçx™>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôݲÐ&•¸3ï9°ÓVäQ~&ò}o|؎!7@ç?,‘£d\&‚x:iËíÝ6è–_š\ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.4&r2=1.49.2.5&diff_format=u Index: php-src/ext/phar/phar/pharcommand.inc diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.4 php-src/ext/phar/phar/pharcommand.inc:1.49.2.5 --- php-src/ext/phar/phar/pharcommand.inc:1.49.2.4 Sun Jun 1 17:16:04 2008 +++ php-src/ext/phar/phar/pharcommand.inc Mon Jun 2 13:24:15 2008 @@ -137,7 +137,7 @@ 'inf' => '<regex> Regular expression for input files to exclude.' ), 'y' => array( - 'typ' => 'string', + 'typ' => 'privke', 'val' => NULL, 'inf' => 'Private key for OpenSSL signing.', ), @@ -154,9 +154,6 @@ } $hash_avail = Phar::getSupportedSignatures(); - if (!in_array('OpenSSL', $hash_avail)) { - unset($phar_args['y']); - } $hash_optional = array('SHA-256' => 'SHA256', 'SHA-512' => 'SHA512', 'OpenSSL' => 'OpenSSL'); @@ -354,6 +351,27 @@ return $arg; } // }}} + // {{{ static function cli_arg_typ_privkey + /** + * Argument type private key (for OpenSSL signing) + * + * @param string $arg The phar selection + * @param string $cfg The config option. + * @param string $key The key information. + * @return string $arg The selected algorithm + */ + static function cli_arg_typ_privkey($arg, $cfg, $key) + { + $arg = self::cli_arg_typ_string($arg, $cfg, $key); + + $hash_avail = Phar::getSupportedSignatures(); + if ($arg && !in_array('OpenSSL', $hash_avail)) + { + self::error("Cannot specifiy private key without OpenSSL support.\n"); + } + return $arg; + } + // }}} // {{{ static function phar_check_hash /** * Check whether hash method is valid. @@ -1516,7 +1534,7 @@ $use_ext = extension_loaded('phar'); $version = array( 'PHP Version' => phpversion(), - 'phar.phar version' => '$Revision: 1.49.2.4 $', + 'phar.phar version' => '$Revision: 1.49.2.5 $', 'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available', 'Phar API version' => Phar::apiVersion(), 'Phar-based phar archives' => true,
« previous php.cvs (#50252) next »