helly Mon Jun 2 13:39:54 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 (fix typo)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.6&r2=1.7.2.7&diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.6 php-src/ext/phar/phar.phar:1.7.2.7
--- php-src/ext/phar/phar.phar:1.7.2.6 Mon Jun 2 13:33:45 2008
+++ php-src/ext/phar/phar.phar Mon Jun 2 13:39:54 2008
@@ -890,8 +890,8 @@
new PharCommand($argc, $argv);
__HALT_COMPILER(); ?>
-6-+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¥+ -?¯@@ -904,36 +904,30 @@
é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ó,£k5jÅ5î+\®{¢£¯0èlÜr>Co¤XM¤ä¦d"Ö
)A-?ê&XUÀ'EKòþufXë(`$¾¢óÛ1;ÄæQB¤/yPØó
¬õ¶îÁl-éèêàß?f<9=}Éhà¦_÷CØ®?kh;'{NZn6~£I0Ñ&þUçïÏ¿ï±É¾ÿ,é?ë$ÊL;]ÈO~}²îØþ½ÀýöÉÝ-Úw¹C
>*¶Z«-\Ó(9³Âæ#PuÝ2䢶$ áË4N¯y>ÃáâЧú¢~p.NmcÅ=¹jÿ'[EMAIL PROTECTED]'¡
ÙÃ6iÍbÛ` »clw¬õDWÃþã({0gè
Ó}ÖÚè,P°I:ôHþEPä¾[o§pÌÁ»Íª½ÆS±¡~nì6þ
Á?¶¼Ô||K¶·öÕváEx8M/Ü$ß<D|ôöLøz÷pÝ`6×Wý²$(MônÁH#ia
´Rÿð-úBU}ÁØ%N~
0ekØÂÔfì§×ˤ½q%õül/[EMAIL
PROTECTED]<,Ë,3Á(D³(©rÀiÖÏ%>V½§5~;ͲT¢
Uoübôixnf
-ð$ιDX®±* åDsz¦êJDûµ$A«6QÀ]XGÔL8û$Ä%M«"dñÆOÖiajòSNDÖS¬mcu>
]ûª^fÁ>¾rØærZ5*殩ÎSÀÐÎ!ñ¯p³pÁCøéK"ï*|«<n=âhµG±{~Á!&)[EMAIL
PROTECTED]<U¿ÄýÜCíKuPÅtÂ|Ø5Û3ÝÒ1s¡Q5ä]t@
R$k¦2ûFÝOnßéÇ
õZÒ§Po>9h )-¤R&T-öÂgbs)JhsîÄpÌ»Ý,Á'\ytI®ú [EMAIL
PROTECTED]@
òm¥DE±Q±±;òbìêþ6eÓRPźW¨HehNa2V÷è\àû,2°ÌRìºkìWÛßëI\Ô×.~¡U«}\4<³rÉHõªwÍc/È« l-VQ¸5XE¥Ò
4V'p2ý¢¬¸¹ÅM¹c8HðSÙuÖ*jðO×+ÖûS#*«Q¨¶9Zél5¶ÚYO©üF¤?J
FÒ¥f½ÑUÅcöbÎv"äëHÔùÛüøúå_ÝE}XÄU`Gl Ù±ªAß hÑ ËÝå
- °·ØëßÖZ¥
úk
ú'ëë¶«àå9û9]6còªb¬Æ
ö!.¬ñð¶8¤³¿c)e*eFOºtúCüâÊXÊhæ"§Ð2xÒ
-ÕÊlìØ
U¹ïéíØJt¿{èLvQ{YÉí)è¯8|¡ÅSóÆ4uô?fûdYµÖÐÓ:Ì->"¨1rЮág#(w=_%]¡ÄIóñƦ´<|Õ;ÚÁCUìQpÎoÄÑex
În Çô#:K+èpÙ7gÑ:D1o
ZàÆ·Í]Ôú6F:##Û§ÀDôMp[/>%µ²`{wjÉ|ø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ºmCz[QOPÿ¢ñUûwUrEC2VöL¤Msà«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ÆoVs²¹27NÚ½O¾Ê9i/Øz¡ª6os®Õ[ó~,OÚe8jTcJ½G$µY´/¼
¢q|±·ªW¼È%¯$ÄQd)ãÝ*^Wñ>pßh÷$]dÒÙM«#-QÂ~zóÂâþ%m´ø"ÚEQcöÚ_RMA×äT+·ÈÃì"²·Kk®Eí{l«dm-}Ð[-8
½Z²¾º¡ð§Uø'êóCÛÖgú;_æijìwÖjyÚ
-SNùM×ewic£WP:ż[7íþ
-E"êÕ)C¥BÔµ*Öphª4E^Fé]*N<%êjXß¡éó·1ºw+&M½åærºk¹¼sÌëÕ¥ÁXõ¦úGýS
-Òý¤ðq £pJU½Æï¡Y½Y!v6ò0ª]{à£úZ
-»LûGÎûñ¨¼¬ â_aDt"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ÅSF`*%Óåé)uçSã°ê:ã,
½6I^ÑÃóeDý
ø)ÄÁâ÷ÝúSíúyÌég
0î+¨o:ÉcOÂÜ×&óòqb·¸wÅÀÚ°5q+í
à+¥úÙ~rLUBAÃ 4S¤bjé1uöh¹Ú-{ªôT:[EMAIL
PROTECTED]>æ·Úå%&Â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§Mg
dEPM¹NòRõ9-În¿Jêî¥|ÛǼh([EMAIL
PROTECTED]&ª=Hag²-zýéy¤$Ñ%§ª¡ÏÕ
MÅhËôÖãÛû°]³'ÇÑÇd:׸¯¥îÂÂgGØ?éf/CYïn
»H3¾.½kïýJzúisï¢M{B¢Upú
îU*UjÅe¿Æ;ÞikíNo(ÕÐþ-8dõuzé¸-·×ÌYk_þݼ<}?§_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;ois¶zÆ{ë:|ý¨©á;ßfÑÏ©µùÅrRêî¾ULÒ<ã»|Õl}zêá×sI §×%ÇÖ÷J|n°^Z¬¶í÷Ùy'@eü»:¢è]ú,.\_G/$'^6wå=¢gpáÅåýj7S<gFÒU2
:QÐ?íº¬qSOCÝÂ
-ÕPwH2Ôß6¥Ã2È-éiãUNæÍ¯fnØÚÙ`å?²ÿ_qáïeÁ×^è;û%hÏZ÷eÝ'y¡Ú¬õ&ÌRiTµ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{-£¯`[
-ÒÑÉ$á
Yôç
-_ÕxïÕîg(¨Þ3.½mi¥-yqÒ³%B1ßcBM+ókM-ÚèÑÝÙ¥XeY·µW¥ó
MÛ¿¥Pu*UÐ^ë#ûé= ¹
3ðÊÖÖö¥¸Xo¿h¯¸uü¥ÐïCxþvS=ÐÐçVÞCùþ{üuBeS^ÅïxfCù+p1úW0¿ÓÛf¢¯Þ
tmKº:>[EMAIL PROTECTED]/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|[EMAIL
PROTECTED] No newline at end of file
+?ê&XUÀ'EKòþufXë(`$¾¢óÛ1;ÄæQB¤/yPØó
¬õ¶îÁl+=M3Iôé>kmt(Ø$z$ÿ"¨Orã·Õ8NfÅÏà^fÕfã©ØÑÃÇL?7¶h7`ÔÖcLnjN
>IÀÓ%Û[j¿ð"¼¦LîoÆ">zKA&|½}¸n0ë+Y&z·àD$4±Z©ÿAü+ù¢nÂË?½ÝðX-
4
+ d¸ëÌ£Å*8"[EMAIL PROTECTED]|ýIý
sá³jó|KûDíkß$õ+#=`cÊ©«gûïháßqÙ|ôáÿÎæaT¼qhl/X/ö詪"3èq0¦gFÆà1,søhèO¬hÊÍÐ1MÆQO¶ ÖÛ¿
LE¹¦c§>)±¢aL)A"¾»RC§¤½]«¡:©izêÓ
+ZàU{òYÓÄý²&Bh:KGco$ Õ©ärºWË Zsá¸GÅÃ8áï¤%pk/[EMAIL
PROTECTED]'¿B²5laKDj3öÓËëå?ÒÞ¸z~¶õF
#&ã)æ!êý<e`¢YTÉ`Æ4kIè«ÞÓ?CæKY+ÑÂŪ7~1ú4<73LxgËä",×XÐr¢9=S
%¢ýZ UO(à6¬#j&}â¦U2xã§ë´05
ù) '"íË)Ö6À1:®}U[EMAIL PROTECTED])àÃÆ+´Ú£ËØ=¿àþã6
%õ¢RæñÁÏS¢`Q ·Síqoª_âî¡ö¥º¨dL: a¾Klíné¹Ð¨ò®
ºMM )5S©}£ðÊ'·oÍüãÂz-éS¨·
4qçåÍTºÍRXøÖØjw¦ðªh7ü·ÑÀǪ:p$p£~í$#½²¶Ø(4ë|øQÊÕ§Ð(zk×'ÇCÐSÐ4ß
pAi¡G´tÅ1ý×zu.:[EMAIL PROTECTED]ª+ým~|ýò/[EMAIL
PROTECTED]>ú©OçzgkÓ5ðX4ì¤k1·LüY0üÔÂëNK£
yô%N,BF[ÕF¢èwÉWÔÊØ)Ïrd_1°²Á¶§uT$ó}¢DeÊR
äý Þ²ìr®Ê5Ø:-m´Eea¯Gu6IïvÏÏ¿{ñòøü|쪲éàθ_:v3Ä3TÍG8æÎ!0Ù)(îÁäÐËÎ2ù´Si#Ue~3v¡O³óÇ+÷¤óI}GL93êÉýGÔC9h×È𳻯®Pâ¤ÊùxNcSFZ>Ìêíà¡*ö([EMAIL
PROTECTED](¹h[oÜ1ÔlB6Ú>ØîV=o!
Ù34$é*®3¤jeI
jt+øs+Îê¬5ð7¿<é7òÏÃU\zÏxüðY'XëÄÜÅW?9*¶ª1G*ätÇZÓ¬&Àê98ûå`ïNw¿Ì^çÑlV¬k#vvÄåy ÷wÐmGìàny§«
>ßÇfáéBn(éA£¤ày)6¯KUiçõ]D¶ÚäuRQ·Ø9Bu
õÒzzozmµEWá7ÜF<¾Èo^ÐôÓ¼ctibÈäcê®Öߨ´A1Ôæ§z¿^Öõ0fÓL_ã+ð\%¨Ø,4yIª,ðÏ2Å>h÷/x
W®ðh»ugf2ݶ¡I½¨'¨Ñøªý;Ã*¹¢!+{&Ò¦Å9pÏÄÕªÎGcFê_
¬ÓqÝ1ò+« ¬Õ\Ñý¡¾Â¦ÝÒYVÆoa<*¾
+d¨ø&,ëõåV?Q§úoÐôu ùèzvx Bj^¡åë_ÙQaSÙâãö0ÚÊ|S
ÄÃi,2áSñ¾ê½8òA°»{Nø?ñÜ`VªwvØ!ÛCC+Êïÿt±wìÞád¯{*îlÈ8k+éIARø8Q8¥ªÞãwÁЬÊÞ¬»MyÕ®=ðQ}-
]¦ýÊ#ÏNçýxT^Vñ¯0¢A:3©RLL¸êЦé*)ÅcÜßï¼ÃâÇ$Èß.+Ç*¡ a)
R±µÀÆtÁ:{´\í=Uz*ÁZÓÏ×yTbJ®»þÕu vÃA}Æ3&oW½ë6ó[íËòá$Zë.å>.ä&_OÓ
$×Ptú¯l<Ó´ên«KcWÒË5Ü6_rÆ`¶ìK¿Ò%Zª¡auÐ:Þâ7¯¿êöoN>÷6ÈÕ03cåàîMßVyïú0&:ÔÅxoÛS55<S[Ö|×úÅ6Ýþj;Þê±í¬ÞÅkaºñÞ3×VÁ÷ÏÉÆF¹:pëÊcw;lZèjÓnEå3k-¹cÝ[*¯Ú#7eÕöZ¸»È®£B0dLäT®VÙÙbØ"³ÀuΩø¯·cý/<ÅJùJVñQê&a©§"PJÖ+áºeÌ5
ÿñãéwQì ûEø÷ÿÇ?Îqcc1îÏÖN+£Yò¥Y#5$º~Gµtñt«?'ªô¼¥Ó¦Î3²"¨¦\'y©
+úèè4Új×C
+µ¹µ [EMAIL
PROTECTED](§¬m
0ýüÜlg¬ÙNÂ;6 =Zé¨%]Ý_UEÁM¤°Ç3Y+(åÏÙ<Ìõ-ÍįÐc̬v^üÅÂÒtTx
ÿI«øå¡8£(r(¦ÙÄ"ô+m:dË[ÌJlYí'v[.9kZ~ùê>[EMAIL PROTECTED]
ßÌq¯ÃK§¹ë/Ø*µ"[EMAIL PROTECTED]/^PzBwÈ'[EMAIL PROTECTED]"[#o
:ËæWB®)añÚ¨PãK·+̧·¿18E/æFÎwÌ|@-;Ò ª)ÓHm= ߺoCle`û[EMAIL
PROTECTED];=ܼ(1}<,;Ýl
ÛÅkæ,ĵ/ÿn^¾S¯DchW(LlÿYºqtΡâIcò©¦×UôLBùx-.ݦWÿC;ÅÅwòµ _ÿdPÓ»{òµ:
¡-!Ü{¹u¶}cu£U³|ë9ZÎÚ?ÅÑêo:ä;Ös|,¾Njæ¼fhìWÔ?2laÕeê|Ê
hãßê6ùnèðVݬFrP¼ÎÍ·Ö´9[=ã½u¾~ÔÔðo³èçÔÚüb9)uHwß*&iñÆK]>j¶¾O=õðë¹$ÐÓëÈcë{%>7X/VÛöûì¼ 2þÎ]Qô.}.E/£/;ÍòKÑ3¸ðâÏò~
µ)3#é*B(èv]Ö¸©§¡na
j¨;¤CêoÒad+&e6ïÖF£0Ð×e:RM7M2FÞi;â'~ô?É3+5ûØì¸FèLãx-bÖÈ˾
ô´ñ*'óæOW³7lÎíl°ÆòÙËÿ¯¸ð÷²àk/ôý´çû²î¼PmÖzf)Ï4ªÚ¨52רuÄôBÄhýon«$°ßYZ¼íVSMb¹°}w×*¨zÑùÊȦY7ÉÚ?
+o£jÓ°ß]ï"+VZðØçlooÈvÕ§ô½9âENè<3PafjuÀÒ³>X®oÌ]ºþ§YÖïKýûumÓ±vÉþ÷/pFìÍÔÓ0®{êN½Ø½¬Zoߨ¶tÝì×q$M>[EMAIL
PROTECTED])^R#ïÂça9rd=±VG_å
ål´îr\ñ¼pÜÊmG6}ªÀC¢¶fìA¯/Û WQ&KU¾
Ê4»I,á£N´SÍPHàëÇkõiþ[®)nÆkðê'ø?O°Å9 jQÓÖ¶¢míJ-|°Z-º"»ÈôP#ÕAÑÕnjÄý
ÛoøU_ÁLÿø§ññl;нèdäñ½uÒ(e%{¼õ^
QWM°-éèäEðÎÂ,ús
¯j¼÷ÁÍj÷3Ô
ïÍÞ¶´RH¿¼8éÙO¡ï1¡&Íù5&ÄNmôèî
ìR¬²,ÅÛÚ«Òù¦íßÒ¨:B*èD¯õýtHÐ\xekkûR\¬·_´WÜ:þRè÷!<ÿ»©hBèóH+ïË!Áü+ÝÐ_×÷Ön:Öv^]ÖJ²½®ì©Ú±\Og}·ã¥öá^)
²ÛÐ'F_±jUtÇBN~£s>0]\ªHXÄ$
£;}«CÿÂhtçx>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôݲÐ&¸3ï9°ÓVäQ~&ò}o|[EMAIL
PROTECTED]
+¾Ì_³{\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.5&r2=1.49.2.6&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.5
php-src/ext/phar/phar/pharcommand.inc:1.49.2.6
--- php-src/ext/phar/phar/pharcommand.inc:1.49.2.5 Mon Jun 2 13:24:15 2008
+++ php-src/ext/phar/phar/pharcommand.inc Mon Jun 2 13:39:54 2008
@@ -137,7 +137,7 @@
'inf' => '<regex> Regular expression for input files to
exclude.'
),
'y' => array(
- 'typ' => 'privke',
+ 'typ' => 'privkey',
'val' => NULL,
'inf' => 'Private key for OpenSSL signing.',
),
@@ -1534,7 +1534,7 @@
$use_ext = extension_loaded('phar');
$version = array(
'PHP Version' => phpversion(),
- 'phar.phar version' => '$Revision: 1.49.2.5 $',
+ 'phar.phar version' => '$Revision: 1.49.2.6 $',
'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not
available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php