[PHP-CVS] svn: /SVNROOT/ pear_avail
davidc Wed, 16 Mar 2011 10:56:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309299 Log: Added Till as a new QA member thereby giving him access to the whole tree. Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2011-03-16 10:31:38 UTC (rev 309298) +++ SVNROOT/pear_avail 2011-03-16 10:56:51 UTC (rev 309299) @@ -13,7 +13,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,! tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte,timj,taak,ssuceveanu,bate,anant,hirose31,amistry,thesee,jausions,ostborn,wiesemann,amir,clockwerx,jespino|pear/packages,pear/peardoc,pear2 +avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,! tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte,timj,taak,ssuceveanu,bate,anant,hirose31,amistry,thesee,jausions,ostborn,wiesemann,amir,clockwerx,jespino,till|pear/packages,pear/peardoc,pear2 # The PEAR group has access to pear* avail|ashnazg,clockwerx,cweiske,gauthierm,kguest,saltybeagle,shupp|pear -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
davidc Sun, 13 Mar 2011 01:26:11 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309147 Log: Added till to have karma on Net_URL2 Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2011-03-12 20:57:11 UTC (rev 309146) +++ SVNROOT/pear_avail 2011-03-13 01:26:11 UTC (rev 309147) @@ -144,7 +144,7 @@ avail|patchworker|pear/packages/Text_Wiki avail|c0il|pear/packages/PHP_Debug,pear/peardoc avail|dw31415|pear/packages/Structures_DataGrid_DataSource_SQLQuery -avail|till|pear/packages/Contact_Vcard_Build,pear/packages/Contact_Vcard_Parse,pear/packages/File_IMC,pear/packages/HTTP_Session2,pear/packages/Mail_Queue,pear/packages/Net_CheckIP2,pear/packages/Services_ProjectHoneyPot +avail|till|pear/packages/Contact_Vcard_Build,pear/packages/Contact_Vcard_Parse,pear/packages/File_IMC,pear/packages/HTTP_Session2,pear/packages/Mail_Queue,pear/packages/Net_CheckIP2,pear/packages/Services_ProjectHoneyPot,pear/Net_URL2 avail|sprice|pear/peardoc,pear/packages/HTML_BBCodeParser avail|onur|pear/peardoc/tr avail|cybot|pear/packages/SQL_Parser -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
davidc Sun, 13 Mar 2011 01:29:00 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309148 Log: Used the good path to the package. Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2011-03-13 01:26:11 UTC (rev 309147) +++ SVNROOT/pear_avail 2011-03-13 01:29:00 UTC (rev 309148) @@ -144,7 +144,7 @@ avail|patchworker|pear/packages/Text_Wiki avail|c0il|pear/packages/PHP_Debug,pear/peardoc avail|dw31415|pear/packages/Structures_DataGrid_DataSource_SQLQuery -avail|till|pear/packages/Contact_Vcard_Build,pear/packages/Contact_Vcard_Parse,pear/packages/File_IMC,pear/packages/HTTP_Session2,pear/packages/Mail_Queue,pear/packages/Net_CheckIP2,pear/packages/Services_ProjectHoneyPot,pear/Net_URL2 +avail|till|pear/packages/Contact_Vcard_Build,pear/packages/Contact_Vcard_Parse,pear/packages/File_IMC,pear/packages/HTTP_Session2,pear/packages/Mail_Queue,pear/packages/Net_CheckIP2,pear/packages/Services_ProjectHoneyPot,pear/packages/Net_URL2 avail|sprice|pear/peardoc,pear/packages/HTML_BBCodeParser avail|onur|pear/peardoc/tr avail|cybot|pear/packages/SQL_Parser -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
davidc Wed, 09 Jun 2010 17:03:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=300320 Log: Added jlodgson to pear2/sandbox/phpDocumentor2 Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2010-06-09 16:32:54 UTC (rev 300319) +++ SVNROOT/pear_avail 2010-06-09 17:03:53 UTC (rev 300320) @@ -31,6 +31,7 @@ avail|amir|pear2/sandbox/SimpleChannelFrontend avail|gregorycu|pear2/sandbox/Templates_IT avail|sstratton|pear2/sandbox/phpDocumentor2 +avail|jlodgson|pear2/sandbox/phpDocumentor2 # Some people get access to the peardoc avail|ebihara,vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,mfonda,shimooka,jystewart,xolphin,takagi,aashley,cortesi,webdi,colder,zefredz,ifeghali,lithis,dw31415,weierophinney,linemayr,till,mcorne,mumumu|pear/peardoc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
davidc Wed, 09 Jun 2010 17:10:16 + Revision: http://svn.php.net/viewvc?view=revisionrevision=300322 Log: pear-avail : Typo in the username. Its not jlodgson but jlogsdon Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2010-06-09 17:10:16 UTC (rev 300321) +++ SVNROOT/pear_avail 2010-06-09 17:10:16 UTC (rev 300322) @@ -31,7 +31,7 @@ avail|amir|pear2/sandbox/SimpleChannelFrontend avail|gregorycu|pear2/sandbox/Templates_IT avail|sstratton|pear2/sandbox/phpDocumentor2 -avail|jlodgson|pear2/sandbox/phpDocumentor2 +avail|jlogsdon|pear2/sandbox/phpDocumentor2 # Some people get access to the peardoc avail|ebihara,vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,mfonda,shimooka,jystewart,xolphin,takagi,aashley,cortesi,webdi,colder,zefredz,ifeghali,lithis,dw31415,weierophinney,linemayr,till,mcorne,mumumu|pear/peardoc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
davidc Sun, 25 Apr 2010 12:48:25 + Revision: http://svn.php.net/viewvc?view=revisionrevision=298500 Log: - Gave access to khan to DB_NestedSet Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2010-04-25 12:47:22 UTC (rev 298499) +++ SVNROOT/pear_avail 2010-04-25 12:48:25 UTC (rev 298500) @@ -198,6 +198,7 @@ avail|blacksun|pear/packages/PHP_CodeSniffer avail|gregorycu|pear/packages/HTML_Template_IT avail|silospen|pear/packages/Net_SMPP +avail|khan|pear/packages/DB_NestedSet # But members of the PHP Group get access to everything. # Note: This line MUST be at the end so that it overrides any unavail settings avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
davidc Sun, 28 Feb 2010 22:43:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=295604 Log: - After approving gregorycu I've given him karma to HTML_Template_IT Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2010-02-28 22:40:15 UTC (rev 295603) +++ SVNROOT/pear_avail 2010-02-28 22:43:34 UTC (rev 295604) @@ -195,7 +195,7 @@ avail|richsage|pear/packages/Image_QRCode avail|martineriksen|pear/packages/Validate avail|blacksun|pear/packages/PHP_CodeSniffer - +avail|gregorycu|pear/packages/HTML_Template_IT # But members of the PHP Group get access to everything. # Note: This line MUST be at the end so that it overrides any unavail settings avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/phar/tests/tar/ bug49910.phpt
davidc Thu, 12 Nov 2009 17:45:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290603
Log:
- Added an extra skipif for zlib
Changed paths:
U php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt
Modified: php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt
===
--- php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt 2009-11-12 17:44:57 UTC
(rev 290602)
+++ php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt 2009-11-12 17:45:08 UTC
(rev 290603)
@@ -2,6 +2,7 @@
Bug #49910: no support for ././@LongLink for long filenames in phar tar support
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip); ?
+?php if (!extension_loaded(zlib)) die(skip); ?
--FILE--
?php
$fname = str_replace('\\', '/', dirname(__FILE__) .
'/files/Structures_Graph-1.0.3.tgz');
@@ -46,4 +47,4 @@
[27] = phar://*/Structures_Graph-1.0.3/tests/testCase/BasicGraph.php
[28] = phar://*/package.xml
)
-===DONE===
\ No newline at end of file
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/phar/tests/tar/ bug49910.phpt
davidc Thu, 12 Nov 2009 17:47:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290606
Log:
- MFH: Added test for bug 49910 for phar
Bug: http://bugs.php.net/49910 (Assigned) no support for ././@LongLink for long
filenames in phar tar support
Changed paths:
A php/php-src/branches/PHP_5_3/ext/phar/tests/tar/bug49910.phpt
Added: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/bug49910.phpt
===
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/bug49910.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/bug49910.phpt
2009-11-12 17:47:17 UTC (rev 290606)
@@ -0,0 +1,50 @@
+--TEST--
+Bug #49910: no support for ././@LongLink for long filenames in phar tar support
+--SKIPIF--
+?php if (!extension_loaded(phar)) die(skip); ?
+?php if (!extension_loaded(zlib)) die(skip); ?
+--FILE--
+?php
+$fname = str_replace('\\', '/', dirname(__FILE__) .
'/files/Structures_Graph-1.0.3.tgz');
+$tar = new PharData($fname);
+$files = array();
+foreach (new RecursiveIteratorIterator($tar) as $file) {
+ $files[] = str_replace($fname, '*', $file-getPathName());
+}
+print_r($files);
+?
+===DONE===
+--EXPECT--
+Array
+(
+[0] = phar://*/Structures_Graph-1.0.3/LICENSE
+[1] =
phar://*/Structures_Graph-1.0.3/Structures/Graph/Manipulator/AcyclicTest.php
+[2] =
phar://*/Structures_Graph-1.0.3/Structures/Graph/Manipulator/TopologicalSorter.php
+[3] = phar://*/Structures_Graph-1.0.3/Structures/Graph/Node.php
+[4] = phar://*/Structures_Graph-1.0.3/Structures/Graph.php
+[5] = phar://*/Structures_Graph-1.0.3/docs/generate.sh
+[6] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/Structures_Graph.html
+[7] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html
+[8] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html
+[9] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/Structures_Graph_Node.html
+[10] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html
+[11] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html
+[12] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/_Structures_Graph_Node_php.html
+[13] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/_Structures_Graph_php.html
+[14] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html
+[15] =
phar://*/Structures_Graph-1.0.3/docs/html/classtrees_Structures_Graph.html
+[16] = phar://*/Structures_Graph-1.0.3/docs/html/elementindex.html
+[17] =
phar://*/Structures_Graph-1.0.3/docs/html/elementindex_Structures_Graph.html
+[18] = phar://*/Structures_Graph-1.0.3/docs/html/errors.html
+[19] = phar://*/Structures_Graph-1.0.3/docs/html/index.html
+[20] = phar://*/Structures_Graph-1.0.3/docs/html/li_Structures_Graph.html
+[21] = phar://*/Structures_Graph-1.0.3/docs/html/media/banner.css
+[22] = phar://*/Structures_Graph-1.0.3/docs/html/media/stylesheet.css
+[23] = phar://*/Structures_Graph-1.0.3/docs/html/packages.html
+[24] = phar://*/Structures_Graph-1.0.3/docs/html/todolist.html
+[25] =
phar://*/Structures_Graph-1.0.3/docs/tutorials/Structures_Graph/Structures_Graph.pkg
+[26] = phar://*/Structures_Graph-1.0.3/tests/AllTests.php
+[27] = phar://*/Structures_Graph-1.0.3/tests/testCase/BasicGraph.php
+[28] = phar://*/package.xml
+)
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
davidc Wed, 04 Nov 2009 16:10:25 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290207 Log: Added cschmitz in the list of Spreadsheet_Excel_writer Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2009-11-04 16:09:07 UTC (rev 290206) +++ SVNROOT/pear_avail 2009-11-04 16:10:25 UTC (rev 290207) @@ -176,6 +176,7 @@ avail|mrook|pear/packages/VersionControl_SVN,pear/packages/Archive_Tar avail|bishop|pear/packages/Net_SMS avail|progi1984|pear/packages/Spreadsheet_Excel_Writer +avail|cschmitz|pear/packages/Spreadsheet_Excel_Writer avail|brion|pear/packages/File_Gettext avail|izi,jstump,shupp|pear/packages/Services_Twitter avail|demrit|pear/packages/HTML_Safe -- 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/xsl xsltprocessor.c
davidc Sun May 10 19:59:47 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xslxsltprocessor.c
Log:
- Removed the RETURN_TRUE to keep consistency with documentation. This
function
is supposed to be void registerPHPFunctions
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.16r2=1.39.2.2.2.9.2.17diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.16
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.17
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.16 Sun May 10 15:13:05 2009
+++ php-src/ext/xsl/xsltprocessor.c Sun May 10 19:59:47 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.16 2009/05/10 15:13:05 felipe Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.17 2009/05/10 19:59:47 davidc Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -814,7 +814,6 @@
zend_hash_move_forward(Z_ARRVAL_P(array_value));
}
intern-registerPhpFunctions = 2;
- RETURN_TRUE;
} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
ZEND_NUM_ARGS() TSRMLS_CC, s, name, name_len) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c
davidc Sun May 10 20:00:59 2009 UTC
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
- MFB: Removed the RETURN_TRUE to keep consistency with documentation.
This function is supposed to be void registerPHPFunctions
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.74r2=1.75diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.74
php-src/ext/xsl/xsltprocessor.c:1.75
--- php-src/ext/xsl/xsltprocessor.c:1.74Sun May 10 15:12:32 2009
+++ php-src/ext/xsl/xsltprocessor.c Sun May 10 20:00:58 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.74 2009/05/10 15:12:32 felipe Exp $ */
+/* $Id: xsltprocessor.c,v 1.75 2009/05/10 20:00:58 davidc Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -847,7 +847,6 @@
zend_hash_move_forward(Z_ARRVAL_P(array_value));
}
intern-registerPhpFunctions = 2;
- RETURN_TRUE;
} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
ZEND_NUM_ARGS() TSRMLS_CC, t, name, name_len, name_type) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id
TSRMLS_CC);
--
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) /main output.c /tests/output bug46897.phpt
davidc Fri Feb 13 11:48:17 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/tests/output bug46897.phpt
Modified files:
/php-src/main output.c
Log:
- Fixed bug #46897: ob_flush() should fail to flush unerasable buffers
- Added test for bug46897
- A memleak has been identified while fixing this bug but the changes
made by this commit do not affect ob_get_clean where the memleak (which
is fixed in HEAD with the new handler) resides.
- [DOC] New noticed is outputted in ob_flush when the buffer is unerasable
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.4.2.11r2=1.167.2.3.2.4.2.12diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.3.2.4.2.11
php-src/main/output.c:1.167.2.3.2.4.2.12
--- php-src/main/output.c:1.167.2.3.2.4.2.11Wed Jan 7 18:34:18 2009
+++ php-src/main/output.c Fri Feb 13 11:48:17 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: output.c,v 1.167.2.3.2.4.2.11 2009/01/07 18:34:18 felipe Exp $ */
+/* $Id: output.c,v 1.167.2.3.2.4.2.12 2009/02/13 11:48:17 davidc Exp $ */
#include php.h
#include ext/standard/head.h
@@ -774,6 +774,11 @@
RETURN_FALSE;
}
+ if (!OG(active_ob_buffer).status !OG(active_ob_buffer).erase) {
+ php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to flush buffer %s., OG(active_ob_buffer).handler_name);
+ RETURN_FALSE;
+ }
+
php_end_ob_buffer(1, 1 TSRMLS_CC);
RETURN_TRUE;
}
http://cvs.php.net/viewvc.cgi/php-src/tests/output/bug46897.phpt?view=markuprev=1.1
Index: php-src/tests/output/bug46897.phpt
+++ php-src/tests/output/bug46897.phpt
--
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) / NEWS
davidc Fri Feb 13 11:54:06 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Fixed bug #46897: (ob_flush() should fail to flush unerasable buffers) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.491r2=1.2027.2.547.2.965.2.492diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.491 php-src/NEWS:1.2027.2.547.2.965.2.492 --- php-src/NEWS:1.2027.2.547.2.965.2.491 Fri Feb 13 11:21:59 2009 +++ php-src/NEWSFri Feb 13 11:54:05 2009 @@ -12,6 +12,7 @@ - Fixed bug #45432 (PDO: persistent connection leak). (Felipe) - Fixed bug #43831 ($this gets mangled when extending PDO with persistent connection). (Felipe) +- Fixed bug #46897 (ob_flush() should fail to flush unerasable buffers). (David C.) 29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) -- 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) / NEWS
davidc Fri Feb 13 12:21:07 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Good bug # order. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.492r2=1.2027.2.547.2.965.2.493diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.492 php-src/NEWS:1.2027.2.547.2.965.2.493 --- php-src/NEWS:1.2027.2.547.2.965.2.492 Fri Feb 13 11:54:05 2009 +++ php-src/NEWSFri Feb 13 12:21:06 2009 @@ -7,12 +7,12 @@ - Fixed bug #47229 (preg_quote() should escape the '-' char). (Nuno) - Fixed bug #47085 (rename() returns true even if the file in PHAR does not exist). (Greg) - Fixed bug #47031 (Fix constants in DualIterator example). (Etienne) +- Fixed bug #46897 (ob_flush() should fail to flush unerasable buffers). (David C.) - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) - Fixed bug #46048 (SimpleXML top-level @attributes not part of iterator). (David C.) - Fixed bug #45432 (PDO: persistent connection leak). (Felipe) - Fixed bug #43831 ($this gets mangled when extending PDO with persistent connection). (Felipe) -- Fixed bug #46897 (ob_flush() should fail to flush unerasable buffers). (David C.) 29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c /ext/simplexml/tests bug46048.phpt
2009/2/4 Ilia Alshanetsky i...@prohost.org: MFH to 5.2? This bug doesn't happen in 5.2. It was introduced in HEAD then 5.3 by adding the debugging object helpers. Cheers, -- Slan, David -- 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/simplexml simplexml.c /ext/simplexml/tests bug46048.phpt
davidc Tue Feb 3 21:42:36 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/simplexml/testsbug46048.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- Fixed Bug #46048 (SimpleXML top-level @attributes not part of iterator)
- Added test for bug #46048
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.30r2=1.151.2.22.2.35.2.31diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.30
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.31
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.30 Wed Dec 31
11:15:43 2008
+++ php-src/ext/simplexml/simplexml.c Tue Feb 3 21:42:35 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.30 2008/12/31 11:15:43 sebastian Exp $
*/
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.31 2009/02/03 21:42:35 davidc Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1087,7 +1087,7 @@
if (!node) {
return rv;
}
- if (is_debug) {
+ if (is_debug || sxe-iter.type != SXE_ITER_CHILD) {
if (sxe-iter.type == SXE_ITER_ELEMENT) {
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
}
@@ -2555,7 +2555,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision:
1.151.2.22.2.35.2.30 $);
+ php_info_print_table_row(2, Revision, $Revision:
1.151.2.22.2.35.2.31 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug46048.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug46048.phpt
+++ php-src/ext/simplexml/tests/bug46048.phpt
--
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) / NEWS
davidc Tue Feb 3 21:45:19 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Added news item for Bugfix #46048 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.485r2=1.2027.2.547.2.965.2.486diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.485 php-src/NEWS:1.2027.2.547.2.965.2.486 --- php-src/NEWS:1.2027.2.547.2.965.2.485 Tue Feb 3 18:56:25 2009 +++ php-src/NEWSTue Feb 3 21:45:19 2009 @@ -8,6 +8,7 @@ - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) - Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after end of stream). (Greg) +- Fixed bug #46048 (SimpleXML top-level @attributes not part of iterator). (David C.) 29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests bug46048.phpt
davidc Wed Feb 4 00:07:27 2009 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/testsbug46048.phpt
Log:
- MFB (Fixed Bug #46048: SimpleXML top-level @attributes not in iterator).
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.271r2=1.272diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.271
php-src/ext/simplexml/simplexml.c:1.272
--- php-src/ext/simplexml/simplexml.c:1.271 Wed Dec 31 11:12:35 2008
+++ php-src/ext/simplexml/simplexml.c Wed Feb 4 00:07:27 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.271 2008/12/31 11:12:35 sebastian Exp $ */
+/* $Id: simplexml.c,v 1.272 2009/02/04 00:07:27 davidc Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1081,7 +1081,7 @@
if (!node) {
return rv;
}
- if (is_debug) {
+ if (is_debug || sxe-iter.type != SXE_ITER_CHILD) {
if (sxe-iter.type == SXE_ITER_ELEMENT) {
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
}
@@ -2634,7 +2634,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.271 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.272 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug46048.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/simplexml/tests/bug46048.phpt
diff -u /dev/null php-src/ext/simplexml/tests/bug46048.phpt:1.2
--- /dev/null Wed Feb 4 00:07:27 2009
+++ php-src/ext/simplexml/tests/bug46048.phpt Wed Feb 4 00:07:27 2009
@@ -0,0 +1,24 @@
+--TEST--
+Bug #46048 (SimpleXML top-level @attributes not part of iterator)
+--FILE--
+?php
+$xml = '
+data id=1
+keyvalue/key
+/data
+';
+$obj = simplexml_load_string($xml);
+print_r(get_object_vars($obj));
+echo Done\n;
+?
+--EXPECT--
+Array
+(
+[...@attributes] = Array
+(
+[id] = 1
+)
+
+[key] = value
+)
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests heap_007.phpt pqueue_003.phpt
davidc Sat Nov 22 14:17:41 2008 UTC Modified files: /php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt Log: - Added tests for bug #46615 (Adjustments) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/heap_007.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/spl/tests/heap_007.phpt diff -u php-src/ext/spl/tests/heap_007.phpt:1.2 php-src/ext/spl/tests/heap_007.phpt:1.3 --- php-src/ext/spl/tests/heap_007.phpt:1.2 Sat May 24 14:12:00 2008 +++ php-src/ext/spl/tests/heap_007.phpt Sat Nov 22 14:17:40 2008 @@ -24,8 +24,8 @@ --EXPECTF-- count($h) = 4 $h-count() = 4 -4=5 -3=4 -2=1 -1=0 +3=5 +2=4 +1=1 +0=0 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/pqueue_003.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/spl/tests/pqueue_003.phpt diff -u php-src/ext/spl/tests/pqueue_003.phpt:1.2 php-src/ext/spl/tests/pqueue_003.phpt:1.3 --- php-src/ext/spl/tests/pqueue_003.phpt:1.2 Sat May 24 14:12:00 2008 +++ php-src/ext/spl/tests/pqueue_003.phpt Sat Nov 22 14:17:40 2008 @@ -24,8 +24,8 @@ --EXPECTF-- count($h) = 4 $h-count() = 4 -4=5 -3=4 -2=1 -1=0 +3=5 +2=4 +1=1 +0=0 ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_heap.c
davidc Sat Nov 22 14:18:15 2008 UTC
Modified files:
/php-src/ext/splspl_heap.c
Log:
- Return the key - 1
- Bug #46615
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/spl/spl_heap.c
diff -u php-src/ext/spl/spl_heap.c:1.12 php-src/ext/spl/spl_heap.c:1.13
--- php-src/ext/spl/spl_heap.c:1.12 Mon Nov 17 11:26:24 2008
+++ php-src/ext/spl/spl_heap.c Sat Nov 22 14:18:15 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_heap.c,v 1.12 2008/11/17 11:26:24 felipe Exp $ */
+/* $Id: spl_heap.c,v 1.13 2008/11/22 14:18:15 davidc Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -987,7 +987,7 @@
{
spl_heap_object *intern =
(spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- RETURN_LONG(intern-heap-count);
+ RETURN_LONG(intern-heap-count - 1);
}
/* }}} */
--
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/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
davidc Sat Nov 22 14:19:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_heap.c
/php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt
Log:
- MFH
- Bug #46615
- Return the count - 1 when invoking SplHeap-key()
- Adjusted the tests
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.1.2.11r2=1.1.2.12diff_format=u
Index: php-src/ext/spl/spl_heap.c
diff -u php-src/ext/spl/spl_heap.c:1.1.2.11 php-src/ext/spl/spl_heap.c:1.1.2.12
--- php-src/ext/spl/spl_heap.c:1.1.2.11 Mon Nov 17 11:27:59 2008
+++ php-src/ext/spl/spl_heap.c Sat Nov 22 14:19:47 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_heap.c,v 1.1.2.11 2008/11/17 11:27:59 felipe Exp $ */
+/* $Id: spl_heap.c,v 1.1.2.12 2008/11/22 14:19:47 davidc Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -970,8 +970,8 @@
SPL_METHOD(SplHeap, key)
{
spl_heap_object *intern =
(spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
-
- RETURN_LONG(intern-heap-count);
+
+ RETURN_LONG(intern-heap-count - 1);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/heap_007.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/spl/tests/heap_007.phpt
diff -u php-src/ext/spl/tests/heap_007.phpt:1.1.2.3
php-src/ext/spl/tests/heap_007.phpt:1.1.2.4
--- php-src/ext/spl/tests/heap_007.phpt:1.1.2.3 Sat May 24 14:10:44 2008
+++ php-src/ext/spl/tests/heap_007.phpt Sat Nov 22 14:19:47 2008
@@ -12,6 +12,7 @@
$h-rewind();
echo count(\$h) = .count($h).\n;
echo \$h-count() = .$h-count().\n;
+
while ($h-valid()) {
$k = $h-key();
$v = $h-current();
@@ -24,8 +25,8 @@
--EXPECTF--
count($h) = 4
$h-count() = 4
-4=5
-3=4
-2=1
-1=0
+3=5
+2=4
+1=1
+0=0
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/pqueue_003.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/spl/tests/pqueue_003.phpt
diff -u php-src/ext/spl/tests/pqueue_003.phpt:1.1.2.3
php-src/ext/spl/tests/pqueue_003.phpt:1.1.2.4
--- php-src/ext/spl/tests/pqueue_003.phpt:1.1.2.3 Sat May 24 14:10:44 2008
+++ php-src/ext/spl/tests/pqueue_003.phpt Sat Nov 22 14:19:47 2008
@@ -24,8 +24,8 @@
--EXPECTF--
count($h) = 4
$h-count() = 4
-4=5
-3=4
-2=1
-1=0
+3=5
+2=4
+1=1
+0=0
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
2008/11/22 Kalle Sommer Nielsen [EMAIL PROTECTED]: 2008/11/22 David Coallier [EMAIL PROTECTED]: davidc Sat Nov 22 14:19:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/splspl_heap.c /php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt Log: - MFH - Bug #46615 - Return the count - 1 when invoking SplHeap-key() - Adjusted the tests Hmm, shouldn't this have a NEWS entry? Jaysus give me a second I had to go to the toilet (did you really need to know this?) :D Hehe yes it belongs in the news -- Slan, David -- 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) / NEWS
davidc Sat Nov 22 14:34:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Added news item for bug #46615 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.386r2=1.2027.2.547.2.965.2.387diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.386 php-src/NEWS:1.2027.2.547.2.965.2.387 --- php-src/NEWS:1.2027.2.547.2.965.2.386 Fri Nov 21 20:36:12 2008 +++ php-src/NEWSSat Nov 22 14:34:00 2008 @@ -86,6 +86,8 @@ - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud) - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes, chx1975 at gmail dot com) +- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead + of the key count). (David C.) 02 Sep 2008, PHP 5.3.0 Alpha 2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
davidc Sat Nov 22 14:35:40 2008 UTC Modified files: /php-srcNEWS Log: - Added the fixed bug #46615 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2171r2=1.2172diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2171 php-src/NEWS:1.2172 --- php-src/NEWS:1.2171 Mon Nov 10 14:46:50 2008 +++ php-src/NEWSSat Nov 22 14:35:39 2008 @@ -51,3 +51,5 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead + of the key count). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
only one NEWS file entry per change .. as in the earliest branch that will get released with the change. i have recently updated the README on this point: http://php.net/reST/php-src/README.CVS-RULES Ah ok cool I'll remove it. -- Slan, David -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
davidc Sat Nov 22 14:50:01 2008 UTC Modified files: /php-srcNEWS Log: - Removed my duplicate news entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2172r2=1.2173diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2172 php-src/NEWS:1.2173 --- php-src/NEWS:1.2172 Sat Nov 22 14:35:39 2008 +++ php-src/NEWSSat Nov 22 14:50:00 2008 @@ -51,5 +51,3 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead - of the key count). (David 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) / NEWS
davidc Sat Nov 22 22:54:18 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Removed the unreleased-fix-feature entry as per Marcus's request - Made sure to include my PDO fix in the proper 5.3 release http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.387r2=1.2027.2.547.2.965.2.388diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.387 php-src/NEWS:1.2027.2.547.2.965.2.388 --- php-src/NEWS:1.2027.2.547.2.965.2.387 Sat Nov 22 14:34:00 2008 +++ php-src/NEWSSat Nov 22 22:54:17 2008 @@ -86,8 +86,10 @@ - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud) - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes, chx1975 at gmail dot com) -- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead - of the key count). (David C.) +- Fixed bug #44153 (pdo-errorCode() returns NULL when there are no errors). + (David C.) +- Fixed bug #44154 (pdo-errorInfo() always have three elements in the + returned array). (David C.) 02 Sep 2008, PHP 5.3.0 Alpha 2 @@ -3594,7 +3596,3 @@ - Fixed bug #28694 (ReflectionExtension::getFunctions() crashes PHP). (Marcus) - Fixed bug #28512 (Allocate enough space to store MSSQL data). (Frank) - Fixed strip_tags() to correctly handle '\0' characters. (Stefan) -- Fixed bug #44153 (pdo-errorCode() returns NULL when there are no errors). - (David C.) -- Fixed bug #44154 (pdo-errorInfo() always have three elements in the - returned array). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
Hmm, shouldn't this have a NEWS entry? Since when do we add NEWS entries that fix stuff that was never released? David, please revert that entry. Otherwise it is hard to drop those entries prior to releasing. Done. -- Slan, David -- 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/pdo_mysql/tests pdo_mysql_attr_init_command.phpt
davidc Mon Nov 10 12:49:52 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_mysql/testspdo_mysql_attr_init_command.phpt
Log:
- Hrphm, sorry about that, forgot the array value. Now the test runs fine
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.3
php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.4
--- php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.3
Mon Nov 10 12:40:23 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phptMon Nov
10 12:49:51 2008
@@ -38,7 +38,7 @@
?
--EXPECTF--
string(58) CREATE TABLE test_%s(id INT)
-array(1) {
+array(3) {
[0]=
string(5) 0
[1]=
--
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/pdo pdo_dbh.c pdo_stmt.c
davidc Mon Nov 10 18:47:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
Log:
- After readying Johannes's mail, the conclusion that a smarter system
to find out if the return_value had the correct number of elements was
definitely needed. Simply added a difference to both dbh and stmt to
make sure that the error info always has 3 elements.
- Bug #44154 (pdo-errorInfo doesn't always return three elements)
- Now pdo-errorInfo() AND stmt-errorInfo() return three elements.
- [DOC] Make sure that not only the pdo-errorInfo() is returning 3 elms, but
also the PDOStatement object
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.14r2=1.82.2.31.2.17.2.15diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.15
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14 Tue Nov 4 18:28:41 2008
+++ php-src/ext/pdo/pdo_dbh.c Mon Nov 10 18:47:28 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.14 2008/11/04 18:28:41 davidc Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.15 2008/11/10 18:47:28 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -987,7 +987,10 @@
RETURN_NULL();
}
- // Then we get back to the default fallback
+ /**
+* Making sure that we fallback to the default implementation
+* if the dbh-error_code is not null.
+*/
RETURN_STRING(dbh-error_code, 1);
}
/* }}} */
@@ -996,11 +999,16 @@
Fetch extended error information associated with the last operation on the
database handle */
static PHP_METHOD(PDO, errorInfo)
{
+ int error_count;
+ int error_count_diff = 0;
+ int error_expected_count = 3;
+
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
if (zend_parse_parameters_none() == FAILURE) {
return;
}
+
PDO_CONSTRUCT_CHECK;
array_init(return_value);
@@ -1009,12 +1017,27 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
- add_next_index_null(return_value);
- add_next_index_null(return_value);
}
+
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
}
+
+ /**
+* In order to be consistent, we have to make sure we add the good
amount
+* of nulls depending on the current number of elements. We make a
simple
+* difference and add the needed elements
+*/
+ error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
+
+ if (error_expected_count error_count) {
+ error_count_diff = error_expected_count - error_count;
+
+ int current_index;
+ for (current_index = 0; current_index error_count_diff;
current_index++) {
+ add_next_index_null(return_value);
+ }
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.34r2=1.118.2.38.2.24.2.35diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.34
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.35
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.34 Wed Nov 5 23:40:37 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 10 18:47:28 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.34 2008/11/05 23:40:37 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.35 2008/11/10 18:47:28 davidc Exp $ */
/* The PDO Statement Handle Class */
@@ -1778,6 +1778,10 @@
return;
}
+ if (stmt-error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
RETURN_STRING(stmt-error_code, 1);
}
/* }}} */
@@ -1786,6 +1790,10 @@
Fetch extended error information associated with the last operation on the
statement handle */
static PHP_METHOD(PDOStatement, errorInfo)
{
+ int error_count;
+ int error_count_diff = 0;
+ int error_expected_count = 3;
+
PHP_STMT_GET_OBJ;
if (zend_parse_parameters_none() == FAILURE) {
@@ -1798,6 +1806,17 @@
if (stmt-dbh-methods-fetch_err) {
stmt-dbh-methods-fetch_err(stmt-dbh, stmt, return_value
TSRMLS_CC);
}
+
+ error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
+
+ if (error_expected_count error_count) {
+ error_count_diff = error_expected_count - error_count;
+
+ int current_index;
+ for (current_index = 0;
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_mysql/tests pdo_mysql_attr_init_command.phpt
davidc Mon Nov 10 12:40:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_mysql/testspdo_mysql_attr_init_command.phpt
Log:
- Adjusted test to make sure it reflects the behavior of the method
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.2
Mon Jul 21 13:09:28 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phptMon Nov
10 12:40:23 2008
@@ -35,11 +35,16 @@
$db-exec(sprintf('DROP TABLE IF EXISTS %s', $table));
print done!\n;
+?
--EXPECTF--
string(58) CREATE TABLE test_%s(id INT)
array(1) {
[0]=
string(5) 0
+ [1]=
+ NULL
+ [2]=
+ NULL
}
array(1) {
[0]=
@@ -48,4 +53,4 @@
string(1) 1
}
}
-done!
\ No newline at end of file
+done!
--
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) / NEWS
davidc Mon Nov 10 18:54:30 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Added resolution of bug #44153, #44154 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.373r2=1.2027.2.547.2.965.2.374diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.373 php-src/NEWS:1.2027.2.547.2.965.2.374 --- php-src/NEWS:1.2027.2.547.2.965.2.373 Mon Nov 10 14:45:30 2008 +++ php-src/NEWSMon Nov 10 18:54:30 2008 @@ -3575,3 +3575,7 @@ - Fixed bug #28694 (ReflectionExtension::getFunctions() crashes PHP). (Marcus) - Fixed bug #28512 (Allocate enough space to store MSSQL data). (Frank) - Fixed strip_tags() to correctly handle '\0' characters. (Stefan) +- Fixed bug #44153 (pdo-errorCode() returns NULL when there are no errors). + (David C.) +- Fixed bug #44154 (pdo-errorInfo() always have three elements in the + returned array). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DOC] cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c
PDO::MYSQL_ATTR_INIT_COMMAND [ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt] MySQL PDO-errorInfo() [ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt] MySQL PDO-exec(), affected rows [ext/pdo_mysql/tests/pdo_mysql_exec.phpt] MySQL PDO-exec(), SELECT [ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt] MySQL PDOStatement-errorInfo(); [ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt] Those are now fixed, with a few others as well. Others that were affected by the same change but in the pdo_stmt.c file. And the // comment-style is incorrect, see CODING_STANDARDS file. This is fixed as well. -- Slan, David -- 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/pdo_mysql/tests bug41125.phpt bug_41997.phpt pdo_mysql_begintransaction.phpt pdo_mysql_errorinfo.phpt pdo_mysql_prepare_emulated_anonymous.phpt pdo_mysql_prepare_e
davidc Mon Nov 10 18:44:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_mysql/testsbug41125.phpt bug_41997.phpt
pdo_mysql_begintransaction.phpt
pdo_mysql_errorinfo.phpt
pdo_mysql_prepare_emulated_anonymous.phpt
pdo_mysql_prepare_emulated_placeholder_everywhere.phpt
pdo_mysql_prepare_native_dup_named_placeholder.phpt
pdo_mysql_prepare_native_named_placeholder.phpt
pdo_mysql_stmt_errorinfo.phpt
pdo_mysql_stmt_multiquery.phpt
pecl_bug_5780.phpt
Log:
- Make test conform to the error reporting that always returns
three elements. Adjusted all bugs and tests that were using
errorInfo() and errorCode() (dbh stmt)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug41125.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug41125.phpt
diff -u php-src/ext/pdo_mysql/tests/bug41125.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/bug41125.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/bug41125.phpt:1.1.2.2 Fri Oct 10 12:10:41 2008
+++ php-src/ext/pdo_mysql/tests/bug41125.phpt Mon Nov 10 18:44:04 2008
@@ -85,78 +85,78 @@
?
--EXPECT--
1
-0
+0 - -
---
[1] Query: [[SELECT 1 FROM DUAL WHERE 1 = '?\'\'']]
-0
+0 - -
[2] Query: [[SELECT 'a\'0' FROM DUAL WHERE 1 = ?]]
a'0
-0
+0 - -
[3] Query: [[SELECT 'a', 'b\'' FROM DUAL WHERE LIKE '\'' AND ?]]
a - b'
-0
+0 - -
[4] Query: [[SELECT 'foo?bar', '', FROM DUAL WHERE ?]]
foo?bar - - '
-0
+0 - -
Query: [[SELECT upper(:id) FROM DUAL WHERE '1']]
O'\0
-0
+0 - -
---
[1] Query: [[SELECT 1, 'foo' FROM DUAL WHERE 1 = :id AND '\0' IS NULL AND 2
:id]]
-0
+0 - -
[2] Query: [[SELECT 1 FROM DUAL WHERE 1 = :id AND '' AND 2 :id]]
-0
+0 - -
[3] Query: [[SELECT 1 FROM DUAL WHERE 1 = :id AND '\'\'' = AND 2 :id]]
-0
+0 - -
[4] Query: [[SELECT 1 FROM DUAL WHERE 1 = :id AND '\'' = AND 2 :id]]
1
-0
+0 - -
[5] Query: [[SELECT 'a', 'b\'' FROM DUAL WHERE LIKE '\'' AND 1]]
a - b'
-0
+0 - -
[6] Query: [[SELECT 'a''', '\'b\'' FROM DUAL WHERE LIKE '\'' AND 1]]
a' - 'b'
-0
+0 - -
[7] Query: [[SELECT UPPER(:id) FROM DUAL WHERE '1']]
1
-0
+0 - -
[8] Query: [[SELECT 1 FROM DUAL WHERE '\'']]
-0
+0 - -
[9] Query: [[SELECT 1 FROM DUAL WHERE :id AND '\0' OR :id]]
1
-0
+0 - -
[10] Query: [[SELECT 1 FROM DUAL WHERE 'a\f\n\0' AND 1 = :id]]
-0
+0 - -
[11] Query: [[SELECT 1 FROM DUAL WHERE '\'' = ]]
1
-0
+0 - -
[12] Query: [[SELECT '\n' '1 FROM DUAL WHERE and :id']]
1 FROM DUAL WHERE '' and :id
-0
+0 - -
[13] Query: [[SELECT 1 'FROM DUAL WHERE :id AND = OR 1 = 1 AND ':id]]
1
-0
+0 - -
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug_41997.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug_41997.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_41997.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/bug_41997.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/bug_41997.phpt:1.1.2.2 Mon Jul 21 13:09:27 2008
+++ php-src/ext/pdo_mysql/tests/bug_41997.phpt Mon Nov 10 18:44:04 2008
@@ -46,9 +46,13 @@
string(1) 1
}
}
-array(1) {
+array(3) {
[0]=
string(5) 0
+ [1]=
+ NULL
+ [2]=
+ NULL
}
array(1) {
[0]=
@@ -57,8 +61,12 @@
string(1) 2
}
}
-array(1) {
+array(3) {
[0]=
string(5) 0
+ [1]=
+ NULL
+ [2]=
+ NULL
}
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt:1.1.2.2 Mon Jul
21 13:09:28 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt Mon Nov 10
18:44:04 2008
@@ -195,7 +195,7 @@
[label]=
string(1) z
}
-[026] Autocommit mode of the MySQL Server should be off, got '1', [0] 0
+[026] Autocommit mode of the MySQL Server should be off, got '1', [0] 0
[028] I'm confused, how can autocommit be on? Didn't I say I want to
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
Also aren't these in HEAD or did I miss the commits? If not then please remember HEAD first or Jani will kill some bunnies :) Those aren't commited but were made on HEAD first. I have a few compiling issues right now so as soon as HEAD is back on track. But no no didn't forget, head before branch :) -- Slan, David -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c pdo_stmt.c
davidc Mon Nov 10 20:34:53 2008 UTC
Modified files:
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
Log:
- MFB (Which was an MFH)
- Bug #44153 (ErrorCode returns NULL when no error)
- Bug #44154 (ErrorInfo to ALWAYS have 3 elements)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.154r2=1.155diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.154 php-src/ext/pdo/pdo_dbh.c:1.155
--- php-src/ext/pdo/pdo_dbh.c:1.154 Tue Nov 4 18:25:26 2008
+++ php-src/ext/pdo/pdo_dbh.c Mon Nov 10 20:34:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.154 2008/11/04 18:25:26 davidc Exp $ */
+/* $Id: pdo_dbh.c,v 1.155 2008/11/10 20:34:53 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -1002,11 +1002,16 @@
Fetch extended error information associated with the last operation on the
database handle */
static PHP_METHOD(PDO, errorInfo)
{
+ int error_count;
+ int error_count_diff = 0;
+ int error_expected_count = 3;
+
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
if (zend_parse_parameters_none() == FAILURE) {
return;
}
+
PDO_CONSTRUCT_CHECK;
array_init(return_value);
@@ -1015,12 +1020,28 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
- add_next_index_null(return_value);
- add_next_index_null(return_value);
}
+
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
}
+
+ /**
+* In order to be consistent, we have to make sure we add the good
amount
+* of null elements depending on the current number of elements. We make
+* a simple difference and add the needed elements to reach the expected
+* count.
+*/
+ error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
+
+ if (error_expected_count error_count) {
+ error_count_diff = error_expected_count - error_count;
+
+ int current_index;
+ for (current_index = 0; current_index error_count_diff;
current_index++) {
+ add_next_index_null(return_value);
+ }
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.208r2=1.209diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.208 php-src/ext/pdo/pdo_stmt.c:1.209
--- php-src/ext/pdo/pdo_stmt.c:1.208Wed Nov 5 23:39:09 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 10 20:34:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.208 2008/11/05 23:39:09 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.209 2008/11/10 20:34:53 davidc Exp $ */
/* The PDO Statement Handle Class */
@@ -1784,6 +1784,10 @@
Fetch extended error information associated with the last operation on the
statement handle */
static PHP_METHOD(PDOStatement, errorInfo)
{
+ int error_count;
+ int error_count_diff = 0;
+ int error_expected_count = 3;
+
PHP_STMT_GET_OBJ;
if (zend_parse_parameters_none() == FAILURE) {
@@ -1796,6 +1800,17 @@
if (stmt-dbh-methods-fetch_err) {
stmt-dbh-methods-fetch_err(stmt-dbh, stmt, return_value
TSRMLS_CC);
}
+
+ error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
+
+ if (error_expected_count error_count) {
+ error_count_diff = error_expected_count - error_count;
+
+ int current_index;
+ for (current_index = 0; current_index error_count_diff;
current_index++) {
+ add_next_index_null(return_value);
+ }
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
Hmm, HEAD compiles for for me (latest checkout, 5 minutes old) on Windows Vista with VC++ 9 with a normal configure without any parameters. I know it's not related to PHP. I have been playing with some system headers and now I have to revert back. It's not related to PHP but to personal tests. -- Slan, David -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c
davidc Tue Nov 4 18:25:26 2008 UTC
Modified files:
/php-src/ext/pdopdo_dbh.c
Log:
- Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt doesn't
have
an error code we used to return an array with one element. For the sake
of consistency and verification of returned values at userland we are now
returning an array with 3 elements. Note the two last elements are null but
present
- Bug #44153: [DOC] If the error code returned by the DBH is null, we return
a null value. This is used in order to help with empty error codes.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.153r2=1.154diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.153 php-src/ext/pdo/pdo_dbh.c:1.154
--- php-src/ext/pdo/pdo_dbh.c:1.153 Thu Oct 9 12:59:47 2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Nov 4 18:25:26 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.153 2008/10/09 12:59:47 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.154 2008/11/04 18:25:26 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -988,7 +988,12 @@
if (dbh-query_stmt) {
RETURN_STRING(dbh-query_stmt-error_code, 1);
}
-
+
+ if (dbh-error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
+ // Fallback to default documented value
RETURN_STRING(dbh-error_code, 1);
}
/* }}} */
@@ -1010,6 +1015,8 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_null(return_value);
+ add_next_index_null(return_value);
}
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
--
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/pdo pdo_dbh.c
davidc Tue Nov 4 18:28:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_dbh.c
Log:
- MFH
- Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt doesn't
have
an error code we used to return an array with one element. For the sake
of consistency and verification of returned values at userland we are now
returning an array with 3 elements. Note the two last elements are null but
present
- Bug #4413: [DOC] If the error code returned by the DBH is null, we return
a null value. This is used in order to help with empty error codes.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.13r2=1.82.2.31.2.17.2.14diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13 Thu Oct 9 13:00:58 2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Nov 4 18:28:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.13 2008/10/09 13:00:58 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.14 2008/11/04 18:28:41 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -983,6 +983,11 @@
RETURN_STRING(dbh-query_stmt-error_code, 1);
}
+ if (dbh-error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
+ // Then we get back to the default fallback
RETURN_STRING(dbh-error_code, 1);
}
/* }}} */
@@ -1004,6 +1009,8 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_null(return_value);
+ add_next_index_null(return_value);
}
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DOC] cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c
2008/11/4 Felipe Pena [EMAIL PROTECTED]
Em Ter, 2008-11-04 às 18:28 +, David Coallier escreveu:
davidcTue Nov 4 18:28:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo pdo_dbh.c
Log:
- MFH
- Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt
doesn't have
an error code we used to return an array with one element. For the
sake
of consistency and verification of returned values at userland we are
now
returning an array with 3 elements. Note the two last elements are
null but
present
- Bug #4413: [DOC] If the error code returned by the DBH is null, we
return
a null value. This is used in order to help with empty error codes.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.13r2=1.82.2.31.2.17.2.14diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13 Thu Oct 9 13:00:58
2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Nov 4 18:28:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.13 2008/10/09 13:00:58 felipe Exp $
*/
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.14 2008/11/04 18:28:41 davidc Exp $
*/
/* The PDO Database Handle Class */
@@ -983,6 +983,11 @@
RETURN_STRING(dbh-query_stmt-error_code, 1);
}
+ if (dbh-error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
+ // Then we get back to the default fallback
RETURN_STRING(dbh-error_code, 1);
}
/* }}} */
@@ -1004,6 +1009,8 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_null(return_value);
+ add_next_index_null(return_value);
}
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
I think that broken some tests:
PDO::MYSQL_ATTR_INIT_COMMAND
[ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt]
MySQL PDO-errorInfo() [ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt]
MySQL PDO-exec(), affected rows
[ext/pdo_mysql/tests/pdo_mysql_exec.phpt]
MySQL PDO-exec(), SELECT
[ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt]
MySQL PDOStatement-errorInfo();
[ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt]
Oh yeah I'll fix them.
And the // comment-style is incorrect, see CODING_STANDARDS file.
Oops
Thanks I'll fix it now.
--
Slan,
David
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard formatted_print.c
Lame excuse. If others jump into a river, you don't do that either. Seriously, commit to HEAD - bitch at people that don't! Ok I will. -- Slan, David -- 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/standard formatted_print.c
davidc Wed Jun 25 08:56:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard formatted_print.c
Log:
- Hackish but working parameter parsing, no longer using
zend_get* at least
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.82.2.1.2.16.2.4r2=1.82.2.1.2.16.2.5diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.4
php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.5
--- php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.4Tue Jun 24
22:53:01 2008
+++ php-src/ext/standard/formatted_print.c Wed Jun 25 08:56:42 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: formatted_print.c,v 1.82.2.1.2.16.2.4 2008/06/24 22:53:01 davidc Exp $
*/
+/* $Id: formatted_print.c,v 1.82.2.1.2.16.2.5 2008/06/25 08:56:42 davidc Exp $
*/
#include math.h /* modf() */
#include php.h
@@ -760,14 +760,22 @@
php_stream *stream;
zval **arg1;
char *result;
- int len;
+ int num_args, len;
+ /**
+* Here's the deal, I extract the first resource, it's
+* a ressource, then a string and then an array. In theory
+* the parsing should be rsa however, if I do so, the
+* Argument number checking in php_formatted_print fails.
+* I am therefore leaving this check here so I do not break
+* php_formatted_print
+*/
if (ZEND_NUM_ARGS() != 3) {
WRONG_PARAM_COUNT;
}
- if (zend_get_parameters_ex(1, arg1)==FAILURE) {
- RETURN_FALSE;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z+, arg1,
num_args) == FAILURE) {
+ return;
}
php_stream_from_zval(stream, arg1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard formatted_print.c
2008/6/25 Dmitry Stogov [EMAIL PROTECTED]: David, Are you going to run make test before commits? I have I see more than 60 new failed tests and some of them show memory corruption. make doesn't work too, as it crashes during phar.phar build. I have ran the tests on standards/tests/strings/ let me run it on the whole repo maybe the failing tests are in my skipped tests, can you send me the list of failing tests? I have some failing tests but they are the same that were there before I applied my patch: Test posix_strerror() function : error conditions [ext/posix/tests/posix_strerror_error.phpt] Test posix_strerror() function : usage variations [ext/posix/tests/posix_strerror_variation1.phpt] Test session_save_path() function : variation [ext/session/tests/session_save_path_variation5.phpt] Bug #34657 (If you get a communication problem when loading the WSDL, it fatal's) [ext/soap/tests/bugs/bug34657.phpt] Sort with SORT_LOCALE_STRING [ext/standard/tests/array/locale_sort.phpt] parse_ini_file() multiple calls [ext/standard/tests/general_functions/parse_ini_file.phpt] highlight_file() and output buffer [ext/standard/tests/strings/006.phpt] php_strip_whitespace() and output buffer [ext/standard/tests/strings/007.phpt] And from what I see, most of the failing tests are simply outdated messages but nothing affected by my changes. Moreover, phar builds just fine here, have you cvs up'ed? what OS are you on? Also why don't you commit to HEAD? Haven't you noticed that I am not the only one not committing to HEAD? We are doing this for the 5_3 release since this is the most realistic and close one from now. I agree that it HEAD should be kept to date but if you are to pick on me, pick on everyone who is doing this zend-parse-parameter cleanup move please. This is not the first commit related to the cleanup. So just send me a list of your failing tests (offlist presumably) Thanks, -- Slan, David -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard formatted_print.c
2008/6/25 Dmitry Stogov [EMAIL PROTECTED]: I would suggest you to revert your patches and commit them when they are ready and tested. For now your patch is just invalid. Also please run tests on debug build, as it shows some memory corruption errors. = TEST RESULT SUMMARY - Exts skipped: 46 Exts tested : 33 - Number of tests : 7215 6022 Tests skipped : 1193 ( 16.5%) Tests warned:3 ( 0.0%) ( 0.0%) Tests failed: 73 ( 1.0%) ( 1.2%) Expected fail :4 ( 0.1%) ( 0.1%) Tests passed: 5942 ( 82.4%) ( 98.7%) - Time taken : 257 seconds = = FAILED TEST SUMMARY - Formatted print functions [tests/strings/002.phpt] Bug #16069 (ICONV transliteration failure) [ext/iconv/tests/bug16069.phpt] iconv stream filter [ext/iconv/tests/iconv_stream_filter.phpt] Persistent connections and mysql.max_persistent [ext/mysql/tests/mysql_pconn_max_links.phpt] mysql_pconnect() - disabling feature [ext/mysql/tests/mysql_pconn_reuse.phpt] Test fscanf() function: usage variations - float formats with resource [ext/standard/tests/file/fscanf_variation10.phpt] Test fscanf() function: usage variations - float formats with arrays [ext/standard/tests/file/fscanf_variation11.phpt] Test fscanf() function: usage variations - float formats with strings [ext/standard/tests/file/fscanf_variation12.phpt] Test fscanf() function: usage variations - float formats with boolean [ext/standard/tests/file/fscanf_variation13.phpt] Test fscanf() function: usage variations - string formats with strings [ext/standard/tests/file/fscanf_variation14.phpt] Test fscanf() function: usage variations - string formats with float values [ext/standard/tests/file/fscanf_variation15.phpt] Test fscanf() function: usage variations - string formats with resource [ext/standard/tests/file/fscanf_variation16.phpt] Test fscanf() function: usage variations - string formats with arrays [ext/standard/tests/file/fscanf_variation17.phpt] Test fscanf() function: usage variations - string formats with integer values [ext/standard/tests/file/fscanf_variation18.phpt] Test fscanf() function: usage variations - string formats with boolean [ext/standard/tests/file/fscanf_variation19.phpt] Test fscanf() function: usage variations - integer formats with integer values [ext/standard/tests/file/fscanf_variation2.phpt] Test fscanf() function: usage variations - char formats with integer values [ext/standard/tests/file/fscanf_variation20.phpt] Test fscanf() function: usage variations - char formats with float values [ext/standard/tests/file/fscanf_variation21.phpt] Test fscanf() function: usage variations - char formats with resource [ext/standard/tests/file/fscanf_variation22.phpt] Test fscanf() function: usage variations - char formats with arrays [ext/standard/tests/file/fscanf_variation23.phpt] Test fscanf() function: usage variations - char formats with strings [ext/standard/tests/file/fscanf_variation24.phpt] Test fscanf() function: usage variations - char formats with boolean [ext/standard/tests/file/fscanf_variation25.phpt] Test fscanf() function: usage variations - char formats with chars [ext/standard/tests/file/fscanf_variation26.phpt] Test fscanf() function: usage variations - octal formats with integer values [ext/standard/tests/file/fscanf_variation27.phpt] Test fscanf() function: usage variations - octal formats with float values [ext/standard/tests/file/fscanf_variation28.phpt] Test fscanf() function: usage variations - octal formats with resource [ext/standard/tests/file/fscanf_variation29.phpt] Test fscanf() function: usage variations - integer formats with float values [ext/standard/tests/file/fscanf_variation3.phpt] Test fscanf() function: usage variations - octal formats with arrays [ext/standard/tests/file/fscanf_variation30.phpt] Test fscanf() function: usage variations - octal formats with strings [ext/standard/tests/file/fscanf_variation31.phpt] Test fscanf() function: usage variations - octal formats with boolean [ext/standard/tests/file/fscanf_variation32.phpt] Test fscanf() function: usage variations - hexa formats with integer values [ext/standard/tests/file/fscanf_variation33.phpt] Test fscanf() function: usage variations - hexa formats with float values [ext/standard/tests/file/fscanf_variation34.phpt] Test fscanf() function: usage variations - hexa formats with resource [ext/standard/tests/file/fscanf_variation35.phpt] Test fscanf() function:
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard formatted_print.c
davidc Wed Jun 25 10:16:52 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard formatted_print.c
Log:
Reverted zpp API Cleanup patch - memory troubles?
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.82.2.1.2.16.2.5r2=1.82.2.1.2.16.2.6diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.5
php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.6
--- php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.5Wed Jun 25
08:56:42 2008
+++ php-src/ext/standard/formatted_print.c Wed Jun 25 10:16:52 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: formatted_print.c,v 1.82.2.1.2.16.2.5 2008/06/25 08:56:42 davidc Exp $
*/
+/* $Id: formatted_print.c,v 1.82.2.1.2.16.2.6 2008/06/25 10:16:52 davidc Exp $
*/
#include math.h /* modf() */
#include php.h
@@ -373,22 +373,26 @@
static char *
php_formatted_print(int ht, int *len, int use_array, int format_offset
TSRMLS_DC)
{
- zval ***args = NULL, **z_format;
+ zval ***args, **z_format;
int argc, size = 240, inpos = 0, outpos = 0, temppos;
int alignment, currarg, adjusting, argnum, width, precision;
char *format, *result, padding;
int always_sign;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, +, args, argc)
== FAILURE) {
- return;
- }
+ argc = ZEND_NUM_ARGS();
/* verify the number of args */
if ((use_array argc != (2 + format_offset))
|| (!use_array argc (1 + format_offset))) {
WRONG_PARAM_COUNT_WITH_RETVAL(NULL);
}
+ args = (zval ***)safe_emalloc(argc, sizeof(zval *), 0);
+ if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
+ efree(args);
+ WRONG_PARAM_COUNT_WITH_RETVAL(NULL);
+ }
+
if (use_array) {
int i = 1;
zval ***newargs;
@@ -686,7 +690,6 @@
if ((result=php_formatted_print(ht, len, 1, 0 TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
-
RETVAL_STRINGL(result, len, 0);
}
/* }}} */
@@ -728,17 +731,18 @@
PHP_FUNCTION(fprintf)
{
php_stream *stream;
- zval **arg1 = NULL;
- zval **args = NULL;
- int num_args;
+ zval **arg1;
char *result;
- zval **format;
int len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z+, arg1,
args) == FAILURE) {
- return;
+
+ if (ZEND_NUM_ARGS() 2) {
+ WRONG_PARAM_COUNT;
}
-
+
+ if (zend_get_parameters_ex(1, arg1)==FAILURE) {
+ RETURN_FALSE;
+ }
+
php_stream_from_zval(stream, arg1);
if ((result=php_formatted_print(ht, len, 0, 1 TSRMLS_CC))==NULL) {
@@ -760,22 +764,14 @@
php_stream *stream;
zval **arg1;
char *result;
- int num_args, len;
+ int len;
- /**
-* Here's the deal, I extract the first resource, it's
-* a ressource, then a string and then an array. In theory
-* the parsing should be rsa however, if I do so, the
-* Argument number checking in php_formatted_print fails.
-* I am therefore leaving this check here so I do not break
-* php_formatted_print
-*/
if (ZEND_NUM_ARGS() != 3) {
WRONG_PARAM_COUNT;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z+, arg1,
num_args) == FAILURE) {
- return;
+ if (zend_get_parameters_ex(1, arg1)==FAILURE) {
+ RETURN_FALSE;
}
php_stream_from_zval(stream, arg1);
--
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/standard/tests/strings fprintf_error.phpt printf.phpt sprintf_error.phpt vsprintf_error.phpt
davidc Tue Jun 24 22:51:57 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings fprintf_error.phpt printf.phpt sprintf_error.phpt vsprintf_error.phpt Log: - Tests for parsing parameter api http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/fprintf_error.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u Index: php-src/ext/standard/tests/strings/fprintf_error.phpt diff -u php-src/ext/standard/tests/strings/fprintf_error.phpt:1.1.2.2 php-src/ext/standard/tests/strings/fprintf_error.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/strings/fprintf_error.phpt:1.1.2.2 Thu Jul 19 15:04:15 2007 +++ php-src/ext/standard/tests/strings/fprintf_error.phpt Tue Jun 24 22:51:57 2008 @@ -20,12 +20,12 @@ --EXPECTF-- *** Testing Error Conditions *** -Warning: Wrong parameter count for fprintf() in %s on line %d +Warning: fprintf() expects at least %d parameters, %d given in %s on line %d NULL -Warning: Wrong parameter count for fprintf() in %s on line %d +Warning: fprintf() expects at least %d parameters, %d given in %s on line %d NULL -Warning: Wrong parameter count for fprintf() in %s on line %d +Warning: fprintf() expects at least %d parameters, %d given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/printf.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u Index: php-src/ext/standard/tests/strings/printf.phpt diff -u php-src/ext/standard/tests/strings/printf.phpt:1.1.2.3 php-src/ext/standard/tests/strings/printf.phpt:1.1.2.3.2.1 --- php-src/ext/standard/tests/strings/printf.phpt:1.1.2.3 Thu Apr 26 23:30:00 2007 +++ php-src/ext/standard/tests/strings/printf.phpt Tue Jun 24 22:51:57 2008 @@ -227,7 +227,7 @@ --EXPECTF-- *** Output for zero argument *** -Warning: Wrong parameter count for printf() in %s on line %d +Warning: printf() expects at least %d parameter, %d given in %s on line %d *** Output for insufficient number of arguments *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_error.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_error.phpt diff -u php-src/ext/standard/tests/strings/sprintf_error.phpt:1.2.2.2 php-src/ext/standard/tests/strings/sprintf_error.phpt:1.2.2.3 --- php-src/ext/standard/tests/strings/sprintf_error.phpt:1.2.2.2 Sat Sep 29 16:54:57 2007 +++ php-src/ext/standard/tests/strings/sprintf_error.phpt Tue Jun 24 22:51:57 2008 @@ -39,7 +39,7 @@ -- Testing sprintf() function with Zero arguments -- -Warning: Wrong parameter count for sprintf() in %s on line %d +Warning: sprintf() expects at least %d parameter, %d given in %s on line %d bool(false) -- Testing sprintf() function with less than expected no. of arguments -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_error.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_error.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_error.phpt:1.1.4.2 php-src/ext/standard/tests/strings/vsprintf_error.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/vsprintf_error.phpt:1.1.4.2 Fri Oct 5 18:09:31 2007 +++ php-src/ext/standard/tests/strings/vsprintf_error.phpt Tue Jun 24 22:51:57 2008 @@ -31,7 +31,7 @@ -- Testing vsprintf() function with Zero arguments -- -Warning: Wrong parameter count for vsprintf() in %s on line %d +Warning: vsprintf() expects at least %d parameter, %d given in %s on line %d bool(false) -- Testing vsprintf() function with less than expected no. of arguments -- -- 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/standard formatted_print.c
davidc Tue Jun 24 22:53:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard formatted_print.c
Log:
- New parsing parameter API
- Tests have been adjusted, if you have something else failing
let me know now! All tests seem to pass fine at the moment.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.82.2.1.2.16.2.3r2=1.82.2.1.2.16.2.4diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.3
php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.4
--- php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.3Mon Mar 17
23:06:32 2008
+++ php-src/ext/standard/formatted_print.c Tue Jun 24 22:53:01 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: formatted_print.c,v 1.82.2.1.2.16.2.3 2008/03/17 23:06:32 stas Exp $ */
+/* $Id: formatted_print.c,v 1.82.2.1.2.16.2.4 2008/06/24 22:53:01 davidc Exp $
*/
#include math.h /* modf() */
#include php.h
@@ -373,26 +373,22 @@
static char *
php_formatted_print(int ht, int *len, int use_array, int format_offset
TSRMLS_DC)
{
- zval ***args, **z_format;
+ zval ***args = NULL, **z_format;
int argc, size = 240, inpos = 0, outpos = 0, temppos;
int alignment, currarg, adjusting, argnum, width, precision;
char *format, *result, padding;
int always_sign;
- argc = ZEND_NUM_ARGS();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, +, args, argc)
== FAILURE) {
+ return;
+ }
/* verify the number of args */
if ((use_array argc != (2 + format_offset))
|| (!use_array argc (1 + format_offset))) {
WRONG_PARAM_COUNT_WITH_RETVAL(NULL);
}
- args = (zval ***)safe_emalloc(argc, sizeof(zval *), 0);
- if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
- efree(args);
- WRONG_PARAM_COUNT_WITH_RETVAL(NULL);
- }
-
if (use_array) {
int i = 1;
zval ***newargs;
@@ -690,6 +686,7 @@
if ((result=php_formatted_print(ht, len, 1, 0 TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
+
RETVAL_STRINGL(result, len, 0);
}
/* }}} */
@@ -731,18 +728,17 @@
PHP_FUNCTION(fprintf)
{
php_stream *stream;
- zval **arg1;
+ zval **arg1 = NULL;
+ zval **args = NULL;
+ int num_args;
char *result;
+ zval **format;
int len;
-
- if (ZEND_NUM_ARGS() 2) {
- WRONG_PARAM_COUNT;
- }
-
- if (zend_get_parameters_ex(1, arg1)==FAILURE) {
- RETURN_FALSE;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z+, arg1,
args) == FAILURE) {
+ return;
}
-
+
php_stream_from_zval(stream, arg1);
if ((result=php_formatted_print(ht, len, 0, 1 TSRMLS_CC))==NULL) {
--
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/standard pack.c
davidc Fri Jun 20 20:54:32 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard pack.c
Log:
- New parsing parameter API cleanups
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/pack.c?r1=1.57.2.5.2.6.2.2r2=1.57.2.5.2.6.2.3diff_format=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.57.2.5.2.6.2.2
php-src/ext/standard/pack.c:1.57.2.5.2.6.2.3
--- php-src/ext/standard/pack.c:1.57.2.5.2.6.2.2Fri Jun 20 14:53:57 2008
+++ php-src/ext/standard/pack.c Fri Jun 20 20:54:32 2008
@@ -15,7 +15,7 @@
| Author: Chris Schneider [EMAIL PROTECTED] |
+--+
*/
-/* $Id: pack.c,v 1.57.2.5.2.6.2.2 2008/06/20 14:53:57 felipe Exp $ */
+/* $Id: pack.c,v 1.57.2.5.2.6.2.3 2008/06/20 20:54:32 davidc Exp $ */
#include php.h
@@ -106,8 +106,8 @@
Takes one or more arguments and packs them into a binary string according
to the format argument */
PHP_FUNCTION(pack)
{
- zval ***argv;
- int argc, i;
+ zval ***argv = NULL;
+ int num_args, i;
int currentarg;
char *format;
int formatlen;
@@ -117,20 +117,10 @@
int outputpos = 0, outputsize = 0;
char *output;
- argc = ZEND_NUM_ARGS();
-
- if (argc 1) {
- WRONG_PARAM_COUNT;
- }
-
- argv = safe_emalloc(argc, sizeof(zval **), 0);
-
- if (zend_get_parameters_array_ex(argc, argv) == FAILURE) {
- efree(argv);
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, +, argv,
num_args) == FAILURE) {
+ return;
}
- convert_to_string_ex(argv[0]);
format = Z_STRVAL_PP(argv[0]);
formatlen = Z_STRLEN_PP(argv[0]);
@@ -178,7 +168,7 @@
case 'A':
case 'h':
case 'H':
- if (currentarg = argc) {
+ if (currentarg = num_args) {
efree(argv);
efree(formatcodes);
efree(formatargs);
@@ -210,12 +200,12 @@
case 'f':
case 'd':
if (arg 0) {
- arg = argc - currentarg;
+ arg = num_args - currentarg;
}
currentarg += arg;
- if (currentarg argc) {
+ if (currentarg num_args) {
efree(argv);
efree(formatcodes);
efree(formatargs);
@@ -236,8 +226,8 @@
formatargs[formatcount] = arg;
}
- if (currentarg argc) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %d arguments
unused, (argc - currentarg));
+ if (currentarg num_args) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %d arguments
unused, (num_args - currentarg));
}
/* Calculate output length and upper bound while processing*/
--
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) /pear install-pear.txt
davidc Sat May 24 01:30:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/pear install-pear.txt Log: - Make use of a valid .phar pear installer http://cvs.php.net/viewvc.cgi/php-src/pear/install-pear.txt?r1=1.2.6.1r2=1.2.6.1.4.1diff_format=u Index: php-src/pear/install-pear.txt diff -u php-src/pear/install-pear.txt:1.2.6.1 php-src/pear/install-pear.txt:1.2.6.1.4.1 --- php-src/pear/install-pear.txt:1.2.6.1 Wed Sep 7 16:03:06 2005 +++ php-src/pear/install-pear.txt Sat May 24 01:30:48 2008 @@ -5,7 +5,7 @@ | PEAR: PHP Extension and Application Repository | | | | To install these components, | -| download http://pear.php.net/install-pear.phar to php-src/pear/ | +| download http://pear.php.net/go-pear.phar to php-src/pear/ | | become the superuser and execute:| | | | # make install-su | -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap/tests/bugs bug44811.phpt
davidc Wed May 7 14:56:36 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/soap/tests/bugsbug44811.phpt Log: - Test for bug #44811 (Improve error message when new SoapClient has invalid data) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug44811.phpt?view=markuprev=1.1 Index: php-src/ext/soap/tests/bugs/bug44811.phpt +++ php-src/ext/soap/tests/bugs/bug44811.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c
davidc Wed May 7 14:57:56 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/soap php_sdl.c
Log:
- Fixed Bug #44811: Improved error message when creating a new
SoapClient has invalid data.
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.10r2=1.88.2.12.2.11diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.10
php-src/ext/soap/php_sdl.c:1.88.2.12.2.11
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.10 Mon Dec 31 07:20:11 2007
+++ php-src/ext/soap/php_sdl.c Wed May 7 14:57:56 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.10 2007/12/31 07:20:11 sebastian Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.11 2008/05/07 14:57:56 davidc Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -240,7 +240,12 @@
wsdl = soap_xmlParseFile(struri TSRMLS_CC);
if (!wsdl) {
- soap_error1(E_ERROR, Parsing WSDL: Couldn't load from '%s',
struri);
+ xmlErrorPtr xmlErrorPtr = xmlGetLastError();
+ if (xmlErrorPtr) {
+ soap_error2(E_ERROR, Parsing WSDL: Couldn't load from
'%s' : %s, struri, xmlErrorPtr-message);
+ } else {
+ soap_error1(E_ERROR, Parsing WSDL: Couldn't load from
'%s', struri);
+ }
}
zend_hash_add(ctx-docs, struri, strlen(struri)+1, (void**)wsdl,
sizeof(xmlDocPtr), NULL);
--
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/soap/tests/bugs 44811.phpt
davidc Wed May 7 15:14:16 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/soap/tests/bugs44811.phpt Log: - Bug #44811 (Improved error message for creating invalid new SoapClient) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/44811.phpt?view=markuprev=1.1 Index: php-src/ext/soap/tests/bugs/44811.phpt +++ php-src/ext/soap/tests/bugs/44811.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
davidc Wed May 7 15:03:17 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - Added NEWS item for fixation of bug 44811 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1152r2=1.2027.2.547.2.1153diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1152 php-src/NEWS:1.2027.2.547.2.1153 --- php-src/NEWS:1.2027.2.547.2.1152Tue May 6 18:03:52 2008 +++ php-src/NEWSWed May 7 15:03:17 2008 @@ -8,6 +8,8 @@ - Fixed bug #44836 (putenv() crashes, avoid direct reference of environ in POSIX systems). (Ilia, delphij at FreeBSD dot org) - Fixed bug #44798 (Memory leak assigning value to attribute). (Ilia) +- Fixed bug #44811 (Improve error message when creating a new + SoapClient that contains invalid data. (Markus Fischer, David C) 01 May 2008, PHP 5.2.6 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c
davidc Wed May 7 15:45:02 2008 UTC
Modified files:
/php-src/ext/soap php_sdl.c
Log:
- Fixed bug #44811 (Improve error message when creating new SoapClient
that contains invalid data)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.111r2=1.112diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.111 php-src/ext/soap/php_sdl.c:1.112
--- php-src/ext/soap/php_sdl.c:1.111Mon Dec 31 07:12:14 2007
+++ php-src/ext/soap/php_sdl.c Wed May 7 15:45:02 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.111 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: php_sdl.c,v 1.112 2008/05/07 15:45:02 davidc Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -240,7 +240,12 @@
wsdl = soap_xmlParseFile(struri TSRMLS_CC);
if (!wsdl) {
- soap_error1(E_ERROR, Parsing WSDL: Couldn't load from '%s',
struri);
+ xmlErrorPtr xmlErrorPtr = xmlGetLastError();
+ if (xmlErrorPtr) {
+ soap_error2(E_ERROR, Parsing WSDL: Couldn't load from
'%s' : %s, struri, xmlErrorPtr-message);
+ } else {
+ soap_error1(E_ERROR, Parsing WSDL: Couldn't load from
'%s', struri);
+ }
}
zend_hash_add(ctx-docs, struri, strlen(struri)+1, (void**)wsdl,
sizeof(xmlDocPtr), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap/tests/bugs bug44811.phpt
davidc Wed May 7 15:45:56 2008 UTC
Modified files:
/php-src/ext/soap/tests/bugsbug44811.phpt
Log:
- Test for bug #44811
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug44811.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug44811.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug44811.phpt:1.2
--- /dev/null Wed May 7 15:45:56 2008
+++ php-src/ext/soap/tests/bugs/bug44811.phpt Wed May 7 15:45:56 2008
@@ -0,0 +1,20 @@
+--TEST--
+Bug #44811 (Improve error messages when creating new SoapClient
+which contains invalid data)
+--SKIPIF--
+?php require_once 'skipif.inc'; ?
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+?php
+try {
+$x = new SoapClient('http://slashdot.org');
+} catch (SoapFault $e) {
+echo $e-getMessage() . PHP_EOL;
+}
+die('ok');
+?
+--EXPECT--
+SOAP-ERROR: Parsing WSDL: Couldn't load from 'http://slashdot.org' : Premature
end of data in tag html line 3
+
+ok
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
davidc Wed May 7 15:47:04 2008 UTC Modified files: /php-srcNEWS Log: - Added news item to the NEWS (Fixed bug 44811) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2160r2=1.2161diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2160 php-src/NEWS:1.2161 --- php-src/NEWS:1.2160 Fri Mar 28 23:59:37 2008 +++ php-src/NEWSWed May 7 15:47:04 2008 @@ -51,4 +51,5 @@ - Added ext/hash support to ext/session's ID generator. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) - +- Fixed bug #44811 (Improve error message when creating a new SoapClient that + contains invalid data). (Markus Fischer, David 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/soap php_sdl.c
davidc Wed May 7 15:23:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap php_sdl.c
Log:
- Fixed bug #44811 (Improve error message when creating a new SoapClient that
contains invalid data)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.9.2.2r2=1.88.2.12.2.9.2.3diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.2
php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.3
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.2Mon Dec 31 07:17:13 2007
+++ php-src/ext/soap/php_sdl.c Wed May 7 15:23:10 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.2 2007/12/31 07:17:13 sebastian Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.3 2008/05/07 15:23:10 davidc Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -240,7 +240,13 @@
wsdl = soap_xmlParseFile(struri TSRMLS_CC);
if (!wsdl) {
- soap_error1(E_ERROR, Parsing WSDL: Couldn't load from '%s',
struri);
+ xmlErrorPtr xmlErrorPtr = xmlGetLastError();
+
+ if (xmlErrorPtr) {
+ soap_error2(E_ERROR, Parsing WSDL: Couldn't load from
'%s' : %s, struri, xmlErrorPtr-message);
+ } else {
+ soap_error1(E_ERROR, Parsing WSDL: Couldn't load from
'%s', struri);
+ }
}
zend_hash_add(ctx-docs, struri, strlen(struri)+1, (void**)wsdl,
sizeof(xmlDocPtr), NULL);
--
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) / NEWS
davidc Wed May 7 15:27:25 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Added NEWS item for fixation of bug 44811 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.178r2=1.2027.2.547.2.965.2.179diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.178 php-src/NEWS:1.2027.2.547.2.965.2.179 --- php-src/NEWS:1.2027.2.547.2.965.2.178 Wed May 7 12:04:37 2008 +++ php-src/NEWSWed May 7 15:27:25 2008 @@ -264,6 +264,8 @@ (Tony) - Fixed bug #27372 (parse error loading browscap.ini at apache startup). (Jani) +- Fixed bug #44811 (Improve error message when creating a new SoapClient that + contains invalid data). (Markus Fischer, David C) 30 Aug 2007, PHP 5.2.4 - Removed --enable-versioning configure option. (Jani) -- 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) /tests/lang bug30638.phpt
davidc Sat Mar 8 18:50:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/tests/lang bug30638.phpt
Log:
- Ok to fail on OSX, adjusted bug, patch from scoates
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug30638.phpt?r1=1.2.4.2r2=1.2.4.2.2.1diff_format=u
Index: php-src/tests/lang/bug30638.phpt
diff -u php-src/tests/lang/bug30638.phpt:1.2.4.2
php-src/tests/lang/bug30638.phpt:1.2.4.2.2.1
--- php-src/tests/lang/bug30638.phpt:1.2.4.2Sun Feb 11 20:12:53 2007
+++ php-src/tests/lang/bug30638.phptSat Mar 8 18:50:14 2008
@@ -4,6 +4,8 @@
?php # try to activate a german locale
if (setlocale(LC_NUMERIC, de_DE, de, german, ge) === FALSE) {
print skip setlocale() failed;
+} elseif (strtolower(php_uname('s')) == 'darwin') {
+print skip ok to fail on MacOS X;
}
?
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug30638.phpt
davidc Sat Mar 8 19:05:48 2008 UTC
Modified files:
/php-src/tests/lang bug30638.phpt
Log:
- MFB. Ok to fail on OSX. Patch from scoates
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug30638.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/tests/lang/bug30638.phpt
diff -u php-src/tests/lang/bug30638.phpt:1.5
php-src/tests/lang/bug30638.phpt:1.6
--- php-src/tests/lang/bug30638.phpt:1.5Sun Feb 24 13:10:33 2008
+++ php-src/tests/lang/bug30638.phptSat Mar 8 19:05:48 2008
@@ -4,6 +4,8 @@
?php # try to activate a german locale
if (setlocale(LC_NUMERIC, de_DE, de, german, ge) === FALSE) {
print skip;
+} elseif (strtolower(php_uname('s')) == 'darwin') {
+print skip ok to fail on MacOS X;
}
?
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests bug38474.phpt
davidc Sat Mar 8 19:08:58 2008 UTC
Modified files:
/php-src/ext/dom/tests bug38474.phpt
Log:
- Skipif libxml dotted version is 2.6.20. Patch from scoates
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug38474.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/dom/tests/bug38474.phpt
diff -u php-src/ext/dom/tests/bug38474.phpt:1.3
php-src/ext/dom/tests/bug38474.phpt:1.4
--- php-src/ext/dom/tests/bug38474.phpt:1.3 Mon Nov 13 12:53:50 2006
+++ php-src/ext/dom/tests/bug38474.phpt Sat Mar 8 19:08:58 2008
@@ -1,7 +1,12 @@
--TEST--
Bug #38474 (getAttribute select attribute by order, even when prefixed) (OK to
fail with libxml2 2.6.2x)
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php
+require_once('skipif.inc');
+if (version_compare(LIBXML_DOTTED_VERSION, 2.6.20, )) {
+print skip libxml version . LIBXML_DOTTED_VERSION;
+}
+?
--FILE--
?php
$xml = b'node xmlns:pre=http://foo.com/tr/pre;
--
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/dom/tests bug38474.phpt
davidc Sat Mar 8 19:11:18 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/dom/tests bug38474.phpt
Log:
- MFH
- If libxml dotted version smaller than 2.6.20 it's a fail. Patch from scoates
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug38474.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
Index: php-src/ext/dom/tests/bug38474.phpt
diff -u php-src/ext/dom/tests/bug38474.phpt:1.1.2.3
php-src/ext/dom/tests/bug38474.phpt:1.1.2.3.2.1
--- php-src/ext/dom/tests/bug38474.phpt:1.1.2.3 Sat Jan 20 19:19:29 2007
+++ php-src/ext/dom/tests/bug38474.phpt Sat Mar 8 19:11:18 2008
@@ -1,7 +1,12 @@
--TEST--
Bug #38474 (getAttribute select attribute by order, even when prefixed) (OK to
fail with libxml2 2.6.2x)
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php
+require_once('skipif.inc');
+if (version_compare(LIBXML_DOTTED_VERSION, 2.6.20, )) {
+print skip libxml version . LIBXML_DOTTED_VERSION;
+}
+?
--FILE--
?php
$xml = 'node xmlns:pre=http://foo.com/tr/pre;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests bug38474.phpt
davidc Sat Mar 8 19:14:38 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/dom/tests bug38474.phpt
Log:
- MFH . Libxml version 2.6.21 it fails. Patch from scoates
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug38474.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/dom/tests/bug38474.phpt
diff -u php-src/ext/dom/tests/bug38474.phpt:1.1.2.3
php-src/ext/dom/tests/bug38474.phpt:1.1.2.4
--- php-src/ext/dom/tests/bug38474.phpt:1.1.2.3 Sat Jan 20 19:19:29 2007
+++ php-src/ext/dom/tests/bug38474.phpt Sat Mar 8 19:14:38 2008
@@ -1,7 +1,12 @@
--TEST--
Bug #38474 (getAttribute select attribute by order, even when prefixed) (OK to
fail with libxml2 2.6.2x)
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php
+require_once('skipif.inc');
+if (version_compare(LIBXML_DOTTED_VERSION, 2.6.20, )) {
+print skip libxml version . LIBXML_DOTTED_VERSION;
+}
+?
--FILE--
?php
$xml = 'node xmlns:pre=http://foo.com/tr/pre;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
davidc Tue Jan 29 01:44:38 2008 UTC
Modified files:
/php-src/ext/standard string.c
Log:
- Good proto message and description of function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.665r2=1.666diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.665 php-src/ext/standard/string.c:1.666
--- php-src/ext/standard/string.c:1.665 Mon Jan 21 14:37:19 2008
+++ php-src/ext/standard/string.c Tue Jan 29 01:44:38 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.665 2008/01/21 14:37:19 tony2001 Exp $ */
+/* $Id: string.c,v 1.666 2008/01/29 01:44:38 davidc Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3889,8 +3889,8 @@
}
/* }}} */
-/* {{{ proto string ucfirst(string str) U
- Makes a string's first character uppercase */
+/* {{{ proto string lcfirst(string str) U
+ Makes a string's first character lowercase */
PHP_FUNCTION(lcfirst)
{
zstr str;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c php_string.h string.c /ext/standard/tests/strings lcfirst.phpt
On Jan 27, 2008 2:36 PM, Hannes Magnusson [EMAIL PROTECTED] wrote: 2008/1/19 David Coallier [EMAIL PROTECTED]: davidc Sat Jan 19 19:23:25 2008 UTC Added files: /php-src/ext/standard/tests/strings lcfirst.phpt Modified files: /php-src/ext/standard basic_functions.c php_string.h string.c Log: - Added lcfirst() function. The sister function of ucfirst() - Test #1 for lcfirst() This test is failing with unicode_semantics=on (and has a really weird testname). Arrrgh! this switch! :)) Ok will fix and commit sorry about that. -Hannes -- David Coallier, Founder Software Architect, Agora Production (http://agoraproduction.com) 51.42.06.70.18 -- 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) / NEWS
davidc Mon Jan 21 18:28:12 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Added lcfirst() announcement. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.79r2=1.2027.2.547.2.965.2.80diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.79 php-src/NEWS:1.2027.2.547.2.965.2.80 --- php-src/NEWS:1.2027.2.547.2.965.2.79Sun Jan 20 14:14:28 2008 +++ php-src/NEWSMon Jan 21 18:28:11 2008 @@ -74,6 +74,7 @@ . Added access to internal values of DSA, RSA and DH keys - Improved memory usage by moving constants to read only memory. (Dmitry, Pierre) +- Added lcfirst() function. (David C) - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) -- 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/standard basic_functions.c php_string.h string.c /ext/standard/tests/strings lcfirst.phpt
davidc Sat Jan 19 19:27:22 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings lcfirst.phpt
Modified files:
/php-src/ext/standard basic_functions.c php_string.h string.c
Log:
- MFH (lcfirst())
- Initial test for lcfirst
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.15r2=1.725.2.31.2.64.2.16diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.15
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.16
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.15 Mon Dec 31
07:17:14 2007
+++ php-src/ext/standard/basic_functions.c Sat Jan 19 19:27:21 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.15 2007/12/31 07:17:14 sebastian
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.16 2008/01/19 19:27:21 davidc
Exp $ */
#include php.h
#include php_streams.h
@@ -2624,6 +2624,11 @@
ZEND_END_ARG_INFO()
static
+ZEND_BEGIN_ARG_INFO(arginfo_lcfirst, 0)
+ ZEND_ARG_INFO(0, str)
+ZEND_END_ARG_INFO()
+
+static
ZEND_BEGIN_ARG_INFO(arginfo_ucwords, 0)
ZEND_ARG_INFO(0, str)
ZEND_END_ARG_INFO()
@@ -3148,6 +3153,7 @@
PHP_FE(substr_replace,
arginfo_substr_replace)
PHP_FE(quotemeta,
arginfo_quotemeta)
PHP_FE(ucfirst,
arginfo_ucfirst)
+ PHP_FE(lcfirst,
arginfo_lcfirst)
PHP_FE(ucwords,
arginfo_ucwords)
PHP_FE(strtr,
arginfo_strtr)
PHP_FE(addslashes,
arginfo_addslashes)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_string.h?r1=1.87.2.2.2.3.2.1r2=1.87.2.2.2.3.2.2diff_format=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.87.2.2.2.3.2.1
php-src/ext/standard/php_string.h:1.87.2.2.2.3.2.2
--- php-src/ext/standard/php_string.h:1.87.2.2.2.3.2.1 Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/php_string.h Sat Jan 19 19:27:21 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_string.h,v 1.87.2.2.2.3.2.1 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: php_string.h,v 1.87.2.2.2.3.2.2 2008/01/19 19:27:21 davidc Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -53,6 +53,7 @@
PHP_FUNCTION(substr);
PHP_FUNCTION(quotemeta);
PHP_FUNCTION(ucfirst);
+PHP_FUNCTION(lcfirst);
PHP_FUNCTION(ucwords);
PHP_FUNCTION(strtr);
PHP_FUNCTION(strrev);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.10r2=1.445.2.14.2.69.2.11diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.10
php-src/ext/standard/string.c:1.445.2.14.2.69.2.11
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.10 Wed Jan 16 08:34:33 2008
+++ php-src/ext/standard/string.c Sat Jan 19 19:27:21 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.10 2008/01/16 08:34:33 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.11 2008/01/19 19:27:21 davidc Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2646,6 +2646,36 @@
}
/* }}} */
+/* {{{
+ Lowercase the first character of the word in a native string */
+static void php_lcfirst(char *str)
+{
+ register char *r;
+ r = str;
+ *r = tolower((unsigned char) *r);
+}
+/* }}} */
+
+/* {{{ proto string ucfirst(string str)
+ Make a string's first character lowercase */
+PHP_FUNCTION(lcfirst)
+{
+ char *str;
+ int str_len;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, str,
str_len) == FAILURE) {
+ return;
+ }
+
+ if (!str_len) {
+ RETURN_EMPTY_STRING();
+ }
+
+ ZVAL_STRINGL(return_value, str, str_len, 1);
+ php_lcfirst(Z_STRVAL_P(return_value));
+}
+/* }}} */
+
/* {{{ proto string ucwords(string str)
Uppercase the first character of every word in a string */
PHP_FUNCTION(ucwords)
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c php_string.h string.c /ext/standard/tests/strings lcfirst.phpt
davidc Sat Jan 19 19:23:25 2008 UTC
Added files:
/php-src/ext/standard/tests/strings lcfirst.phpt
Modified files:
/php-src/ext/standard basic_functions.c php_string.h string.c
Log:
- Added lcfirst() function. The sister function of ucfirst()
- Test #1 for lcfirst()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.886r2=1.887diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.886
php-src/ext/standard/basic_functions.c:1.887
--- php-src/ext/standard/basic_functions.c:1.886Mon Dec 31 07:12:15 2007
+++ php-src/ext/standard/basic_functions.c Sat Jan 19 19:23:25 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.886 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: basic_functions.c,v 1.887 2008/01/19 19:23:25 davidc Exp $ */
#include php.h
#include php_streams.h
@@ -2635,6 +2635,11 @@
ZEND_END_ARG_INFO()
static
+ZEND_BEGIN_ARG_INFO(arginfo_lcfirst, 0)
+ ZEND_ARG_INFO(0, str)
+ZEND_END_ARG_INFO()
+
+static
ZEND_BEGIN_ARG_INFO(arginfo_ucwords, 0)
ZEND_ARG_INFO(0, str)
ZEND_END_ARG_INFO()
@@ -3189,6 +3194,7 @@
PHP_FE(substr_replace,
arginfo_substr_replace)
PHP_FE(quotemeta,
arginfo_quotemeta)
PHP_FE(ucfirst,
arginfo_ucfirst)
+ PHP_FE(lcfirst,
arginfo_lcfirst)
PHP_FE(ucwords,
arginfo_ucwords)
PHP_FE(strtr,
arginfo_strtr)
PHP_FE(addslashes,
arginfo_addslashes)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_string.h?r1=1.109r2=1.110diff_format=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.109
php-src/ext/standard/php_string.h:1.110
--- php-src/ext/standard/php_string.h:1.109 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/php_string.h Sat Jan 19 19:23:25 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_string.h,v 1.109 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: php_string.h,v 1.110 2008/01/19 19:23:25 davidc Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -54,6 +54,7 @@
PHP_FUNCTION(substr);
PHP_FUNCTION(quotemeta);
PHP_FUNCTION(ucfirst);
+PHP_FUNCTION(lcfirst);
PHP_FUNCTION(ucwords);
PHP_FUNCTION(strtr);
PHP_FUNCTION(strrev);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.662r2=1.663diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.662 php-src/ext/standard/string.c:1.663
--- php-src/ext/standard/string.c:1.662 Wed Jan 16 08:34:06 2008
+++ php-src/ext/standard/string.c Sat Jan 19 19:23:25 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.662 2008/01/16 08:34:06 tony2001 Exp $ */
+/* $Id: string.c,v 1.663 2008/01/19 19:23:25 davidc Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3856,6 +3856,69 @@
}
/* }}} */
+/* {{{ php_u_lcfirst()
+ Makes an Unicode string's first character lowercase */
+static void php_u_lcfirst(UChar *ustr, int ustr_len, zval *return_value
TSRMLS_DC)
+{
+ UChar tmp[3] = { 0, 0, 0 }; /* UChar32 will be converted to upto 2
UChar units */
+ int tmp_len = 0;
+ int pos = 0;
+ UErrorCode status = U_ZERO_ERROR;
+
+ U16_FWD_1(ustr, pos, ustr_len);
+ tmp_len = u_strToUpper(tmp, sizeof(tmp)/sizeof(UChar), ustr, pos,
UG(default_locale), status);
+
+ Z_USTRVAL_P(return_value) = eumalloc(tmp_len + ustr_len - pos+1);
+
+ Z_USTRVAL_P(return_value)[0] = tmp[0];
+ if (tmp_len 1) {
+ Z_USTRVAL_P(return_value)[1] = tmp[1];
+ }
+ u_memcpy(Z_USTRVAL_P(return_value)+tmp_len, ustr + pos, ustr_len -
pos+1);
+ Z_USTRLEN_P(return_value) = tmp_len + ustr_len - pos;
+}
+/* }}} */
+
+/* {{{ php_lcfirst
+ Lowercase the first character of the word in a native string */
+static void php_lcfirst(char *str)
+{
+ register char *r;
+ r = str;
+ *r = tolower((unsigned char) *r);
+}
+/* }}} */
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings ucfirst.phpt
davidc Wed Jan 16 12:56:20 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings ucfirst.phpt Log: - Making sure the tests are not failing after modifications to the new zend-parsing-parameters in ucfirst() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucfirst.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u Index: php-src/ext/standard/tests/strings/ucfirst.phpt diff -u php-src/ext/standard/tests/strings/ucfirst.phpt:1.1.2.3 php-src/ext/standard/tests/strings/ucfirst.phpt:1.1.2.3.2.1 --- php-src/ext/standard/tests/strings/ucfirst.phpt:1.1.2.3 Thu Apr 26 23:30:00 2007 +++ php-src/ext/standard/tests/strings/ucfirst.phpt Wed Jan 16 12:56:20 2008 @@ -171,8 +171,8 @@ Testing Miscelleneous inputs --- Testing arrays --- -Notice: Array to string conversion in %s on line %d -string(5) Array +Warning: ucfirst() expects parameter 1 to be string, array given in %s on line %d +NULL --- Testing objects --- string(12) Hello, world @@ -208,9 +208,9 @@ string(5) Hello error conditions -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 0 given in %s on line %d -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings ucfirst1.phpt
davidc Wed Jan 16 13:12:52 2008 UTC Modified files: /php-src/ext/standard/tests/strings ucfirst1.phpt Log: - MFB - Make sure to return the good error message with new parse parameters api of ucfirst() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucfirst1.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/strings/ucfirst1.phpt diff -u php-src/ext/standard/tests/strings/ucfirst1.phpt:1.3 php-src/ext/standard/tests/strings/ucfirst1.phpt:1.4 --- php-src/ext/standard/tests/strings/ucfirst1.phpt:1.3Mon May 14 13:05:29 2007 +++ php-src/ext/standard/tests/strings/ucfirst1.phptWed Jan 16 13:12:51 2008 @@ -171,8 +171,8 @@ Testing Miscelleneous inputs --- Testing arrays --- -Notice: Array to string conversion in %s on line %d -string(5) Array +Warning: ucfirst() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL --- Testing objects --- string(12) Hello, world @@ -208,12 +208,13 @@ string(5) Hello error conditions -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 0 given in %s on line %d -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d Done + --UEXPECTF-- Basic and Various operations -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings ucfirst1.phpt
davidc Wed Jan 16 13:27:01 2008 UTC Modified files: /php-src/ext/standard/tests/strings ucfirst1.phpt Log: - run-tests.php -U - The unicode test's error messages are working http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucfirst1.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/standard/tests/strings/ucfirst1.phpt diff -u php-src/ext/standard/tests/strings/ucfirst1.phpt:1.4 php-src/ext/standard/tests/strings/ucfirst1.phpt:1.5 --- php-src/ext/standard/tests/strings/ucfirst1.phpt:1.4Wed Jan 16 13:12:51 2008 +++ php-src/ext/standard/tests/strings/ucfirst1.phptWed Jan 16 13:27:01 2008 @@ -254,8 +254,8 @@ Testing Miscelleneous inputs --- Testing arrays --- -Notice: Array to string conversion in %s on line %d -unicode(5) Array +Warning: ucfirst() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL --- Testing objects --- unicode(12) Hello, world @@ -291,9 +291,9 @@ unicode(5) Hello error conditions -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 0 given in %s on line %d -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d -Warning: Wrong parameter count for ucfirst() in %s on line %d +Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
davidc Wed Jan 16 03:09:01 2008 UTC
Modified files:
/php-src/ext/standard string.c
Log:
- Make sure ucfirst is using the new zend-parse-parameters api
- added php_ucfirst for non-unicode calls
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.660r2=1.661diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.660 php-src/ext/standard/string.c:1.661
--- php-src/ext/standard/string.c:1.660 Thu Jan 10 14:31:11 2008
+++ php-src/ext/standard/string.c Wed Jan 16 03:09:01 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.660 2008/01/10 14:31:11 tony2001 Exp $ */
+/* $Id: string.c,v 1.661 2008/01/16 03:09:01 davidc Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3858,23 +3858,34 @@
/* {{{ php_u_ucfirst()
Makes an Unicode string's first character uppercase */
-static void php_u_ucfirst(zval *ustr, zval *return_value TSRMLS_DC)
+static void php_u_ucfirst(UChar *ustr, int ustr_len, zval *return_value
TSRMLS_DC)
{
UChar tmp[3] = { 0, 0, 0 }; /* UChar32 will be converted to upto 2
UChar units */
int tmp_len = 0;
int pos = 0;
UErrorCode status = U_ZERO_ERROR;
- U16_FWD_1(Z_USTRVAL_P(ustr), pos, Z_USTRLEN_P(ustr));
- tmp_len = u_strToUpper(tmp, sizeof(tmp)/sizeof(UChar),
Z_USTRVAL_P(ustr), pos, UG(default_locale), status);
+ U16_FWD_1(ustr, pos, ustr_len);
+ tmp_len = u_strToUpper(tmp, sizeof(tmp)/sizeof(UChar), ustr, pos,
UG(default_locale), status);
- Z_USTRVAL_P(return_value) = eumalloc(tmp_len+Z_USTRLEN_P(ustr)-pos+1);
+ Z_USTRVAL_P(return_value) = eumalloc(tmp_len + ustr_len - pos+1);
+
Z_USTRVAL_P(return_value)[0] = tmp[0];
if (tmp_len 1) {
Z_USTRVAL_P(return_value)[1] = tmp[1];
}
- u_memcpy(Z_USTRVAL_P(return_value)+tmp_len, Z_USTRVAL_P(ustr)+pos,
Z_USTRLEN_P(ustr)-pos+1);
- Z_USTRLEN_P(return_value) = tmp_len+Z_USTRLEN_P(ustr)-pos;
+ u_memcpy(Z_USTRVAL_P(return_value)+tmp_len, ustr + pos, ustr_len -
pos+1);
+ Z_USTRLEN_P(return_value) = tmp_len + ustr_len - pos;
+}
+/* }}} */
+
+/* {{{ php_ucfirst
+ Uppercase the first character of the word in a native string */
+static void php_ucfirst(char *str)
+{
+ register char *r;
+ r = str;
+ *r = toupper((unsigned char) *r);
}
/* }}} */
@@ -3882,29 +3893,29 @@
Makes a string's first character uppercase */
PHP_FUNCTION(ucfirst)
{
- zval **str;
-
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, str) == FAILURE)
{
- WRONG_PARAM_COUNT;
- }
-
- if (Z_TYPE_PP(str) != IS_UNICODE Z_TYPE_PP(str) != IS_STRING) {
- convert_to_text_ex(str);
- }
+ zstr str;
+ intstr_len;
+ zend_uchar str_type;
- if (Z_TYPE_PP(str) == IS_UNICODE !Z_USTRLEN_PP(str)) {
- RETURN_EMPTY_UNICODE();
- } else if (!Z_STRLEN_PP(str)) {
- RETURN_EMPTY_STRING();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, t, str,
str_len, str_type) == FAILURE) {
+ return;
}
+
+ if (str_len == 0) {
+ if (str_type == IS_UNICODE) {
+ RETURN_EMPTY_UNICODE();
+ } else {
+ RETURN_EMPTY_STRING();
+ }
+ }
- if (Z_TYPE_PP(str) == IS_UNICODE) {
+ if (str_type == IS_UNICODE) {
Z_TYPE_P(return_value) = IS_UNICODE;
- php_u_ucfirst(*str, return_value TSRMLS_CC);
+ php_u_ucfirst(str.u, str_len, return_value TSRMLS_CC);
} else {
- ZVAL_STRINGL(return_value, Z_STRVAL_PP(str), Z_STRLEN_PP(str),
1);
- *Z_STRVAL_P(return_value) = toupper((unsigned char)
*Z_STRVAL_P(return_value));
- }
+ ZVAL_STRINGL(return_value, str.s, str_len, ZSTR_DUPLICATE);
+ php_ucfirst(Z_STRVAL_P(return_value));
+ }
}
/* }}} */
--
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/standard string.c
davidc Wed Jan 16 03:11:27 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
Log:
- MFH
- Making sure this is also using the good zend parsing and added
the php_ucfirst function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.8r2=1.445.2.14.2.69.2.9diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.8
php-src/ext/standard/string.c:1.445.2.14.2.69.2.9
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.8 Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/string.c Wed Jan 16 03:11:26 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.8 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.9 2008/01/16 03:11:26 davidc Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2616,23 +2616,33 @@
}
/* }}} */
+/* {{{ php_ucfirst
+ Uppercase the first character of the word in a native string */
+static void php_ucfirst(char *str)
+{
+ register char *r;
+ r = str;
+ *r = toupper((unsigned char) *r);
+}
+/* }}} */
+
/* {{{ proto string ucfirst(string str)
Makes a string's first character uppercase */
PHP_FUNCTION(ucfirst)
{
- zval **str;
+ char *str;
+ int str_len;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, str) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, str,
str_len) == FAILURE) {
+ return;
}
- convert_to_string_ex(str);
- if (!Z_STRLEN_PP(str)) {
+ if (!str_len) {
RETURN_EMPTY_STRING();
}
- ZVAL_STRINGL(return_value, Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1);
- *Z_STRVAL_P(return_value) = toupper((unsigned char)
*Z_STRVAL_P(return_value));
+ ZVAL_STRINGL(return_value, str, str_len, 1);
+ php_ucfirst(Z_STRVAL_P(return_value));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_array.c
davidc Sat Dec 15 01:18:28 2007 UTC
Modified files:
/php-src/ext/splspl_array.c
Log:
- MFB: Bug #41528
- Added possibility to serialize and unserialize classes that extend to
ArrayObject
- See ext/spl/tests/array_023.phpt and ext/spl/tests/bug41528.php for
references
- Put a folding for all SPL_ARRAY_METHOD() def
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.133r2=1.134diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.133 php-src/ext/spl/spl_array.c:1.134
--- php-src/ext/spl/spl_array.c:1.133 Fri Dec 14 22:52:53 2007
+++ php-src/ext/spl/spl_array.c Sat Dec 15 01:18:28 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.133 2007/12/14 22:52:53 colder Exp $ */
+/* $Id: spl_array.c,v 1.134 2007/12/15 01:18:28 davidc Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -25,7 +25,10 @@
#include php.h
#include php_ini.h
#include ext/standard/info.h
+#include ext/standard/php_var.h
+#include ext/standard/php_smart_str.h
#include zend_interfaces.h
+#include zend_API.h
#include zend_exceptions.h
#include php_spl.h
@@ -53,7 +56,7 @@
#define SPL_ARRAY_IS_SELF0x0200
#define SPL_ARRAY_USE_OTHER 0x0400
#define SPL_ARRAY_INT_MASK 0x
-#define SPL_ARRAY_CLONE_MASK 0x0307
+#define SPL_ARRAY_CLONE_MASK 0x030F
typedef struct _spl_array_object {
zend_object std;
@@ -69,7 +72,7 @@
zend_class_entry* ce_get_iterator;
} spl_array_object;
-static inline HashTable *spl_array_get_hash_table(spl_array_object* intern,
int check_std_props TSRMLS_DC) {
+static inline HashTable *spl_array_get_hash_table(spl_array_object* intern,
int check_std_props TSRMLS_DC) { /* {{{ */
if ((intern-ar_flags SPL_ARRAY_IS_SELF) != 0) {
return intern-std.properties;
} else if ((intern-ar_flags SPL_ARRAY_USE_OTHER) (check_std_props
== 0 || (intern-ar_flags SPL_ARRAY_STD_PROP_LIST) == 0)
Z_TYPE_P(intern-array) == IS_OBJECT) {
@@ -80,7 +83,7 @@
} else {
return HASH_OF(intern-array);
}
-}
+} /* }}} */
SPL_API int spl_hash_verify_pos(spl_array_object * intern TSRMLS_DC) /* {{{ */
{
@@ -553,7 +556,6 @@
spl_array_write_dimension_ex(0, getThis(), index, value TSRMLS_CC);
} /* }}} */
-
void spl_array_iterator_append(zval *object, zval *append_value TSRMLS_DC) /*
{{{ */
{
spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
@@ -600,7 +602,7 @@
spl_array_unset_dimension_ex(0, getThis(), index TSRMLS_CC);
} /* }}} */
-/* {{ proto array ArrayObject::getArrayCopy() U
+/* {{{ proto array ArrayObject::getArrayCopy() U
proto array ArrayIterator::getArrayCopy() U
Return a copy of the contained array */
SPL_METHOD(Array, getArrayCopy)
@@ -759,11 +761,11 @@
}
} /* }}} */
-/* define an overloaded iterator structure */
+/* {{{ define an overloaded iterator structure */
typedef struct {
zend_user_iteratorintern;
spl_array_object *object;
-} spl_array_it;
+} spl_array_it; /* }}} */
static void spl_array_it_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
@@ -892,7 +894,7 @@
}
/* }}} */
-/* iterator handler table */
+/* {{{ iterator handler table */
zend_object_iterator_funcs spl_array_it_funcs = {
spl_array_it_dtor,
spl_array_it_valid,
@@ -900,7 +902,7 @@
spl_array_it_get_current_key,
spl_array_it_move_forward,
spl_array_it_rewind
-};
+}; /* }}} */
zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval
*object, int by_ref TSRMLS_DC) /* {{{ */
{
@@ -1201,6 +1203,7 @@
RETURN_LONG(count);
} /* }}} */
+/* {{{ static void spl_array_method */
static void spl_array_method(INTERNAL_FUNCTION_PARAMETERS, char *fname, int
fname_len, int use_arg)
{
spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
@@ -1220,45 +1223,41 @@
} else {
zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value, 1, tmp, NULL TSRMLS_CC);
}
-}
+} /* }}} */
+/* {{{ SPL_ARRAY_METHOD */
#define SPL_ARRAY_METHOD(cname, fname, use_arg) \
SPL_METHOD(cname, fname) \
{ \
spl_array_method(INTERNAL_FUNCTION_PARAM_PASSTHRU, #fname,
sizeof(#fname)-1, use_arg); \
}
-/* {{{ proto int ArrayObject::asort() U
+/* proto int ArrayObject::asort() U
proto int ArrayIterator::asort() U
Sort the entries by values. */
SPL_ARRAY_METHOD(Array, asort, 0)
-/* }}} */
-/* {{{ proto int ArrayObject::ksort() U
+/* proto int ArrayObject::ksort() U
proto int ArrayIterator::ksort() U
Sort the entries by key. */
SPL_ARRAY_METHOD(Array, ksort, 0)
-/* }}} */
-/* {{{ proto int ArrayObject::uasort(callback cmp_function) U
+/* proto int
[PHP-CVS] cvs: php-src /ext/spl/tests array_023.phpt bug41528.phpt
davidc Fri Dec 14 04:23:09 2007 UTC
Added files:
/php-src/ext/spl/tests array_023.phpt
Modified files:
/php-src/ext/spl/tests bug41528.phpt
Log:
- MFB: Merged bug41528.phpt test from 5_3
- Added a very similar test but this one just makes sure we keep
all the properties of the class members that we just serialized
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug41528.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/bug41528.phpt
diff -u /dev/null php-src/ext/spl/tests/bug41528.phpt:1.2
--- /dev/null Fri Dec 14 04:23:09 2007
+++ php-src/ext/spl/tests/bug41528.phpt Fri Dec 14 04:23:09 2007
@@ -0,0 +1,37 @@
+--TEST--
+Bug #41528 (Classes extending ArrayObject do not serialize correctly)
+--FILE--
+?php
+class ClassOne extends ArrayObject
+{
+public $a = 2;
+}
+
+$classOne= new ClassOne();
+$classOne-a = 1;
+
+var_dump($classOne);
+var_dump($classOne-a);
+
+$classOne = unserialize(serialize($classOne));
+
+var_dump($classOne);
+var_dump($classOne-a);
+?
+--EXPECT--
+object(ClassOne)#1 (2) {
+ [a]=
+ int(1)
+ [storage:ArrayObject:private]=
+ array(0) {
+ }
+}
+int(1)
+object(ClassOne)#2 (2) {
+ [a]=
+ int(1)
+ [storage:ArrayObject:private]=
+ array(0) {
+ }
+}
+int(1)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_023.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/array_023.phpt
+++ php-src/ext/spl/tests/array_023.phpt
--TEST--
Testing class extending to ArrayObject and serialize
--FILE--
?php
class Name extends ArrayObject
{
public $var = 'a';
protected $bar = 'b';
private $foo = 'c';
}
$a = new Name();
var_dump($a);
var_dump($a-var);
$a = unserialize(serialize($a));
var_dump($a);
var_dump($a-var);
?
--EXPECT--
object(Name)#1 (4) {
[var]=
string(1) a
[bar:protected]=
string(1) b
[foo:Name:private]=
string(1) c
[storage:ArrayObject:private]=
array(0) {
}
}
string(1) a
object(Name)#2 (4) {
[var]=
string(1) a
[bar:protected]=
string(1) b
[foo:Name:private]=
string(1) c
[storage:ArrayObject:private]=
array(0) {
}
}
string(1) a
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests array_023.phpt
davidc Fri Dec 14 04:49:47 2007 UTC
Modified files:
/php-src/ext/spl/tests array_023.phpt
Log:
- Added other test with some unicode words (Sorry if this chinese word
turns out to be offensive I have no clue what it means, just copied it)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_023.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/array_023.phpt
diff -u php-src/ext/spl/tests/array_023.phpt:1.1
php-src/ext/spl/tests/array_023.phpt:1.2
--- php-src/ext/spl/tests/array_023.phpt:1.1Fri Dec 14 04:23:09 2007
+++ php-src/ext/spl/tests/array_023.phptFri Dec 14 04:49:47 2007
@@ -19,6 +19,22 @@
var_dump($a);
var_dump($a-var);
+class Sláinte extends ArrayObject
+{
+public $var = 'tá';
+protected $bar = 'trÃ';
+private $foo = 'å¹´';
+}
+
+$a = new Sláinte();
+var_dump($a);
+var_dump($a-var);
+
+$a = unserialize(serialize($a));
+
+var_dump($a);
+var_dump($a-var);
+
?
--EXPECT--
object(Name)#1 (4) {
@@ -45,3 +61,27 @@
}
}
string(1) a
+object(Sláinte)#1 (4) {
+ [var]=
+ string(3) tá
+ [bar:protected]=
+ string(4) trÃ
+ [foo:Sláinte:private]=
+ string(3) å¹´
+ [storage:ArrayObject:private]=
+ array(0) {
+ }
+}
+string(3) tá
+object(Sláinte)#2 (4) {
+ [var]=
+ string(3) tá
+ [bar:protected]=
+ string(4) trÃ
+ [foo:Sláinte:private]=
+ string(3) å¹´
+ [storage:ArrayObject:private]=
+ array(0) {
+ }
+}
+string(3) tá
--
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/spl/tests bug41528.phpt
davidc Wed Dec 12 00:34:06 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/spl/tests bug41528.phpt Log: - Unit test for bug #41528 - Checking that when you serialize a class that extends to ArrayObject Is keeping it's properties. http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug41528.phpt?view=markuprev=1.1 Index: php-src/ext/spl/tests/bug41528.phpt +++ php-src/ext/spl/tests/bug41528.phpt -- 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/spl spl_array.c
davidc Wed Dec 12 03:29:32 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_array.c
Log:
- Nitpicking, using same code (without unicode handling) than in HEAD
just removed useless } else {
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.7r2=1.71.2.17.2.13.2.8diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.7
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.8
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.7 Fri Dec 7 13:33:10 2007
+++ php-src/ext/spl/spl_array.c Wed Dec 12 03:29:31 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.7 2007/12/07 13:33:10 rrichards Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.8 2007/12/12 03:29:31 davidc Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1481,9 +1481,9 @@
if (buf.c) {
RETURN_STRINGL(buf.c, buf.len, 0);
- } else {
- RETURN_NULL();
}
+
+ RETURN_NULL();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT /pear avail
davidc Wed May 16 13:46:40 2007 UTC Modified files: /CVSROOT/pear avail Log: - Added marcelo araujo for Text_CAPTCHA_Numeral http://cvs.php.net/viewvc.cgi/CVSROOT/pear/avail?r1=1.5r2=1.6diff_format=u Index: CVSROOT/pear/avail diff -u CVSROOT/pear/avail:1.5 CVSROOT/pear/avail:1.6 --- CVSROOT/pear/avail:1.5 Fri May 11 21:20:47 2007 +++ CVSROOT/pear/avail Wed May 16 13:46:40 2007 @@ -131,6 +131,7 @@ avail|ifeghali|pear/MDB2_Schema avail|janisto|pear/Validate,peardoc avail|tias|pear/PEAR_Frontend_Web,peardoc +avail|msaraujo|pear/Text_CAPTCHA_Numeral avail|fernandoc,marcelo|peardoc/pt_BR # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT /pear avail
davidc Tue May 8 02:18:32 2007 UTC Modified files: /CVSROOT/pear avail Log: - Added wiesemann to access pearweb http://cvs.php.net/viewvc.cgi/CVSROOT/pear/avail?r1=1.3r2=1.4diff_format=u Index: CVSROOT/pear/avail diff -u CVSROOT/pear/avail:1.3 CVSROOT/pear/avail:1.4 --- CVSROOT/pear/avail:1.3 Wed Apr 25 00:21:03 2007 +++ CVSROOT/pear/avail Tue May 8 02:18:32 2007 @@ -23,7 +23,7 @@ avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay|php-src/pear,pear-core # PEAR website and weekly news -avail|wez,alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber,cellog,dufuz,danielc,lsmith,arnaud,davidc|pearweb +avail|wez,alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber,cellog,dufuz,danielc,lsmith,arnaud,davidc,wiesemann|pearweb avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews # PEAR website QA -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
