[PHP-CVS] cvs: CVSROOT / avail
philip Wed Dec 31 07:25:00 2008 UTC Modified files: /CVSROOTavail Log: - systems karma for philip olson (philip) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1483&r2=1.1484&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1483 CVSROOT/avail:1.1484 --- CVSROOT/avail:1.1483Tue Dec 30 20:52:59 2008 +++ CVSROOT/avail Wed Dec 31 07:25:00 2008 @@ -125,7 +125,7 @@ avail|changelog|php-src,php-gtk,Zend,ZendEngine2,smarty # Some people have access to change the day-to-day code on the various php.net machines -avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori|systems +avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip|systems # Finally, there are various people with access to various bits and # pieces of other CVS modules. -- 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 /ext/spl spl_array.c /ext/spl/tests array_018.phpt
colder Tue Dec 30 23:34:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/splspl_array.c
/php-src/ext/spl/tests array_018.phpt
Log:
MFH: Fix #45820 (Empty ArrayObject keys not allowed)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.427&r2=1.2027.2.547.2.965.2.428&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.427
php-src/NEWS:1.2027.2.547.2.965.2.428
--- php-src/NEWS:1.2027.2.547.2.965.2.427 Mon Dec 29 09:58:18 2008
+++ php-src/NEWSTue Dec 30 23:34:29 2008
@@ -33,6 +33,7 @@
(Scott)
- Fixed bug #45989 (json_decode() doesn't return NULL on certain invalid
strings). (magicaltux, Scott)
+- Fixed bug #45820 (Allow empty keys in ArrayObject). (Etienne)
- Fixed bug #45791 (json_decode() doesn't convert 0e0 to a double). (Scott)
04 Dec 2008, PHP 5.3.0 Alpha 3
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.35&r2=1.71.2.17.2.13.2.36&diff_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.35
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.36
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.35 Wed Nov 19 17:53:47 2008
+++ php-src/ext/spl/spl_array.c Tue Dec 30 23:34:29 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.35 2008/11/19 17:53:47 lbarnaud Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.36 2008/12/30 23:34:29 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -433,10 +433,6 @@
}
switch(Z_TYPE_P(offset)) {
case IS_STRING:
- if (*Z_STRVAL_P(offset) == '\0') {
- zend_throw_exception(spl_ce_InvalidArgumentException,
"An offset must not begin with \\0 or be empty", 0 TSRMLS_CC);
- return;
- }
Z_ADDREF_P(value);
zend_symtable_update(spl_array_get_hash_table(intern, 0
TSRMLS_CC), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void**)&value,
sizeof(void*), NULL);
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_018.phpt?r1=1.1.2.2.4.2&r2=1.1.2.2.4.3&diff_format=u
Index: php-src/ext/spl/tests/array_018.phpt
--
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 /ext/spl/tests array_018.phpt
colder Tue Dec 30 23:32:50 2008 UTC
Modified files:
/php-src/ext/splspl_array.c
/php-src/ext/spl/tests array_018.phpt
Log:
Fix #45820 (Empty ArrayObject keys not allowed)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.159&r2=1.160&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.159 php-src/ext/spl/spl_array.c:1.160
--- php-src/ext/spl/spl_array.c:1.159 Wed Nov 19 17:54:24 2008
+++ php-src/ext/spl/spl_array.c Tue Dec 30 23:32:50 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.159 2008/11/19 17:54:24 lbarnaud Exp $ */
+/* $Id: spl_array.c,v 1.160 2008/12/30 23:32:50 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -436,11 +436,6 @@
switch(Z_TYPE_P(offset)) {
case IS_STRING:
case IS_UNICODE:
- /* FIXME: Unicode support??? */
- if (Z_STRVAL_P(offset)[0] == '\0') {
- zend_throw_exception(spl_ce_InvalidArgumentException,
"An offset must not begin with \\0 or be empty", 0 TSRMLS_CC);
- return;
- }
Z_ADDREF_P(value);
zend_u_symtable_update(spl_array_get_hash_table(intern, 0
TSRMLS_CC), Z_TYPE_P(offset), Z_UNIVAL_P(offset), Z_UNILEN_P(offset)+1,
(void**)&value, sizeof(void*), NULL);
return;
@@ -1712,7 +1707,7 @@
}
if (buf_len == 0) {
- zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0
TSRMLS_CC, "Empty serialized string cannot be empty");
+ zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0
TSRMLS_CC, "Serialized string cannot be empty");
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_018.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/spl/tests/array_018.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Tue Dec 30 20:53:00 2008 UTC Modified files: /CVSROOTavail Log: - phpdoc karma for John Jawed (jawed) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1482&r2=1.1483&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1482 CVSROOT/avail:1.1483 --- CVSROOT/avail:1.1482Sun Dec 28 19:25:26 2008 +++ CVSROOT/avail Tue Dec 30 20:52:59 2008 @@ -41,7 +41,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zimt,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,cos! tra,fancao0515,tibee,eriksson,wenz,bs,anderson,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingf! s,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,um ut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,! eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,tessus,gavinfo,rant,ramsey,arkadius,erinet,omar,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,asbjornit,philippe,sezer,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi,abedford,morgue,nilgun,saltybeagle,dedemorton,eniac2008|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpd! oc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpd oc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb +avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jone
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session mod_files.bat
andrei Tue Dec 30 19:37:35 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/sessionmod_files.bat Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.bat?view=markup&rev=1.1 Index: php-src/ext/session/mod_files.bat +++ php-src/ext/session/mod_files.bat @ECHO OFF SETLOCAL ENABLEDELAYEDEXPANSION IF _%1_==_AUTO_ ( GOTO MakeDirs ) IF _%2_==__ ( ECHO Usage %0 ^ ^ ^[^hash_bits^] ECHO. ECHO Where ^ is the session directory ECHO ^ is the number of levels defined in session.save_path ECHO ^[hash_bits^] is the number of bits defined in session.hash_bits_per_character EXIT /B 1 ) SET /A Depth=%2 + 0 2>NUL IF /I %ERRORLEVEL% EQU 9167 GOTO DepthError IF _%Depth%_==__ GOTO DepthError IF /I %Depth% LEQ 0 GOTO DepthError IF _%3_==__ GOTO DefaultBits SET /A Bits=%3 + 0 2>NUL IF /I %ERRORLEVEL% EQU 9167 GOTO BitsError IF _%Bits%_==__ GOTO BitsError IF /I %Bits% LSS 4 GOTO BitsError IF /I %Bits% GTR 6 GOTO BitsError GOTO BitsSet :DefaultBits SET Bits=4 :BitsSet SET HashChars=0 1 2 3 4 5 6 7 8 9 A B C D E F IF /I %Bits% GEQ 5 SET HashChars=!HashChars! G H I J K L M N O P Q R S T U V IF /I %Bits% GEQ 6 SET HashChars=!HashChars! W X Y Z - , FOR %%A IN (%HashChars%) DO ( ECHO Making %%A CALL "%~0" AUTO "%~1\%%~A" %Depth% ) GOTO :EOF :MakeDirs MKDIR "%~2" SET /A ThisDepth=%3 - 1 IF /I %ThisDepth% GTR 0 FOR %%A IN (%HashChars%) DO CALL "%~0" AUTO "%~2\%%~A" %ThisDepth% GOTO :EOF :DepthError ECHO ERROR: Invalid depth : %2 EXIT /B 0 :BitsError ECHO ERROR: Invalid hash_bits : %3 EXIT /B 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session mod_files.bat
andrei Tue Dec 30 19:37:08 2008 UTC Added files: /php-src/ext/sessionmod_files.bat Log: Add mod_files.bat (equivalent to mod_files.sh). http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.bat?view=markup&rev=1.1 Index: php-src/ext/session/mod_files.bat +++ php-src/ext/session/mod_files.bat @ECHO OFF SETLOCAL ENABLEDELAYEDEXPANSION IF _%1_==_AUTO_ ( GOTO MakeDirs ) IF _%2_==__ ( ECHO Usage %0 ^ ^ ^[^hash_bits^] ECHO. ECHO Where ^ is the session directory ECHO ^ is the number of levels defined in session.save_path ECHO ^[hash_bits^] is the number of bits defined in session.hash_bits_per_character EXIT /B 1 ) SET /A Depth=%2 + 0 2>NUL IF /I %ERRORLEVEL% EQU 9167 GOTO DepthError IF _%Depth%_==__ GOTO DepthError IF /I %Depth% LEQ 0 GOTO DepthError IF _%3_==__ GOTO DefaultBits SET /A Bits=%3 + 0 2>NUL IF /I %ERRORLEVEL% EQU 9167 GOTO BitsError IF _%Bits%_==__ GOTO BitsError IF /I %Bits% LSS 4 GOTO BitsError IF /I %Bits% GTR 6 GOTO BitsError GOTO BitsSet :DefaultBits SET Bits=4 :BitsSet SET HashChars=0 1 2 3 4 5 6 7 8 9 A B C D E F IF /I %Bits% GEQ 5 SET HashChars=!HashChars! G H I J K L M N O P Q R S T U V IF /I %Bits% GEQ 6 SET HashChars=!HashChars! W X Y Z - , FOR %%A IN (%HashChars%) DO ( ECHO Making %%A CALL "%~0" AUTO "%~1\%%~A" %Depth% ) GOTO :EOF :MakeDirs MKDIR "%~2" SET /A ThisDepth=%3 - 1 IF /I %ThisDepth% GTR 0 FOR %%A IN (%HashChars%) DO CALL "%~0" AUTO "%~2\%%~A" %ThisDepth% GOTO :EOF :DepthError ECHO ERROR: Invalid depth : %2 EXIT /B 0 :BitsError ECHO ERROR: Invalid hash_bits : %3 EXIT /B 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard credits.c
helly Tue Dec 30 19:13:25 2008 UTC
Modified files:
/php-src/ext/standard credits.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.51&r2=1.52&diff_format=u
Index: php-src/ext/standard/credits.c
diff -u php-src/ext/standard/credits.c:1.51 php-src/ext/standard/credits.c:1.52
--- php-src/ext/standard/credits.c:1.51 Tue Dec 9 10:53:29 2008
+++ php-src/ext/standard/credits.c Tue Dec 30 19:13:25 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: credits.c,v 1.51 2008/12/09 10:53:29 jani Exp $ */
+/* $Id: credits.c,v 1.52 2008/12/30 19:13:25 helly Exp $ */
#include "php.h"
#include "info.h"
@@ -57,14 +57,14 @@
} else {
php_info_print_table_header(1, "Language Design &
Concept");
}
- php_info_print_table_row(1, "Andi Gutmans, Rasmus Lerdorf, Zeev
Suraski");
+ php_info_print_table_row(1, "Andi Gutmans, Rasmus Lerdorf, Zeev
Suraski, Marcus Boerger");
php_info_print_table_end();
/* PHP Language */
php_info_print_table_start();
php_info_print_table_colspan_header(2, "PHP Authors");
php_info_print_table_header(2, "Contribution", "Authors");
- CREDIT_LINE("Zend Scripting Language Engine", "Andi Gutmans,
Zeev Suraski");
+ CREDIT_LINE("Zend Scripting Language Engine", "Andi Gutmans,
Zeev Suraski, Stanislav Malyshev, Marcus Boerger, Dmitry Stogov");
CREDIT_LINE("Extension Module API", "Andi Gutmans, Zeev
Suraski, Andrei Zmievski");
CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken,
Sascha Schumann, Jani Taskinen");
CREDIT_LINE("Win32 Port", "Shane Caraveo, Zeev Suraski, Wez
Furlong");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c
iliaa Tue Dec 30 19:11:21 2008 UTC
Modified files:
/php-src/ext/pdo_mysql mysql_driver.c
Log:
MFB: Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL).
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.84&r2=1.85&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.84
php-src/ext/pdo_mysql/mysql_driver.c:1.85
--- php-src/ext/pdo_mysql/mysql_driver.c:1.84 Mon Oct 27 18:29:56 2008
+++ php-src/ext/pdo_mysql/mysql_driver.cTue Dec 30 19:11:21 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysql_driver.c,v 1.84 2008/10/27 18:29:56 johannes Exp $ */
+/* $Id: mysql_driver.c,v 1.85 2008/12/30 19:11:21 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -657,12 +657,12 @@
{
local_infile = 0;
}
-
+#ifdef MYSQL_OPT_LOCAL_INFILE
if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const
char *)&local_infile)) {
pdo_mysql_error(dbh);
goto cleanup;
}
-
+#endif
#ifdef MYSQL_OPT_RECONNECT
/* since 5.0.3, the default for this option is 0 if not
specified.
* we want the old behaviour */
--
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 mysql_driver.c
iliaa Tue Dec 30 19:11:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_mysql mysql_driver.c
Log:
MFB: Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL).
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.13.2.5.2.6&r2=1.59.2.13.2.5.2.7&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.6
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.7
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5.2.6 Mon Oct 27
18:32:08 2008
+++ php-src/ext/pdo_mysql/mysql_driver.cTue Dec 30 19:11:13 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysql_driver.c,v 1.59.2.13.2.5.2.6 2008/10/27 18:32:08 johannes Exp $
*/
+/* $Id: mysql_driver.c,v 1.59.2.13.2.5.2.7 2008/12/30 19:11:13 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -657,12 +657,12 @@
{
local_infile = 0;
}
-
+#ifdef MYSQL_OPT_LOCAL_INFILE
if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const
char *)&local_infile)) {
pdo_mysql_error(dbh);
goto cleanup;
}
-
+#endif
#ifdef MYSQL_OPT_RECONNECT
/* since 5.0.3, the default for this option is 0 if not
specified.
* we want the old behaviour */
--
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 /ext/pdo_mysql mysql_driver.c
iliaa Tue Dec 30 19:10:59 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_mysql mysql_driver.c
/php-srcNEWS
Log:
Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL).
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.13.2.6&r2=1.59.2.13.2.7&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.6
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.7
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.6 Mon Dec 31 07:20:09 2007
+++ php-src/ext/pdo_mysql/mysql_driver.cTue Dec 30 19:10:59 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mysql_driver.c,v 1.59.2.13.2.6 2007/12/31 07:20:09 sebastian Exp $ */
+/* $Id: mysql_driver.c,v 1.59.2.13.2.7 2008/12/30 19:10:59 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -496,12 +496,12 @@
if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') ||
PG(safe_mode)) {
local_infile = 0;
}
-
+#ifdef MYSQL_OPT_LOCAL_INFILE
if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const
char *)&local_infile)) {
pdo_mysql_error(dbh);
goto cleanup;
}
-
+#endif
#ifdef MYSQL_OPT_RECONNECT
/* since 5.0.3, the default for this option is 0 if not
specified.
* we want the old behaviour */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1372&r2=1.2027.2.547.2.1373&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1372 php-src/NEWS:1.2027.2.547.2.1373
--- php-src/NEWS:1.2027.2.547.2.1372Mon Dec 29 15:44:49 2008
+++ php-src/NEWSTue Dec 30 19:10:59 2008
@@ -10,6 +10,7 @@
(Fixes CVE-2008-5498) (Scott)
- Fixed a segfault when malformed string is passed to json_decode(). (Scott)
+- Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL). (Ilia)
- Fixed bug #46959 (Unable to disable PCRE). (Scott)
- Fixed bug #46918 (imap_rfc822_parse_adrlist host part not filled in
correctly).
(Felipe)
--
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 info.c
helly Tue Dec 30 19:10:37 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- MFH Show version and ini entries as default module info.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.17&r2=1.249.2.10.2.14.2.18&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.17
php-src/ext/standard/info.c:1.249.2.10.2.14.2.18
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.17Tue Dec 30 12:50:16 2008
+++ php-src/ext/standard/info.c Tue Dec 30 19:10:37 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.17 2008/12/30 12:50:16 felipe Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.18 2008/12/30 19:10:37 helly Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -89,26 +89,29 @@
}
-PHPAPI void php_info_print_module(zend_module_entry *module TSRMLS_DC) /* {{{
*/
+PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /*
{{{ */
{
- if (module->info_func) {
+ if (zend_module->info_func || zend_module->version) {
if (!sapi_module.phpinfo_as_text) {
- php_printf("%s\n",
module->name, module->name);
+ php_printf("%s\n",
zend_module->name, zend_module->name);
} else {
php_info_print_table_start();
- php_info_print_table_header(1, module->name);
+ php_info_print_table_header(1, zend_module->name);
php_info_print_table_end();
}
- module->info_func(module TSRMLS_CC);
+ if (zend_module->info_func) {
+ zend_module->info_func(zend_module TSRMLS_CC);
+ } else {
+ php_info_print_table_start();
+ php_info_print_table_row(2, "Version",
zend_module->version);
+ php_info_print_table_end();
+ DISPLAY_INI_ENTRIES();
+ }
} else {
if (!sapi_module.phpinfo_as_text) {
- php_printf("");
- php_printf("");
- php_printf("%s", module->name);
- php_printf("\n");
+ php_printf("
[PHP-CVS] cvs: php-src /ext/standard info.c
helly Tue Dec 30 19:10:22 2008 UTC
Modified files:
/php-src/ext/standard info.c
Log:
- Show version and ini entries as default module info.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.297&r2=1.298&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.297 php-src/ext/standard/info.c:1.298
--- php-src/ext/standard/info.c:1.297 Tue Dec 30 12:48:00 2008
+++ php-src/ext/standard/info.c Tue Dec 30 19:10:22 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.297 2008/12/30 12:48:00 felipe Exp $ */
+/* $Id: info.c,v 1.298 2008/12/30 19:10:22 helly Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -194,26 +194,29 @@
}
/* }}} */
-PHPAPI void php_info_print_module(zend_module_entry *module TSRMLS_DC) /* {{{
*/
+PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /*
{{{ */
{
- if (module->info_func) {
+ if (zend_module->info_func || zend_module->version) {
if (!sapi_module.phpinfo_as_text) {
- php_info_printf("%s\n", module->name, module->name);
+ php_info_printf("%s\n", zend_module->name, zend_module->name);
} else {
php_info_print_table_start();
- php_info_print_table_header(1, module->name);
+ php_info_print_table_header(1, zend_module->name);
php_info_print_table_end();
}
- module->info_func(module TSRMLS_CC);
+ if (zend_module->info_func) {
+ zend_module->info_func(zend_module TSRMLS_CC);
+ } else {
+ php_info_print_table_start();
+ php_info_print_table_row(2, "Version",
zend_module->version);
+ php_info_print_table_end();
+ DISPLAY_INI_ENTRIES();
+ }
} else {
if (!sapi_module.phpinfo_as_text) {
- php_info_printf("");
- php_info_printf("");
- php_info_printf("%s", module->name);
- php_info_printf("\n");
+ php_info_printf("%s\n",
zend_module->name);
} else {
- php_info_printf("%s", module->name);
- php_info_printf("\n");
+ php_info_printf("%s\n", zend_module->name);
}
}
}
@@ -221,7 +224,7 @@
static int _display_module_info_func(zend_module_entry *module TSRMLS_DC) /*
{{{ */
{
- if (module->info_func) {
+ if (module->info_func || module->version) {
php_info_print_module(module TSRMLS_CC);
}
return ZEND_HASH_APPLY_KEEP;
@@ -230,7 +233,7 @@
static int _display_module_info_def(zend_module_entry *module TSRMLS_DC) /*
{{{ */
{
- if (!module->info_func) {
+ if (!module->info_func && !module->version) {
php_info_print_module(module TSRMLS_CC);
}
return ZEND_HASH_APPLY_KEEP;
@@ -862,7 +865,7 @@
SECTION("Additional Modules");
php_info_print_table_start();
- php_info_print_table_header(1, "Module Name");
+ php_info_print_table_header(2, "Module Name");
zend_hash_apply(&sorted_registry, (apply_func_t)
_display_module_info_def TSRMLS_CC);
php_info_print_table_end();
--
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 php_ini.c
helly Tue Dec 30 19:08:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main php_ini.c
Log:
- MFH Do not show empty ini directive tables for modules without ini entries.
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.15.2.11&r2=1.136.2.4.2.15.2.12&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.15.2.11
php-src/main/php_ini.c:1.136.2.4.2.15.2.12
--- php-src/main/php_ini.c:1.136.2.4.2.15.2.11 Wed Aug 13 17:49:13 2008
+++ php-src/main/php_ini.c Tue Dec 30 19:08:54 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.136.2.4.2.15.2.11 2008/08/13 17:49:13 pajoye Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.15.2.12 2008/12/30 19:08:54 helly Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -132,11 +132,24 @@
}
/* }}} */
+/* {{{ php_ini_available
+ */
+static int php_ini_available(zend_ini_entry *ini_entry, int
*module_number_available TSRMLS_DC)
+{
+ if (ini_entry->module_number == *module_number_available) {
+ *module_number_available = -1;
+ return ZEND_HASH_APPLY_STOP;
+ } else {
+ return ZEND_HASH_APPLY_KEEP;
+ }
+}
+/* }}} */
+
/* {{{ display_ini_entries
*/
PHPAPI void display_ini_entries(zend_module_entry *module)
{
- int module_number;
+ int module_number, module_number_available;
TSRMLS_FETCH();
if (module) {
@@ -144,10 +157,14 @@
} else {
module_number = 0;
}
- php_info_print_table_start();
- php_info_print_table_header(3, "Directive", "Local Value", "Master
Value");
- zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t)
php_ini_displayer, (void *) (zend_intptr_t) module_number TSRMLS_CC);
- php_info_print_table_end();
+ module_number_available = module_number;
+ zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t)
php_ini_available, &module_number_available TSRMLS_CC);
+ if (module_number_available == -1) {
+ php_info_print_table_start();
+ php_info_print_table_header(3, "Directive", "Local Value",
"Master Value");
+ zend_hash_apply_with_argument(EG(ini_directives),
(apply_func_arg_t) php_ini_displayer, (void *) (zend_intptr_t) module_number
TSRMLS_CC);
+ php_info_print_table_end();
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_ini.c
helly Tue Dec 30 19:08:43 2008 UTC
Modified files:
/php-src/main php_ini.c
Log:
- Do not show empty ini directive tables for modules without ini entries.
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.169&r2=1.170&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.169 php-src/main/php_ini.c:1.170
--- php-src/main/php_ini.c:1.169Wed Aug 13 21:51:54 2008
+++ php-src/main/php_ini.c Tue Dec 30 19:08:42 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.169 2008/08/13 21:51:54 pajoye Exp $ */
+/* $Id: php_ini.c,v 1.170 2008/12/30 19:08:42 helly Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -132,11 +132,24 @@
}
/* }}} */
+/* {{{ php_ini_available
+ */
+static int php_ini_available(zend_ini_entry *ini_entry, int
*module_number_available TSRMLS_DC)
+{
+ if (ini_entry->module_number == *module_number_available) {
+ *module_number_available = -1;
+ return ZEND_HASH_APPLY_STOP;
+ } else {
+ return ZEND_HASH_APPLY_KEEP;
+ }
+}
+/* }}} */
+
/* {{{ display_ini_entries
*/
PHPAPI void display_ini_entries(zend_module_entry *module)
{
- int module_number;
+ int module_number, module_number_available;
TSRMLS_FETCH();
if (module) {
@@ -144,10 +157,14 @@
} else {
module_number = 0;
}
- php_info_print_table_start();
- php_info_print_table_header(3, "Directive", "Local Value", "Master
Value");
- zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t)
php_ini_displayer, (void *) (zend_intptr_t) module_number TSRMLS_CC);
- php_info_print_table_end();
+ module_number_available = module_number;
+ zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t)
php_ini_available, &module_number_available TSRMLS_CC);
+ if (module_number_available == -1) {
+ php_info_print_table_start();
+ php_info_print_table_header(3, "Directive", "Local Value",
"Master Value");
+ zend_hash_apply_with_argument(EG(ini_directives),
(apply_func_arg_t) php_ini_displayer, (void *) (zend_intptr_t) module_number
TSRMLS_CC);
+ php_info_print_table_end();
+ }
}
/* }}} */
--
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/standard/tests/file flock_variation.phpt
ant Tue Dec 30 17:11:57 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/fileflock_variation.phpt Log: Revert to the previous version for these tests as they were overwritten by mistake (checked on Windows but not on Linux... so the six skipped tests may not work correctly... but they should be ok and I'll watch the test results). http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_variation.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/file/flock_variation.phpt diff -u php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.2 php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.3 --- php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.2Tue Nov 25 11:31:24 2008 +++ php-src/ext/standard/tests/file/flock_variation.phptTue Dec 30 17:11:57 2008 @@ -1,45 +1,328 @@ --TEST-- -Test flock() function: usage variations +Test flock() function: Variations --FILE-- --EXPECTF-- -*** Test flock() function: with the operations given as numeric values *** +*** Testing flock() fun with the various operation and +wouldblock values*** +--- Outer iteration 0 --- +bool(true) +-- Inner iteration 0 in 0 -- +bool(true) +-- Inner iteration 1 in 0 -- +bool(true) +-- Inner iteration 2 in 0 -- +bool(true) +-- Inner iteration 3 in 0 -- +bool(true) +-- Inner iteration 4 in 0 -- +bool(true) +-- Inner iteration 5 in 0 -- +bool(true) +-- Inner iteration 6 in 0 -- +bool(true) +-- Inner iteration 7 in 0 -- +bool(true) +-- Inner iteration 8 in 0 -- +bool(true) +-- Inner iteration 9 in 0 -- +bool(true) +-- Inner iteration 10 in 0 -- +bool(true) +-- Inner iteration 11 in 0 -- +bool(true) +--- Outer iteration 1 --- +bool(true) +-- Inner iteration 0 in 1 -- +bool(true) +-- Inner iteration 1 in 1 -- +bool(true) +-- Inner iteration 2 in 1 -- +bool(true) +-- Inner iteration 3 in 1 -- +bool(true) +-- Inner iteration 4 in 1 -- +bool(true) +-- Inner iteration 5 in 1 -- +bool(true) +-- Inner iteration 6 in 1 -- +bool(true) +-- Inner iteration 7 in 1 -- +bool(true) +-- Inner iteration 8 in 1 -- +bool(true) +-- Inner iteration 9 in 1 -- +bool(true) +-- Inner iteration 10 in 1 -- +bool(true) +-- Inner iteration 11 in 1 -- +bool(true) +--- Outer iteration 2 --- +bool(true) +-- Inner iteration 0 in 2 -- +bool(true) +-- Inner iteration 1 in 2 -- +bool(true) +-- Inner iteration 2 in 2 -- +bool(true) +-- Inner iteration 3 in 2 -- +bool(true) +-- Inner iteration 4 in 2 -- +bool(true) +-- Inner iteration 5 in 2 -- +bool(true) +-- Inner iteration 6 in 2 -- +bool(true) +-- Inner iteration 7 in 2 -- +bool(true) +-- Inner iteration 8 in 2 -- +bool(true) +-- Inner iteration 9 in 2 -- +bool(true) +-- Inner iteration 10 in 2 -- +bool(true) +-- Inner iteration 11 in 2 -- +bool(true) +--- Outer iteration 3 --- +bool(true) +-- Inner iteration 0 in 3 -- +bool(true) +-- Inner iteration 1 in 3 -- +bool(true) +-- Inner iteration 2 in 3 -- +bool(true) +-- Inner iteration 3 in 3 -- +bool(true) +-- Inner iteration 4 in 3 -- +bool(true) +-- Inner iteration 5 in 3 -- +bool(true) +-- Inner iteration 6 in 3 -- +bool(true) +-- Inner iteration 7 in 3 -- +bool(true) +-- Inner iteration 8 in 3 -- +bool(true) +-- Inner iteration 9 in 3 -- +bool(true) +-- Inner iteration 10 in 3 -- +bool(true) +-- Inner iteration 11 in 3 -- +bool(true) +--- Outer iteration 4 --- +bool(true) +-- Inner iteration 0 in 4 -- +bool(true) +-- Inner iteration 1 in 4 -- +bool(true) +-- Inner iteration 2 in 4 -- +bool(true) +-- Inner iteration 3 in 4 -- +bool(true) +-- Inner iteration 4 in 4 -- +bool(true) +-- Inner iteration 5 in 4 -- +bool(true) +-- Inner iteration 6 in 4 -- +bool(true) +-- Inner iteration 7 in 4 -- bool(true) +-- Inner iteration 8 in 4 -- bool(true) +-- Inner iteration 9 in 4 -- bool(true) +-- Inner iteration 10 in 4 -- bool(true) +-- Inner iteration 11 in 4 -- bool(true) +--- Outer iteration 5 --- bool(true) +-- Inner iteration 0 in 5 -- bool(true) +-- Inner iteration 1 in 5 -- bool(true) +-- Inner iteration 2 in 5 -- +bool(true) +-- Inner iteration 3 in 5 -- +bool(true) +-- Inner iteration 4 in 5 -- +bool(true) +-- Inner iteration 5 in 5 -- +bool(true) +-- Inner iteration 6 in 5 -- +bool(true) +-- Inner iteration 7 in 5 -- +bool(true) +-- Inner iteration 8 in 5 -- +bool(true) +-- Inner iteration 9 in 5 -- +bool(true) +-- Inner iteration 10 in 5 -- +bool(true) +-- Inner iteration 11 in 5 -- +bool(true) +--- Outer iteration 6 --- +bool(true) +-- Inner iteration 0 in 6 -- +bool(true) +-- Inner iteration 1 in 6 -- +bool(true) +-- Inner iteration 2 in 6 -- +bool(true) +-- Inner iteration 3 in 6 -- +bool(true) +-- Inner iteration 4 in 6 -- +bool(true) +-- Inner iteration 5 in 6 -- +bool(true) +-- Inner iteration 6 in 6 -- +bool(true) +-- Inner iteration 7 in 6 -- +bool(true) +-- Inner iteration 8 in 6 -- +bool(true) +-- Inner iteration 9 in 6 -- +bool(true) +-- Inner iteration 10 in 6 -- +bool(t
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array array_rand_variation4.phpt array_slice_variation1.phpt arsort_variation3.phpt rsort_variation4.phpt /ext/standard/tests/file 006_error.phpt d
ant Tue Dec 30 17:06:50 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array rsort_variation4.phpt
array_rand_variation4.phpt
arsort_variation3.phpt
array_slice_variation1.phpt
/php-src/ext/standard/tests/file006_error.phpt
disk_total_space_variation.phpt
disk_total_space_error.phpt
disk_free_space_basic.phpt
disk_free_space_error.phpt
disk_free_space_variation.phpt
disk.phpt is_dir_variation2.phpt
disk_total_space_basic.phpt
Log:
Revert to the previous version for these tests as they were overwritten by
mistake (checked on Windows but not on Linux... so the six skipped tests may
not work correctly... but they should be ok and I'll watch the test results).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/rsort_variation4.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/standard/tests/array/rsort_variation4.phpt
diff -u php-src/ext/standard/tests/array/rsort_variation4.phpt:1.1.2.4
php-src/ext/standard/tests/array/rsort_variation4.phpt:1.1.2.5
--- php-src/ext/standard/tests/array/rsort_variation4.phpt:1.1.2.4 Tue Dec
2 13:37:21 2008
+++ php-src/ext/standard/tests/array/rsort_variation4.phpt Tue Dec 30
17:06:50 2008
@@ -1,5 +1,7 @@
--TEST--
Test rsort() function : usage variations - referenced variables
+--INI--
+allow_call_time_pass_reference=on
--FILE--
&int(33)
}
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_rand_variation4.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_rand_variation4.phpt
diff -u php-src/ext/standard/tests/array/array_rand_variation4.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_rand_variation4.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_rand_variation4.phpt:1.1.2.2 Tue Dec
2 13:37:19 2008
+++ php-src/ext/standard/tests/array/array_rand_variation4.phpt Tue Dec 30
17:06:50 2008
@@ -38,7 +38,7 @@
// array with special chars as keys
/*6*/ array('##' => "key1", '&$r' => 'key2', '!' => "key3", '<>' =>'key4',
- "NULL" => 'key5',
+ "NULL" => 'key5', "\n" => 'newline as key',
"\t" => "tab as key", "'" => 'single quote as key',
'"' => 'double quote as key', "\0" => "null char as key")
);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/arsort_variation3.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/standard/tests/array/arsort_variation3.phpt
diff -u php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.2.4
php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.2.5
--- php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.2.4 Tue Dec
2 13:37:18 2008
+++ php-src/ext/standard/tests/array/arsort_variation3.phpt Tue Dec 30
17:06:50 2008
@@ -1,9 +1,5 @@
--TEST--
Test arsort() function : usage variations - sort integer/float values
---SKIPIF--
-
--FILE--
---EXPECT--
+--EXPECTF--
*** Testing arsort() : usage variations ***
-- Testing arsort() by supplying various integer/float arrays --
@@ -277,7 +273,7 @@
bool(true)
array(7) {
[2]=>
- float(2147483648)
+ %s(2147483648)
[1]=>
int(2147483647)
[6]=>
@@ -287,15 +283,15 @@
[3]=>
int(-2147483647)
[4]=>
- float(-2147483648)
+ %s(-2147483648)
[7]=>
- float(-2147483649)
+ %s(-2147483649)
}
- Sort_flag = SORT_REGULAR -
bool(true)
array(7) {
[2]=>
- float(2147483648)
+ %s(2147483648)
[1]=>
int(2147483647)
[6]=>
@@ -305,15 +301,15 @@
[3]=>
int(-2147483647)
[4]=>
- float(-2147483648)
+ %s(-2147483648)
[7]=>
- float(-2147483649)
+ %s(-2147483649)
}
- Sort_flag = SORT_NUMERIC -
bool(true)
array(7) {
[2]=>
- float(2147483648)
+ %s(2147483648)
[1]=>
int(2147483647)
[6]=>
@@ -323,8 +319,8 @@
[3]=>
int(-2147483647)
[4]=>
- float(-2147483648)
+ %s(-2147483648)
[7]=>
- float(-2147483649)
+ %s(-2147483649)
}
Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice_variation1.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_slice_variation1.phpt
diff -u php-src/ext/standard/tests/array/array_slice_variation1.phpt:1.2.2.2
php-src/ext/standard/tests/array/array_slice_variation1.phpt:1.2.2.3
--- php-src/ext/standard/tests/array/array_slice_variation1.phpt:1.2.2.2
Thu Feb 14 11:15:53 2008
+++ php-src/ext/standard/tests/array/array_slice_variation1.phptTue Dec
30 17:06:50 2008
@@ -1,227 +1,61 @@
--
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_rand_variation4.phpt array_slice_variation1.phpt arsort_variation3.phpt each_variation4.phpt rsort_variation4.phpt /ext/standard/tests/
ant Tue Dec 30 16:49:44 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filedisk_free_space_error.phpt disk_total_space_variation.phpt fflush_error.phpt lstat_stat_variation2.phpt symlink_link_linkinfo_is_link_error2.phpt disk_free_space_variation.phpt disk_total_space_error.phpt fseek_ftell_rewind_error3.phpt fpassthru_error.phpt 006_variation2.phpt 006_error.phpt flock_variation.phpt ftruncate_error.phpt disk_free_space_basic.phpt fseek_ftell_rewind_error1.phpt fseek_ftell_rewind_error2.phpt disk.phpt disk_total_space_basic.phpt fread_error.phpt is_dir_variation2.phpt /php-src/ext/standard/tests/array array_slice_variation1.phpt each_variation4.phpt rsort_variation4.phpt arsort_variation3.phpt array_rand_variation4.phpt Log: Revert to the previous version for these tests as they were overwritten by mistake (checked on Windows but not on Linux... so the six skipped tests may not work correctly... but they should be ok and I'll watch the test results). http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_free_space_error.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u Index: php-src/ext/standard/tests/file/disk_free_space_error.phpt diff -u php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.2 php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.3 --- php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.2 Wed Nov 26 10:10:17 2008 +++ php-src/ext/standard/tests/file/disk_free_space_error.phpt Tue Dec 30 16:49:43 2008 @@ -1,15 +1,15 @@ --TEST-- -Test disk_free_space and its alias diskfreespace() functions : error conditions +Test disk_free_space and its alias diskfreespace() functions : error conditions. --SKIPIF-- --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_total_space_variation.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/disk_total_space_variation.phpt diff -u php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.2 Wed Nov 26 10:10:17 2008 +++ php-src/ext/standard/tests/file/disk_total_space_variation.phpt Tue Dec 30 16:49:43 2008 @@ -1,5 +1,5 @@ --TEST-- -Test disk_total_space() functions : usage variations +Testing disk_total_space() functions : Usage Variations. --FILE-- --CLEAN-- + + --EXPECTF-- *** Testing with a directory *** -float(%f) +float(%d) Testing for the return type *** bool(true) -*** Testing disk_total_space() function with different directory combinations *** +*** Testing with different directory combinations *** -- Iteration 1 -- -float(%f) +float(%d) -- Iteration 2 -- -float(%f) +float(%d) -- Iteration 3 -- -float(%f) +float(%d) -- Iteration 4 -- -float(%f) +float(%d) -- Iteration 5 -- -float(%f) +float(%d) -- Iteration 6 -- -float(%f) +float(%d) -- Iteration 7 -- -float(%f) +float(%d) -- Iteration 8 -- -float(%f) +float(%d) -- Iteration 9 -- -float(%f) +float(%d) -- Iteration 10 -- -float(%f) +float(%d) -- Iteration 11 -- -float(%f) +float(%d) -- Iteration 12 -- -float(%f) +float(%d) +*** Testing with Binary Input *** +float(%d) --- Done --- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fflush_error.phpt?r1=1.1.2.1.2.3&r2=1.1.2.1.2.4&diff_format=u Index: php-src/ext/standard/tests/file/fflush_error.phpt diff -u php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.3 php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.4 --- php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.3 Wed Nov 26 10:10:17 2008 +++ php-src/ext/standard/tests/file/fflush_error.phpt Tue Dec 30 16:49:43 2008 @@ -24,10 +24,9 @@ var_dump( fflush($file_handle, $file_handle) ); fclose($file_handle); -fflush($file_handle); // test invalid arguments : non-resources -echo "\n-- Testing fflush(): with invalid arguments -
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom/tests DOMCharacterData_appendData_basic.phpt DOMComment_appendData_basic_Sullivan.phpt DOMComment_replaceData_basic.phpt DOMDocumentFragment_appendXML_hasChild
zoe Tue Dec 30 15:57:23 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/dom/tests DOMElement_hasAttributes_basic.phpt DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt DOMNode_issamenode_basic.phpt DOMDocument_createProcessingInstruction_basic.phpt DOMComment_replaceData_basic.phpt DOMDocument_createAttribute_error1.phpt DOMComment_appendData_basic_Sullivan.phpt DOMDocument_createProcessingInstruction_error.phpt DOMDocument_createAttribute_basic.phpt DOMDocument_createAttribute_variation.phpt DOMCharacterData_appendData_basic.phpt DOMNode_normalize_basic.phpt DOMDocument_createAttribute_error.phpt Log: refixing missing skipif http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt diff -u php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.1.2.3 php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.1.2.4 --- php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.1.2.3 Mon Dec 1 11:30:10 2008 +++ php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt Tue Dec 30 15:57:22 2008 @@ -3,6 +3,8 @@ --CREDITS-- James Lewis #TestFest 2008 +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt diff -u php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt:1.1.2.3 php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt:1.1.2.4 --- php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt:1.1.2.3 Mon Dec 1 11:30:10 2008 +++ php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt Tue Dec 30 15:57:22 2008 @@ -1,5 +1,7 @@ --TEST-- Testing DOMDocumentFragment::appendXML and DOMDocumentFragment::hasChildNodes +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt diff -u php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt:1.1.2.3 php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt:1.1.2.4 --- php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt:1.1.2.3 Mon Dec 1 11:30:10 2008 +++ php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt Tue Dec 30 15:57:23 2008 @@ -3,6 +3,8 @@ --CREDITS-- James Lewis #TestFest 2008 +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.1.2.3 php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.1.2.4 --- php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.1.2.3 Mon Dec 1 11:30:10 2008 +++ php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt Tue Dec 30 15:57:23 2008 @@ -3,6 +3,8 @@ --CREDITS-- Muhammad Khalid Adnan # TestFest 2008 +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt diff -u php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.1.2.3 php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.1.2.4 --- php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.1.2.3 Mon Dec 1 11:30:10 2008 +++ php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt Tue Dec 30 15:57:23 2008 @@ -4,7 +4,7 @@ Andrew Larssen London TestFest 2008 --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.1.2.4 php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.1.2.5 --- php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.1.2.4 Mon Dec 1 11:30:10 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt Tue Dec 30 15:57:23 2008 @@ -3,6 +3,8 @@ --CREDITS-- Muhammad Khalid Adnan # TestFest 2008 +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.
[PHP-CVS] cvs: php-src /ext/dom/tests DOMCharacterData_appendData_basic.phpt DOMComment_appendData_basic_Sullivan.phpt DOMComment_replaceData_basic.phpt DOMDocumentFragment_appendXML_hasChildNodes_bas
zoe Tue Dec 30 15:56:44 2008 UTC Modified files: /php-src/ext/dom/tests DOMDocument_createProcessingInstruction_error.phpt DOMDocument_createAttribute_basic.phpt DOMDocument_createAttribute_error.phpt DOMDocument_createAttribute_variation.phpt DOMComment_replaceData_basic.phpt DOMElement_hasAttributes_basic.phpt DOMComment_appendData_basic_Sullivan.phpt DOMDocument_createProcessingInstruction_basic.phpt DOMCharacterData_appendData_basic.phpt DOMNode_issamenode_basic.phpt DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt DOMDocument_createAttribute_error1.phpt DOMNode_normalize_basic.phpt Log: refixing missing skipif http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt diff -u php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt:1.4 php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt:1.5 --- php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt:1.4 Mon Dec 1 11:30:39 2008 +++ php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt Tue Dec 30 15:56:43 2008 @@ -3,6 +3,8 @@ --CREDITS-- Muhammad Khalid Adnan # TestFest 2008 +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.5 php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.6 --- php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.5Mon Dec 1 11:30:39 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phptTue Dec 30 15:56:43 2008 @@ -3,6 +3,8 @@ --CREDITS-- Muhammad Khalid Adnan # TestFest 2008 +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.4 php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.5 --- php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.4Mon Dec 1 11:30:39 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_error.phptTue Dec 30 15:56:43 2008 @@ -1,5 +1,7 @@ --TEST-- Test DOMDocument::createAttribute() for expected expection thrown when wrong parameter passed +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.4 php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.5 --- php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.4 Mon Dec 1 11:30:39 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phptTue Dec 30 15:56:43 2008 @@ -1,5 +1,7 @@ --TEST-- Test DOMDocument::createAttribute() for expected return value +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt diff -u php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.5 php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.6 --- php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.5 Mon Dec 1 11:30:39 2008 +++ php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt Tue Dec 30 15:56:44 2008 @@ -4,7 +4,7 @@ Andrew Larssen London TestFest 2008 --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt diff -u php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.4 php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.5 --- php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.4 Mon Dec 1 11:30:39 2008 +++ php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt Tue Dec 30 15:56:44 2008 @@ -3,6 +3,8 @@ --CREDITS-- James Lewis #TestFest 2008 +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt?r1=1.5&r2
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests DOMComment_appendData_basic_Sullivan.phpt DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt DOMDocument_createAttribute_basic.phpt DOMDocument_creat
zoe Tue Dec 30 15:36:45 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/dom/tests DOMDocument_createAttribute_variation.phpt DOMDocument_createAttribute_error.phpt DOMDocument_createProcessingInstruction_basic.phpt DOMNode_normalize_basic.phpt DOMElement_hasAttributes_basic.phpt DOMComment_appendData_basic_Sullivan.phpt DOMNode_issamenode_basic.phpt DOMDocument_createAttribute_error1.phpt DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt DOMDocument_createProcessingInstruction_error.phpt DOMDocument_createAttribute_basic.phpt Log: re-adding skipifs http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt?r1=1.3.2.2&r2=1.3.2.3&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.3.2.2 php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.3.2.3 --- php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.3.2.2 Mon Dec 1 11:29:35 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phptTue Dec 30 15:36:45 2008 @@ -1,5 +1,7 @@ --TEST-- Test DOMDocument::createAttribute() for expected return value +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt?r1=1.3.2.2&r2=1.3.2.3&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.3.2.2 php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.3.2.3 --- php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.3.2.2 Mon Dec 1 11:29:35 2008 +++ php-src/ext/dom/tests/DOMDocument_createAttribute_error.phptTue Dec 30 15:36:45 2008 @@ -1,5 +1,7 @@ --TEST-- Test DOMDocument::createAttribute() for expected expection thrown when wrong parameter passed +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt?r1=1.3.2.2&r2=1.3.2.3&diff_format=u Index: php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.3.2.2 php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.3.2.3 --- php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.3.2.2 Mon Dec 1 11:29:35 2008 +++ php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt Tue Dec 30 15:36:45 2008 @@ -3,6 +3,8 @@ --CREDITS-- Muhammad Khalid Adnan # TestFest 2008 +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_normalize_basic.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/dom/tests/DOMNode_normalize_basic.phpt diff -u php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.2.2.2 php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.2.2.3 --- php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.2.2.2 Mon Dec 1 11:29:35 2008 +++ php-src/ext/dom/tests/DOMNode_normalize_basic.phpt Tue Dec 30 15:36:45 2008 @@ -1,15 +1,15 @@ --TEST-- -normalize() +DOMNode::normalize() --SKIPIF-- --FILE-- - + * * * This is the title * http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt?r1=1.3.2.2&r2=1.3.2.3&diff_format=u Index: php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt diff -u php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.3.2.2 php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.3.2.3 --- php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.3.2.2 Mon Dec 1 11:29:35 2008 +++ php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt Tue Dec 30 15:36:45 2008 @@ -1,5 +1,7 @@ --TEST-- DOMNode: hasAttributes() +--SKIPIF-- + --CREDITS-- James Lewis #TestFest 2008 http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt?r1=1.4.2.2&r2=1.4.2.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt diff -u php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.4.2.2 php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.4.2.3 --- php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.4.2.2 Mon Dec 1 11:29:35 2008 +++ php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt Tue Dec 30 15:36:45 2008 @@ -3,6 +3,8 @@ --CREDITS-- Mike Sullivan #TestFest 2008 (London) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt?r1=1.3.2.2&
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests DOMComment_replaceData_basic.phpt
zoe Tue Dec 30 13:06:25 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/dom/tests DOMComment_replaceData_basic.phpt Log: removed commented out SKIPIF http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt?r1=1.4.2.2&r2=1.4.2.3&diff_format=u Index: php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt diff -u php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.4.2.2 php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.4.2.3 --- php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.4.2.2 Mon Dec 1 11:29:35 2008 +++ php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt Tue Dec 30 13:06:25 2008 @@ -4,7 +4,7 @@ Andrew Larssen London TestFest 2008 --SKIPIF-- - + --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
felipe Tue Dec 30 12:50:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- MFH Added missing check for void param. (patch by Kalle)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.16&r2=1.249.2.10.2.14.2.17&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.16
php-src/ext/standard/info.c:1.249.2.10.2.14.2.17
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.16Tue Dec 9 17:57:59 2008
+++ php-src/ext/standard/info.c Tue Dec 30 12:50:16 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.16 2008/12/09 17:57:59 pajoye Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.17 2008/12/30 12:50:16 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1364,6 +1364,10 @@
Return comma-separated string of .ini files parsed from the additional ini
dir */
PHP_FUNCTION(php_ini_scanned_files)
{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
if (strlen(PHP_CONFIG_FILE_SCAN_DIR) && php_ini_scanned_files) {
RETURN_STRING(php_ini_scanned_files, 1);
} else {
@@ -1376,6 +1380,10 @@
Return the actual loaded ini filename */
PHP_FUNCTION(php_ini_loaded_file)
{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
if (php_ini_opened_path) {
RETURN_STRING(php_ini_opened_path, 1);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard info.c
felipe Tue Dec 30 12:48:00 2008 UTC
Modified files:
/php-src/ext/standard info.c
Log:
- Added missing check for void param. (patch by Kalle)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.296&r2=1.297&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.296 php-src/ext/standard/info.c:1.297
--- php-src/ext/standard/info.c:1.296 Fri Dec 12 10:33:05 2008
+++ php-src/ext/standard/info.c Tue Dec 30 12:48:00 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.296 2008/12/12 10:33:05 pajoye Exp $ */
+/* $Id: info.c,v 1.297 2008/12/30 12:48:00 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1323,6 +1323,10 @@
Return comma-separated string of .ini files parsed from the additional ini
dir */
PHP_FUNCTION(php_ini_scanned_files)
{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
if (strlen(PHP_CONFIG_FILE_SCAN_DIR) && php_ini_scanned_files) {
RETURN_RT_STRING(php_ini_scanned_files, ZSTR_DUPLICATE);
} else {
@@ -1335,6 +1339,10 @@
Return the actual loaded ini filename */
PHP_FUNCTION(php_ini_loaded_file)
{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
if (php_ini_opened_path) {
RETURN_STRING(php_ini_opened_path, 1);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
