date:20080531

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-05-31 Thread changelog

changelog   Sun Jun  1 01:31:54 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3063r2=1.3064diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3063 php-src/ChangeLog:1.3064
--- php-src/ChangeLog:1.3063Sat May 31 01:31:53 2008
+++ php-src/ChangeLog   Sun Jun  1 01:31:54 2008
@@ -1,3 +1,30 @@
+2008-05-31  Marcus Boerger  [EMAIL PROTECTED]
+
+* configure.in:
+  - MFB config stuff
+
+* (PHP_5_3)
+  configure.in
+  ext/phar/Makefile.frag:
+  - Add phar command as installable command
+
+* (PHP_5_3)
+  configure.in:
+  - MFH Add pharcmd to default targets if present
+
+* configure.in:
+  - Add pharcmd to default targets if present
+
+* (PHP_5_3)
+  ext/phar/phar.phar
+  ext/phar/phar/pharcommand.inc:
+  - Add version comand
+
+* (PHP_5_3)
+  ext/phar/phar.phar
+  ext/phar/phar/pharcommand.inc:
+  - MFH Fix function names after they have been refactored
+
 2008-05-30  Greg Beaver  [EMAIL PROTECTED]
 
 * ext/phar/phar.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar /ext/phar/phar pharcommand.inc

2008-05-31 Thread Marcus Boerger

helly   Sat May 31 15:53:16 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar 
/php-src/ext/phar/phar  pharcommand.inc 
  Log:
  - MFH Fix function names after they have been refactored
  http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7r2=1.7.2.1diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7 php-src/ext/phar/phar.phar:1.7.2.1
--- php-src/ext/phar/phar.phar:1.7  Sat Mar 22 01:52:11 2008
+++ php-src/ext/phar/phar.phar  Sat May 31 15:53:16 2008
@@ -21,7 +21,7 @@
  * @author Davey Shafik [EMAIL PROTECTED]
  * @author Greg Beaver [EMAIL PROTECTED]
  * @link http://www.synapticmedia.net Synaptic Media
- * @version $Id: Archive.php,v 1.52 2007/09/01 20:28:14 cellog Exp $
+ * @version $Id: Archive.php,v 1.38 2007/02/06 04:31:45 cellog Exp $
  * @package PHP_Archive
  * @category PHP
  */
@@ -119,254 +119,24 @@
  */
 private $_basename;
 
-
-/**
- * Default MIME types used for the web front controller
- *
- * @var array
- */
-public static $defaultmimes = array(
-'aif' = 'audio/x-aiff',
-'aiff' = 'audio/x-aiff',
-'arc' = 'application/octet-stream',
-'arj' = 'application/octet-stream',
-'art' = 'image/x-jg',
-'asf' = 'video/x-ms-asf',
-'asx' = 'video/x-ms-asf',
-'avi' = 'video/avi',
-'bin' = 'application/octet-stream',
-'bm' = 'image/bmp',
-'bmp' = 'image/bmp',
-'bz2' = 'application/x-bzip2',
-'css' = 'text/css',
-'doc' = 'application/msword',
-'dot' = 'application/msword',
-'dv' = 'video/x-dv',
-'dvi' = 'application/x-dvi',
-'eps' = 'application/postscript',
-'exe' = 'application/octet-stream',
-'gif' = 'image/gif',
-'gz' = 'application/x-gzip',
-'gzip' = 'application/x-gzip',
-'htm' = 'text/html',
-'html' = 'text/html',
-'ico' = 'image/x-icon',
-'jpe' = 'image/jpeg',
-'jpg' = 'image/jpeg',
-'jpeg' = 'image/jpeg',
-'js' = 'application/x-javascript',
-'log' = 'text/plain',
-'mid' = 'audio/x-midi',
-'mov' = 'video/quicktime',
-'mp2' = 'audio/mpeg',
-'mp3' = 'audio/mpeg3',
-'mpg' = 'audio/mpeg',
-'pdf' = 'aplication/pdf',
-'png' = 'image/png',
-'rtf' = 'application/rtf',
-'tif' = 'image/tiff',
-'tiff' = 'image/tiff',
-'txt' = 'text/plain',
-'xml' = 'text/xml',
-);
-
-public static $defaultphp = array(
-'php' = true
-);
-
-public static $defaultphps = array(
-'phps' = true
-);
-
-public static $deny = array('/.+\.inc$/');
-
-public static function viewSource($archive, $file)
-{
-// security, idea borrowed from PHK
-if (!file_exists($archive . '.introspect')) {
-header(HTTP/1.0 404 Not Found);
-return false;
-}
-if (self::_fileExists($archive, $_GET['viewsource'])) {
-$source = highlight_file('phar://@ALIAS@/' .
-$_GET['viewsource'], true);
-header('Content-Type: text/html');
-header('Content-Length: ' . strlen($source));
-echo 'htmlheadtitleSource of ',
-htmlspecialchars($_GET['viewsource']), '/title/head';
-echo 'bodyh1Source of ',
-htmlspecialchars($_GET['viewsource']), '/h1';
-if (isset($_GET['introspect'])) {
-echo 'a href=', htmlspecialchars($_SERVER['PHP_SELF']),
-'?introspect=', 
urlencode(htmlspecialchars($_GET['introspect'])),
-'Return to ', htmlspecialchars($_GET['introspect']), 
'/abr /';
-}
-echo $source;
-return false;
-} else {
-header(HTTP/1.0 404 Not Found);
-return false;
-}
-
-}
-
-public static function introspect($archive, $dir)
-{
-// security, idea borrowed from PHK
-if (!file_exists($archive . '.introspect')) {
-header(HTTP/1.0 404 Not Found);
-return false;
-}
-if (!$dir) {
-$dir = '/';
-}
-$dir = self::processFile($dir);
-if ($dir[0] != '/') {
-$dir = '/' . $dir;
-}
-try {
-$self = htmlspecialchars($_SERVER['PHP_SELF']);
-$iterate = new DirectoryIterator('phar://@ALIAS@' . $dir);
-echo 'htmlheadtitleIntrospect ', htmlspecialchars($dir),
-'/title/headbodyh1Introspect ', htmlspecialchars($dir),
-'/h1ul';
-if ($dir != '/') {
-echo 'lia href=', $self,

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/phar pharcommand.inc

2008-05-31 Thread Marcus Boerger

helly   Sat May 31 16:40:56 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar/phar  pharcommand.inc 
  Log:
  - Add version comand
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.1r2=1.49.2.2diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.1 
php-src/ext/phar/phar/pharcommand.inc:1.49.2.2
--- php-src/ext/phar/phar/pharcommand.inc:1.49.2.1  Sat May 31 15:53:16 2008
+++ php-src/ext/phar/phar/pharcommand.inc   Sat May 31 16:40:55 2008
@@ -1437,6 +1437,63 @@
 }
 }
 // }}}
+// {{{ public function cli_cmd_inf_version
+/**
+ * CLi Command Inf Version
+ *
+ * @return string A description about the info commands.
+ */
+public function cli_cmd_inf_version()
+{
+return Get information about the PHAR environment and the tool 
version.;
+}
+// }}}
+// {{{ public function cli_cmd_arg_version
+/**
+ * Cli Command Arg Version
+ *
+ * @return array The arguments for version command.
+ */
+public function cli_cmd_arg_version()
+{
+return self::phar_args('', NULL);
+}
+// }}}
+// {{{ public function cli_cmd_run_info
+/**
+ * Cli Command Run Info
+ *
+ * @param args $args
+ */
+public function cli_cmd_run_version()
+{
+   $use_ext = extension_loaded('phar');
+   $version = array(
+   'PHP Version' = phpversion(),
+   'phar.phar version' = '$Revision: 1.49.2.2 $',
+   'Phar EXT version' = $use_ext ? phpversion('phar') : 'Not 
available',
+   'Phar API version' = Phar::apiVersion(),
+   'Phar-based phar archives' = true,
+   'Tar-based phar archives' = $use_ext,
+   'ZIP-based phar archives' = $use_ext,
+   'gzip compression' = extension_loaded('zlib'),
+   'bzip2 compression' = extension_loaded('bz2'),
+   'supported signatures' = $use_ext ? join(', ', 
Phar::getSupportedSignatures()) : '',
+   );
+   $klen = 0;
+   foreach($version as $k = $v)
+   {
+   $klen = max($klen, strlen($k));
+   }
+   ++$klen;
+   foreach($version as $k = $v) {
+   if (is_bool($v)) {
+   $v = $v ? 'enabled' : 'disabled';
+   }
+   printf(%-${klen}s  %s\n, $k.':', $v);
+   }
+}
+// }}}
 }
 // }}}
 ?



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar

2008-05-31 Thread Marcus Boerger

helly   Sat May 31 18:40:05 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar 
  Log:
  - Add version comand
  http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.1r2=1.7.2.2diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.1 php-src/ext/phar/phar.phar:1.7.2.2
--- php-src/ext/phar/phar.phar:1.7.2.1  Sat May 31 15:53:16 2008
+++ php-src/ext/phar/phar.phar  Sat May 31 18:40:05 2008
@@ -890,8 +890,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+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ñ\ 
 [EMAIL PROTECTED]@VnZ.ÙbÞ.þ2üê½Ôl,1~#{ZP^ 
Y¤ùüt×5_N/´Äo(á.H¼ªDú R§ë(DêàÁ¹òDúXsG]WÊ^OªQ©LiìÙ
@@ -910,37 +910,45 @@
 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ù»;1AMuñ yZVMjzm  
ªJnÛhà÷gÍß¶)L6-0êCÏ7w43C ¾DCÎMXqDtñ¼Æ{@hí¾ßa 
Á]'Ámý£Ó¼Ñm·æe7ö®*Ãç9ÎÚ³Bª:ê¨Á9vê
Õª!-Ð¨Of¦£? ?.Nþ-f`J-$Üe(V¸Ã¢ô:ï÷/àÔK`8t+T'D$0Ì!`Ï{MCî-$ë.åVíìõî]R»uR'Í{I§×·q²^J$)RKRÝnþ÷|-ô31¬+ÍÖÙ¤J ×Ha.D#èaå*åKU1é¢ø^Ð¬½èùû\$¹«õ8Mo cr1çÕÅÙ«ûÔ¬åù`'=²¸_$Ùl
Øø4Z+«â¢à+WEÐ=dß°ûðß¿Ãÿµû:|R(}úô©vÍ5ðïkö8MØS^1õé'?¬â^È-yN;[EMAIL
 PROTECTED]
-³îIí³ãÑíÁÜå¢ý  |Z¢Ðþ¸f=B=æªî¶®ï· oíX À2¼Dñ5DßÅÃËu
J-¤kÇW?¼/ÀUÀKl0ã:t3`ÂëÝõVUÛL5²ØÐªÒïÒÊÃfÎ~Ë!t|©é1;#PÊQ½ Y)ë'ÑrúùâÇo£aT.âCñýì§Ã¨ý~ó-ø_m5]pl®P
ÞÃ|Âñ+-G¨÷lµ®hÝÊÕºü2Z?É¦÷õ¸
)XF?Z5lÅ5í+\®¢¢¯c0èlÜrEo¤\ää¦¬Ä^¤UêÈòËä#F~ÿ2ØÏÅãLÜG©¿%/ð~¿ì+5ìÒK«~Hó6Y[ÍA8fÏó
   m¢pE^ýôêâDºbD´÷\7QV{Äùf;wBÖß(ús¾fp`ç.Âx 
Dï¢Cø-lJÔM°¼-êYXí6~jþ²ìàD¶\2èÂÕBâÐªõØ
-\}iöºÓÑz\cÕD^±þÌ3  » 
=2D¿¥É8ÚÝ5ösøWïéÎÁ®\ø4ÿ-zMXôô-èzÓé}ØH²B0í@u!?þíþF¸cû÷÷G0ìý!?äNûôÂ.âqB/[EMAIL
 
PROTECTED]/0ðx²±P©;é%¿¦Àd6oà³ÆsAçVùõíúì:k_ð¿ÔÓÔtQ²Ëî±ØîtT;eOÇÔíhõD¢×Ãþýï5(w0çÓ}ØÚèR°êz$»×§;ÍO2fDÀ6²N³iù+xVníL³ð1ÓÏHÛ¯°ÁØzq°Cä¡Å`¿ñI(hmMÊñ5à4¹d2@¾
øèÅALø:r¶L®0ë+IUz×`?³ùPZØà:ÃóÀ%3³5Å³
XÕÀÃª3èÐsªÂ«4¼Ù~¾§¨~»
XU~Ùlá1ÞÁ]°BSîú¨x'06ÁµxðóiB«/¢(C)!÷ÜU´M [EMAIL 
PROTECTED]-Ñ,Éê890c¾jÉe«ÞaKKYÐÂÅª7~1ú473}JxgË¼,¶5±j åDsz¦j*Dû$A«6QÀ¤g#E8$Ä'M«dñÆOÖka,
   ù%ÇãË)Ö6Â1#ÏC[_Ã«Á
¡`2Ø§W.Âß;¼UNë°¥J9ákj 
ó-´ÚKËØ=^pØTþãbozI%SØàçÌh¢`ÑFAFÝqN¯¨ßa,óXûÃRÝFT-%¸Ø'¶GÍöP·ôÌ\hTyßÝ¦PIÄ©¬¶QsÛ7fêmOa½ô)ÔÛOIFÀ8Mòv*Ýe)¬ù-¶ÚÄp)¼.ÄÍÇÿP4ðÄ±ª
 Qo¼Y^ÙXÁIlMH¾ûYÊ/¡Q(ëÔ®ON)[EMAIL PROTECTED],-ã½ö 
Xu¤Ú¹$½g¤÷JRÄÍì!ÇµÖ´«½U#q·?Mräëþgëi©pQnJ(«`å«S±Äíªa¿Ê
loex9vÝ7ÂCu$hS~A9÷ñB\4Pa5JbåQrGåz,ãU!
 
Ekÿd#VQ¸5XEeºª]£xyÀª¼Â½½]De%R+åR|¯Æ?]µb÷§FV(3ÌtÞ[§9Ö#éßO2ðtÁ5¦RºdgÄÍØ^ljâ_ÿ³Ñâ²´cùÊ¬°PTRk+ô}²³Ô-õO[Ù%Ï%¯.PÚ/Èýpùú×uº¥üXbáQª½¿cRbö2¶-3»T,~ñÅîep4£òèH±{¬·Gb${b*4²!»O)èw½a_j/sÐÜß:2f[M.hAi
-  
lôÃ=aãz '6Ì-ÛáIýÔÇ£ñ½wHµéx$vÒÆ·ÿfâÏ¦¦^Ì½ïð`²Ù*£©ò'ßeß{P(#¯ËC=ÄÀ^jÈÚ
-Ö 2ò-êÔY««[EMAIL PROTECTED]£'Ï^\¢}U;Ý·èûc_/¡
-h[EMAIL PROTECTED]
^n¼5¤ÚLA[ó9[¥IAÿ_[f'Ù¡ÖMÚZM}¼nõ¬¥ÖÝv¶Ëªb¼]Ä}¥8ÕÕ·Â:P½ZÓt§SÅ8Hçú;r(fÔ'ú
-¥ÏÔ»rÐ®îèdåë¬k'ñª~äQnFAYÙÝ½Cö,9g§W¢Àu_s5®ä~ääNóÌÙsøNn³hì9DMoZà¦×Íx£|[EMAIL
 PROTECTED]:ÁTªpª±«¢Ãz
+ôv°yïXì³b,ÄíQgaùQfã±¯±ÚM»g!ÈÌÆÂ×*v=_c:LáizÕh¼ò5]é\ú'Ù¶ÓøÊßwMÈFÛº1ñ´Ô±|[EMAIL
 PROTECTED];ÿÍ ôª',yHÅìÑ_)B   
=}ëñ=UYn}ãzï~ôö~¿§|¯Ój#à/~yºû°¼SÒMâà-ÒN¢ªåQiÙÃ¯ªÜæ+KlÕspÁ«ÁÁåO¾àÉtZyÌ¦[âóÐ¦ÇÆqSº¶
 hE¾ëúcÑOç2Ì£M²(Wª$èQÔµ1É%êH¾ºu»õÒªzozmµQ·4à7
î%,áWÏhúyÑ1º´äYöcÍ¿ÕßÙ¹ Ôág:.óÎ¹4õÕr|ÅúSÞXqêÌ1ÎóÇ-¢ÚNæ¹xòÞØýX£¦6ÚXÝÖöBaA®²rGøôéÛÁgß`~ôöÙ«û=Gn2¼$}¯+#1-/íÒ(§F³  xty%,íþ
-EÔ)C¥BÔá|g¸-4JJÕÂ¦Q6áVYÓ1!º¶±/±+¶[Ý»S¦ÁJmC9Ý´[ÞÚ
-KÅÙöcu]W4ÛæÝT_Ý¥ª·tC )|È]8%ÞE£wÑ®YÑ¼]s6
-0ªÝ-wÆ)Ï\º[% ýfK
-   
»»F1dFæ®ÈÔFsCÿÈÊÎÓZoÄÍoÆÙnpÄÉBÜcÊ-¦Q=gC¥·x¤niQ]§|H/=ðbP8¾?Åx¿L:å¡»#ê¨_àÁ~Ö¹ãÔ«t'¹·óùÉ8$ioÜ»ÖbàÄ%\MDÜJ$Sre:S?;´J´DV-4
[EMAIL PROTECTED] ¦y+ªúX$Îº{àµê32y¥ªJ¿M}wBß¬/ËKLW7hYq\ 
É½M~ä+T\CÒë¿²ÑhDÓ²ÝVÆ®;ä8¹m¾ä#Á\Ùÿ~¥«X(¡B  ãú sò·Ån^¢Òíß
-Bîm$³03÷ÊÑÍ[?5(ç¾òÞëÀá¤.ÆGüª© äqÔÊò]íëºýÕv5½ÕS×Y½×Â,to 
½¨§±YK^àSÑ¦H66ò¼õYU_¶¹ÛaÐBWvû(*ëhµä 
{°XT_g#7fõÃ¶µÈ®§N¶`ÈÈ©2©¬®DrÅ°Ef=×§Â¼ÞUJ¡í)Ö#È;ÙY}ZîR·Ùêöd9Cì¼S§[Æ|ÜIRï°ßNÿþÿ¨îç9ªk,ÆM÷³Âie4G¾ÔFÖØÄJ]e£ZúmºÕMUù£Óí§êvúhÊMª¼§ÏIN£¨Ií{ µ¸ÿ3Wã;uÿØ
-ü02µ Øn¥È:Ä¼h(¨l¦+OÆ1÷ù1ë«Z,xGjSÖO LÌodO 9ôÏ{rËrCµ¢ïJ¯b 
P¤óÊ

[PHP-CVS] cvs: php-src(PHP_5_3) /pear fetch.php

2008-05-31 Thread Hannes Magnusson

bjori   Sat May 31 19:05:19 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/pear   fetch.php 
  Log:
  Add support for proxies (patch by Christopher Jones)
  
  
http://cvs.php.net/viewvc.cgi/php-src/pear/fetch.php?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/pear/fetch.php
diff -u php-src/pear/fetch.php:1.1.2.2 php-src/pear/fetch.php:1.1.2.3
--- php-src/pear/fetch.php:1.1.2.2  Fri May 30 23:42:50 2008
+++ php-src/pear/fetch.php  Sat May 31 19:05:19 2008
@@ -50,7 +50,18 @@
 
 isset($argv[1], $argv[2]) or usage($argv);
 
-$ctx = stream_context_create(null, array(notification = 
stream_notification_callback));
+if (!isset($_ENV['http_proxy'])) {
+$copt = null;
+} else {
+$copt = array(
+'http' = array(
+'proxy' = preg_replace('/^http/i', 'tcp', $_ENV['http_proxy']),
+'request_fulluri' = true,
+),
+);
+}
+
+$ctx = stream_context_create($copt, array(notification = 
stream_notification_callback));
 
 $fp = fopen($argv[1], r, false, $ctx);
 if (is_resource($fp)  file_put_contents($argv[2], $fp)) {



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

[PHP-CVS] cvs: php-src / configure.in

2008-05-31 Thread Marcus Boerger

helly   Sat May 31 19:27:23 2008 UTC

  Modified files:  
/php-srcconfigure.in 
  Log:
  - Add pharcmd to default targets if present
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.654r2=1.655diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.654 php-src/configure.in:1.655
--- php-src/configure.in:1.654  Fri May 23 19:10:01 2008
+++ php-src/configure.inSat May 31 19:27:23 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.654 2008/05/23 19:10:01 tony2001 Exp $ -*- autoconf 
-*-
+## $Id: configure.in,v 1.655 2008/05/31 19:27:23 helly Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1274,7 +1274,13 @@
 INLINE_CFLAGS=$INLINE_CFLAGS $standard_libtool_flag
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
-all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) 
\$(PHP_CLI_TARGET)
+if test $PHP_PHAR != no  test $PHP_CLI != no; then
+  PHARCMD=pharcmd
+else
+  PHARCMD=
+fi;
+
+all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) 
\$(PHP_CLI_TARGET) $PHARCMD
 install_targets=$install_modules install-build install-headers 
install-programs
 
 case $PHP_SAPI in



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

[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in

2008-05-31 Thread Marcus Boerger

helly   Sat May 31 19:27:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcconfigure.in 
  Log:
  - MFH Add pharcmd to default targets if present
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.16r2=1.579.2.52.2.77.2.17diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77.2.16 
php-src/configure.in:1.579.2.52.2.77.2.17
--- php-src/configure.in:1.579.2.52.2.77.2.16   Fri May 23 19:10:39 2008
+++ php-src/configure.inSat May 31 19:27:31 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77.2.16 2008/05/23 19:10:39 tony2001 Exp $ 
-*- autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.17 2008/05/31 19:27:31 helly Exp $ 
-*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1348,7 +1348,13 @@
 INLINE_CFLAGS=$INLINE_CFLAGS $standard_libtool_flag
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
-all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) 
\$(PHP_CLI_TARGET)
+if test $PHP_PHAR != no  test $PHP_CLI != no; then
+  PHARCMD=pharcmd
+else
+  PHARCMD=
+fi;
+
+all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) 
\$(PHP_CLI_TARGET) $PHARCMD
 install_targets=$install_modules install-build install-headers 
install-programs $install_pear
 
 case $PHP_SAPI in



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

[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in /ext/phar Makefile.frag

2008-05-31 Thread Marcus Boerger

helly   Sat May 31 20:02:57 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   Makefile.frag 
/php-srcconfigure.in 
  Log:
  - Add phar command as installable command
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/Makefile.frag?r1=1.14r2=1.14.2.1diff_format=u
Index: php-src/ext/phar/Makefile.frag
diff -u php-src/ext/phar/Makefile.frag:1.14 
php-src/ext/phar/Makefile.frag:1.14.2.1
--- php-src/ext/phar/Makefile.frag:1.14 Wed Jan  9 00:58:36 2008
+++ php-src/ext/phar/Makefile.frag  Sat May 31 20:02:57 2008
@@ -23,3 +23,7 @@
$$PHP -d phar.readonly=0 $(srcdir)/phar.php pack -f 
$(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s 
$(srcdir)/phar/phar.php -h sha1 -b $$BANG  $(srcdir)/phar/
@chmod +x $(builddir)/phar.phar
 
+install-pharcmd: pharcmd
+   [EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+   @$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
+
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.17r2=1.579.2.52.2.77.2.18diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77.2.17 
php-src/configure.in:1.579.2.52.2.77.2.18
--- php-src/configure.in:1.579.2.52.2.77.2.17   Sat May 31 19:27:31 2008
+++ php-src/configure.inSat May 31 20:02:57 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77.2.17 2008/05/31 19:27:31 helly Exp $ 
-*- autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.18 2008/05/31 20:02:57 helly Exp $ 
-*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1350,12 +1350,14 @@
 
 if test $PHP_PHAR != no  test $PHP_CLI != no; then
   PHARCMD=pharcmd
+  PHARCMD_INSTALL=install-pharcmd
 else
   PHARCMD=
+  PHARCMD_INSTALL=
 fi;
 
 all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) 
\$(PHP_CLI_TARGET) $PHARCMD
-install_targets=$install_modules install-build install-headers 
install-programs $install_pear
+install_targets=$install_modules install-build install-headers 
install-programs $install_pear $PHARCMD_INSTALL
 
 case $PHP_SAPI in
   cli)



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/phar clicommand.inc

2008-05-31 Thread Marcus Boerger

helly   Sat May 31 20:24:34 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar/phar  clicommand.inc 
  Log:
  - MFH Add 'help commands' support
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/clicommand.inc?r1=1.23r2=1.23.4.1diff_format=u
Index: php-src/ext/phar/phar/clicommand.inc
diff -u php-src/ext/phar/phar/clicommand.inc:1.23 
php-src/ext/phar/phar/clicommand.inc:1.23.4.1
--- php-src/ext/phar/phar/clicommand.inc:1.23   Fri Nov 23 05:51:58 2007
+++ php-src/ext/phar/phar/clicommand.incSat May 31 20:24:34 2008
@@ -316,6 +316,10 @@
 
 $which = $which[0];
 if (!array_key_exists($which, $this-cmds)) {
+   if (strtolower($which) == 'commands') {
+   self::cli_cmd_run_help_list();
+   exit(0);
+   }
 self::error(Unknown command, cannot retrieve help.\n);
 }
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/phar clicommand.inc

2008-05-31 Thread Marcus Boerger

helly   Sat May 31 20:30:27 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar/phar  clicommand.inc 
  Log:
  - MFH Simplify
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/clicommand.inc?r1=1.23.4.1r2=1.23.4.2diff_format=u
Index: php-src/ext/phar/phar/clicommand.inc
diff -u php-src/ext/phar/phar/clicommand.inc:1.23.4.1 
php-src/ext/phar/phar/clicommand.inc:1.23.4.2
--- php-src/ext/phar/phar/clicommand.inc:1.23.4.1   Sat May 31 20:24:34 2008
+++ php-src/ext/phar/phar/clicommand.incSat May 31 20:30:27 2008
@@ -370,11 +370,7 @@
 function cli_cmd_run_help_list()
 {
 ksort($this-cmds);
-$lst = '';
-foreach($this-cmds as $name = $funcs) {
-$lst .= $name . ' ';
-}
-echo substr($lst, 0, -1) . \n;
+echo join(' ', array_keys($this-cmds)) . \n;
 }
 }
 



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

[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests bug45139.phpt

2008-05-31 Thread Felipe Pena

felipe  Sun Jun  1 03:13:54 2008 UTC

  Modified files:  
/php-src/ext/reflection php_reflection.c 
/php-src/ext/reflection/tests   bug45139.phpt 
  Log:
  - MFB: Fixed bug #45139 (ReflectionProperty returns incorrect declaring class)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.295r2=1.296diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.295 
php-src/ext/reflection/php_reflection.c:1.296
--- php-src/ext/reflection/php_reflection.c:1.295   Mon Feb 18 14:31:01 2008
+++ php-src/ext/reflection/php_reflection.c Sun Jun  1 03:13:54 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.295 2008/02/18 14:31:01 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.296 2008/06/01 03:13:54 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4202,7 +4202,7 @@
prop_name_len = USTR_LEN(prop_name);
ce = tmp_ce = ref-ce;
while (tmp_ce  zend_u_hash_find(tmp_ce-properties_info, 
UG(unicode)?IS_UNICODE:IS_STRING, prop_name, prop_name_len + 1, (void **) 
tmp_info) == SUCCESS) {
-   if (tmp_info-flags  ZEND_ACC_PRIVATE) {
+   if (tmp_info-flags  ZEND_ACC_PRIVATE || tmp_info-flags  
ZEND_ACC_SHADOW) {
/* it's a private property, so it can't be inherited */
break;
}
@@ -5060,7 +5060,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.295 
2008/02/18 14:31:01 dmitry Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.296 
2008/06/01 03:13:54 felipe Exp $);
 
php_info_print_table_end();
 } /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug45139.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/reflection/tests/bug45139.phpt
diff -u /dev/null php-src/ext/reflection/tests/bug45139.phpt:1.2
--- /dev/null   Sun Jun  1 03:13:54 2008
+++ php-src/ext/reflection/tests/bug45139.phpt  Sun Jun  1 03:13:54 2008
@@ -0,0 +1,58 @@
+--TEST--
+Bug #45139 (ReflectionProperty returns incorrect declaring class)
+--FILE--
+?php
+
+class A {
+   private $foo;
+}
+
+class B extends A {
+   protected $bar;
+   private $baz;
+   private $quux;
+}
+
+class C extends B {
+   public $foo;
+   private $baz;
+   protected $quux;
+}
+
+$rc = new ReflectionClass('C');
+$rp = $rc-getProperty('foo');
+var_dump($rp-getDeclaringClass()-getName()); // c
+
+$rc = new ReflectionClass('A');
+$rp = $rc-getProperty('foo');
+var_dump($rp-getDeclaringClass()-getName()); // A
+
+$rc = new ReflectionClass('B');
+$rp = $rc-getProperty('bar');
+var_dump($rp-getDeclaringClass()-getName()); // B
+
+$rc = new ReflectionClass('C');
+$rp = $rc-getProperty('bar');
+var_dump($rp-getDeclaringClass()-getName()); // B
+
+$rc = new ReflectionClass('C');
+$rp = $rc-getProperty('baz');
+var_dump($rp-getDeclaringClass()-getName()); // C
+
+$rc = new ReflectionClass('B');
+$rp = $rc-getProperty('baz');
+var_dump($rp-getDeclaringClass()-getName()); // B
+
+$rc = new ReflectionClass('C');
+$rp = $rc-getProperty('quux');
+var_dump($rp-getDeclaringClass()-getName()); // C
+
+?
+--EXPECT--
+unicode(1) C
+unicode(1) A
+unicode(1) B
+unicode(1) B
+unicode(1) C
+unicode(1) B
+unicode(1) C



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c /ext/reflection/tests bug45139.phpt

2008-05-31 Thread Felipe Pena

felipe  Sun Jun  1 03:11:38 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/reflection/tests   bug45139.phpt 

  Modified files:  
/php-src/ext/reflection php_reflection.c 
  Log:
  - MFB: Fixed bug #45139 (ReflectionProperty returns incorrect declaring class)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.14r2=1.164.2.33.2.45.2.15diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.14 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.15
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.14Mon Feb 
18 14:30:44 2008
+++ php-src/ext/reflection/php_reflection.c Sun Jun  1 03:11:37 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.14 2008/02/18 14:30:44 dmitry Exp 
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.15 2008/06/01 03:11:37 felipe Exp 
$ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4092,7 +4092,7 @@
prop_name_len = strlen(prop_name);
ce = tmp_ce = ref-ce;
while (tmp_ce  zend_hash_find(tmp_ce-properties_info, prop_name, 
prop_name_len + 1, (void **) tmp_info) == SUCCESS) {
-   if (tmp_info-flags  ZEND_ACC_PRIVATE) {
+   if (tmp_info-flags  ZEND_ACC_PRIVATE || tmp_info-flags  
ZEND_ACC_SHADOW) {
/* it's a private property, so it can't be inherited */
break;
}
@@ -4944,7 +4944,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.45.2.14 2008/02/18 14:30:44 dmitry Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.45.2.15 2008/06/01 03:11:37 felipe Exp $);
 
php_info_print_table_end();
 } /* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug45139.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/bug45139.phpt
+++ php-src/ext/reflection/tests/bug45139.phpt



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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar /ext/phar/phar pharcommand.inc

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/phar pharcommand.inc

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar

[PHP-CVS] cvs: php-src(PHP_5_3) /pear fetch.php

[PHP-CVS] cvs: php-src / configure.in

[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in

[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in /ext/phar Makefile.frag

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/phar clicommand.inc

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/phar clicommand.inc

[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests bug45139.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c /ext/reflection/tests bug45139.phpt

12 matches

Site Navigation

Mail list logo

Footer information