[PHP-CVS] cvs: php4 /win32 php4dllts.dsp
zeevThu Jan 23 04:35:02 2003 EDT Modified files: /php4/win32 php4dllts.dsp Log: Fix .dsp Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.99 php4/win32/php4dllts.dsp:1.100 --- php4/win32/php4dllts.dsp:1.99 Thu Jan 16 13:25:59 2003 +++ php4/win32/php4dllts.dspThu Jan 23 04:35:02 2003 @@ -1372,6 +1372,122 @@ # End Source File # End Group +# End Group +# Begin Group "rpc" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 9" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\ext\rpc\rpc.c +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\rpc_proxy.c +# End Source File +# End Group +# Begin Group "Header Files No. 9" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\ext\rpc\handler.h +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\layer.h +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\php_rpc.h +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\rpc.h +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\rpc_proxy.h +# End Source File +# End Group +# Begin Group "com" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 10" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\ext\rpc\com\com.c +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\com\com_wrapper.c +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\com\conversion.c +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\com\dispatch.c +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\com\variant.c +# End Source File +# End Group +# Begin Group "Header Files No. 10" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\ext\rpc\com\com.h +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\com\com_wrapper.h +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\com\conversion.h +# End Source File +# Begin Source File + +SOURCE=..\ext\rpc\com\variant.h +# End Source File +# End Group +# End Group +# End Group +# Begin Group "zlib" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 10 Nr. 1" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\ext\zlib\zlib.c +# End Source File +# Begin Source File + +SOURCE=..\ext\zlib\zlib_fopen_wrapper.c +# End Source File +# End Group +# Begin Group "Header Files No. 10 Nr. 1" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\ext\zlib\php_zlib.h +# End Source File +# End Group +# End Group +# Begin Group "Standard" + +# PROP Default_Filter "" # Begin Group "Source Files No. 1" # PROP Default_Filter "" @@ -1805,118 +1921,6 @@ # Begin Source File SOURCE=..\ext\standard\url_scanner_ex.h -# End Source File -# End Group -# End Group -# Begin Group "rpc" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 9" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\ext\rpc\rpc.c -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\rpc_proxy.c -# End Source File -# End Group -# Begin Group "Header Files No. 9" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\ext\rpc\handler.h -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\layer.h -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\php_rpc.h -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\rpc.h -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\rpc_proxy.h -# End Source File -# End Group -# Begin Group "com" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 10" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\ext\rpc\com\com.c -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\com\com_wrapper.c -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\com\conversion.c -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\com\dispatch.c -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\com\variant.c -# End Source File -# End Group -# Begin Group "Header Files No. 10" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\ext\rpc\com\com.h -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\com\com_wrapper.h -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\com\conversion.h -# End Source File -# Begin Source File - -SOURCE=..\ext\rpc\com\variant.h -# End Source File -# End Group -# End Group -# End Group -# Begin Group "zlib" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 10 Nr. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\ext\zlib\zlib.c -# End Source File -# Begin Source File - -SOURCE=..\ext\zlib\zlib_fopen_wrapper.c -# End Source File -# End Group -# Begin Group "Header Files No. 10 Nr. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\ext\zlib\php_zlib.h # End Source File # End Group # End Group -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Thu Jan 23 05:11:23 2003 EDT Modified files: /CVSROOTavail Log: Karma for new accounts Index: CVSROOT/avail diff -u CVSROOT/avail:1.579 CVSROOT/avail:1.580 --- CVSROOT/avail:1.579 Tue Jan 21 08:16:18 2003 +++ CVSROOT/avail Thu Jan 23 05:11:22 2003 @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,chad,torben,lynch,kk,ted,kwazy,aka,affinity,paul,skaag,pglat,mbritton,coar,lwest,joey,bibi,mrobinso,lwh,perugini,hamoralesr,tzwenny,hirokawa,drews,paulsen,hartmann,philross,leon,valdirh,dmarion,dubois,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,cris,goba,samesch,jon,soneca,kaufm,ronabop,glace,latoserver,phpguru_dk,lojmann,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,voize,phaethon,mgx,mj,corean,pandach,brown,cycle98,vizvil,openlife,regina,cynic,jpm,dams,alponce,menuconfig,obst,topgoods,karoora,pcraft,suvia,zak,zimt,mgx,sintoris,jmoore,ftfuture,uttam,ag315,ropik,jbi1979,bbonev,malo,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,andreroq,eduardh,cnewbill,fuzzy74,inki,bjoern,fams,smasiello,dim,lucasr,cpereira,lagflores,kjh90,ernani,theseer,cevm,noribsd,eskaly,mctrash,berto,leobopp,tcr,subjective,ufux,virtual,fireclaw,hadar_p,asautins,dbenson,aleczapka,flaviobrito,mattias,tom,amiller,cortesi,lancelot_,irc-html,mkaufman,rarruda,j-f,betz,philip,alindeman,thyla,cucinato,jpsantos,zyprexia,tpug,ozgurakan,mitja,conni,sts,stefanhinz,georg,nmav,subbie,leszek,spheroid,joona,kjartno,slawek,nooboo,alan_dangelo,ae,ahambazaza,nohn,kaser01,visualmind,abohamam,stefan,kurtz,luk,tronic,moh,bernd,wilko,yohgaki,fujimoto,gerzson,webler,spooky,tinenie,cece,daniel,offs,boo,nhoizey,nogada,albaity,joerg,mazen,neil536t,maco,imajes,hakan,chief977,dwestfal,ott,shlomi,holev,raful,yuval,tomer,masterjy,barak,ido,mork,lior,gal,adiju,cr_depend,cyberowl,daniel.paul,florian,iulianphp,kappu,michelinux,muricaru,narcotic,dt,valy,critix,spg1et,ck,costra,fancao0515,rbenea,tibee,ins0mnia,eriksson,wenz,jaxler,volker,avaly,bernardojts,bs,phaser,tal,sander,matroz,thales,dorun,ave,adu,adamf1,figuric,katow,l30n4rd0,samih,mmeier,wentzel,scaro,amtd,aspinei,costello,coti,lmaxcar,lucaiacono,manuzhai,mcastro,sukamade,darvina,peter,maxim,adir,roland,romakhin,jmurin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,machado,progcom,verdana,yincheng,surfmax,arzt,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,daif,aber_sabeel,alzahrani,ayman_h,thomaslio,sfox,jippie,floripa,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,spic,truelight,gnuhacker,_batman_,sachat,dallas,dart,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,feyge,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,phpclub,xelis,adrianr,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140|phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|frogger,coldocean,alan_k,fleaslob,chad,torben,lynch,kk,ted,kwazy,aka,affinity,paul,skaag,pglat,mbritton,coar,lwest,joey,bibi,mrobinso,lwh,perugini,hamoralesr,tzwenny,hirokawa,drews,paulsen,hartmann,philross,leon,valdirh,dmarion,dubois,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,cris,goba,samesch,jon,soneca,kaufm,ronabop,glace,latoserver,phpguru_dk,lojmann,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,voize,phaethon,mgx,mj,corean,pandach,brown,cycle98,vizvil,openlife,regina,cynic,jpm,dams,alponce,menuconfig,obst,topgoods,karoora,pcraft,suvia,zak,zimt,mgx,sintoris,jmoore,ftfuture,uttam,ag315,ropik,jbi1979,bbonev,malo,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,andreroq,eduardh,cnewbill,fuzzy74,inki,bjoern,fams,smasiello,dim,lucasr,cpereira,lagflores,kjh90,ernani,theseer,cevm,noribsd,eskaly,mctrash,berto,leobopp,tcr,subjective,ufux,virtual,fireclaw,hadar_p,asautins,dbenson,aleczapka,flaviobrito,mattias,tom,amiller,cortesi,lancelot_,irc-html,mkaufman,rarruda,j-f,betz,philip,alindeman,thyla,cucinato,jpsantos,zyprexia,tpug,ozgurakan,mitja,conni,sts,stefanhinz,georg,nmav,subbie,leszek,spheroid,joona,kjartno,slawek,nooboo,alan_dangelo,ae,ahambazaza,nohn,kaser01,visualmind,ab
[PHP-CVS] cvs: php4 /ext/imap php_imap.c
sniper Thu Jan 23 11:29:49 2003 EDT Modified files: /php4/ext/imap php_imap.c Log: Fix bug: #21817 (only enable this if --with-kerberos is used) Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.154 php4/ext/imap/php_imap.c:1.155 --- php4/ext/imap/php_imap.c:1.154 Mon Jan 20 16:28:09 2003 +++ php4/ext/imap/php_imap.cThu Jan 23 11:29:49 2003 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_imap.c,v 1.154 2003/01/20 21:28:09 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.155 2003/01/23 16:29:49 sniper Exp $ */ #define IMAP41 @@ -418,7 +418,7 @@ #ifndef PHP_WIN32 auth_link(&auth_log); /* link in the log authenticator */ auth_link(&auth_md5); /* link in the cram-md5 authenticator */ -#ifdef HAVE_IMAP_AUTH_GSS +#ifdef HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS) auth_link(&auth_gss); /* link in the gss authenticator */ #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/imap php_imap.c
sniper Thu Jan 23 11:30:07 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/imap php_imap.c Log: MFH Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.142.2.6 php4/ext/imap/php_imap.c:1.142.2.7 --- php4/ext/imap/php_imap.c:1.142.2.6 Sat Jan 18 02:01:11 2003 +++ php4/ext/imap/php_imap.cThu Jan 23 11:30:07 2003 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_imap.c,v 1.142.2.6 2003/01/18 07:01:11 sniper Exp $ */ +/* $Id: php_imap.c,v 1.142.2.7 2003/01/23 16:30:07 sniper Exp $ */ #define IMAP41 @@ -420,7 +420,7 @@ #ifndef PHP_WIN32 auth_link(&auth_log); /* link in the log authenticator */ auth_link(&auth_md5); /* link in the cram-md5 authenticator */ -#ifdef HAVE_IMAP_AUTH_GSS +#ifdef HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS) auth_link(&auth_gss); /* link in the gss authenticator */ #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pcre/tests bug21732.phpt
moriyoshi Thu Jan 23 13:22:56 2003 EDT
Added files:
/php4/ext/pcre/testsbug21732.phpt
Log:
Added test case for bug #21732
Index: php4/ext/pcre/tests/bug21732.phpt
+++ php4/ext/pcre/tests/bug21732.phpt
--TEST--
Bug #21732 (preg_replace() segfaults with invalid parameters)
--SKIPIF--
--INI--
error_reporting=0
--FILE--
--EXPECT--
bool(false)
array(4) {
[0]=>
string(5) "abcde"
[1]=>
string(2) "ab"
[2]=>
string(2) "cd"
[3]=>
string(1) "e"
}
string(4) "yes!"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/pcre/tests bug21732.phpt
On January 23, 2003 01:22 pm, Moriyoshi Koizumi wrote:
> moriyoshi Thu Jan 23 13:22:56 2003 EDT
>
> Added test case for bug #21732
[snip]
> --SKIPIF--
> extension_loaded("pcre") or die("skip pcre extension is not available");
> ?>
This check is pointless, since without pcre the testsuit won't run.
Ilia
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/pcre/tests bug21732.phpt
On Thu, Jan 23, 2003 at 01:36:23PM -0500, Ilia A. wrote:
> On January 23, 2003 01:22 pm, Moriyoshi Koizumi wrote:
> > moriyoshi Thu Jan 23 13:22:56 2003 EDT
> >
> > Added test case for bug #21732
> [snip]
> > --SKIPIF--
> > > extension_loaded("pcre") or die("skip pcre extension is not available");
> > ?>
>
> This check is pointless, since without pcre the testsuit won't run.
Right, I just followed the way in which other tests are written.
Should we remove those too?
Moriyoshi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/pcre/tests bug21732.phpt
On January 23, 2003 01:54 pm, you wrote:
> > > > > extension_loaded("pcre") or die("skip pcre extension is not
> > > available"); ?>
> >
> > This check is pointless, since without pcre the testsuit won't run.
>
> Right, I just followed the way in which other tests are written.
> Should we remove those too?
The test for availability of PCRE should be removed IMO simply because without
PCRE test suit will exit before starting any of the tests. The dependency on
PCRE is unlikely to be removed, so this should be a safe thing to do.
Ilia
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/pcre/tests bug21732.phpt
On Thu, Jan 23, 2003 at 01:52:23PM -0500, Ilia A. wrote: > The test for availability of PCRE should be removed IMO simply because without > PCRE test suit will exit before starting any of the tests. The dependency on > PCRE is unlikely to be removed, so this should be a safe thing to do. I mistook what you meant by "the testsuite". No problems then. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pcre/tests bug20528.phpt bug21732.phpt
moriyoshi Thu Jan 23 13:48:43 2003 EDT Modified files: /php4/ext/pcre/testsbug20528.phpt bug21732.phpt Log: Removed pointless checks Index: php4/ext/pcre/tests/bug20528.phpt diff -u php4/ext/pcre/tests/bug20528.phpt:1.1 php4/ext/pcre/tests/bug20528.phpt:1.2 --- php4/ext/pcre/tests/bug20528.phpt:1.1 Thu Nov 21 19:08:57 2002 +++ php4/ext/pcre/tests/bug20528.phpt Thu Jan 23 13:48:43 2003 @@ -1,11 +1,5 @@ --TEST-- preg_split() bug #20528 ---SKIPIF-- - --FILE-- --INI-- error_reporting=0 --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pcre/tests bug20528.phpt
moriyoshi Thu Jan 23 14:00:08 2003 EDT Modified files: /php4/ext/pcre/testsbug20528.phpt Log: Made the test's name more descriptive Index: php4/ext/pcre/tests/bug20528.phpt diff -u php4/ext/pcre/tests/bug20528.phpt:1.2 php4/ext/pcre/tests/bug20528.phpt:1.3 --- php4/ext/pcre/tests/bug20528.phpt:1.2 Thu Jan 23 13:48:43 2003 +++ php4/ext/pcre/tests/bug20528.phpt Thu Jan 23 14:00:06 2003 @@ -1,5 +1,5 @@ --TEST-- -preg_split() bug #20528 +Bug #20528 (preg_split() drops characters (re-opens Bug #15413)) --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard/tests/image bug13213.phpt /ext/standard/tests/math bug21523.phpt /ext/standard/tests/network bug20134.phpt /ext/standard/tests/strings bug20108.phpt bug20169.phpt bug20927.phpt
moriyoshi Thu Jan 23 14:07:25 2003 EDT Modified files: /php4/ext/standard/tests/image bug13213.phpt /php4/ext/standard/tests/math bug21523.phpt /php4/ext/standard/tests/networkbug20134.phpt /php4/ext/standard/tests/stringsbug20108.phpt bug20169.phpt bug20927.phpt Log: Test name formatting Index: php4/ext/standard/tests/image/bug13213.phpt diff -u php4/ext/standard/tests/image/bug13213.phpt:1.1 php4/ext/standard/tests/image/bug13213.phpt:1.2 --- php4/ext/standard/tests/image/bug13213.phpt:1.1 Sun Nov 3 08:52:45 2002 +++ php4/ext/standard/tests/image/bug13213.phpt Thu Jan 23 14:07:24 2003 @@ -1,5 +1,5 @@ --TEST-- -Bug #13213 (GetImageSize and wrong JPEG Comments +Bug #13213 (GetImageSize and wrong JPEG Comments) --FILE-- string(10) "image/jpeg" -} \ No newline at end of file +} Index: php4/ext/standard/tests/math/bug21523.phpt diff -u php4/ext/standard/tests/math/bug21523.phpt:1.1 php4/ext/standard/tests/math/bug21523.phpt:1.2 --- php4/ext/standard/tests/math/bug21523.phpt:1.1 Thu Jan 9 10:44:49 2003 +++ php4/ext/standard/tests/math/bug21523.phpt Thu Jan 23 14:07:25 2003 @@ -1,7 +1,7 @@ --TEST-- -Bug #21523 number_format tries to allocate negative amount of memory +Bug #21523 (number_format tries to allocate negative amount of memory) --FILE-- -http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /tests/func 005a.phpt
At 04:28 23.01.2003, Jani Taskinen wrote: sniper Wed Jan 22 22:28:41 2003 EDT Added files: /php4/tests/func005a.phpt Log: Added test for bug: #21513 Index: php4/tests/func/005a.phpt +++ php4/tests/func/005a.phpt --TEST-- Testing register_shutdown_function() with timeout. (Bug: #21513) --POST-- --GET-- --FILE-- You do not need --POST-- and --GET-- Empty sections take their time and space. regards marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / configure.in
At 07:42 23.01.2003, Jani Taskinen wrote: sniper Thu Jan 23 01:42:43 2003 EDT Modified files: /php4 configure.in Log: remove this stupid highlight which causes trouble. Which trouble? Other parts of the scripts do exactly the same thing so please revert. regards marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard/tests/serialize 002.phpt bug14293.phpt
moriyoshi Thu Jan 23 14:21:51 2003 EDT
Added files:
/php4/ext/standard/tests/serialize bug14293.phpt
Removed files:
/php4/ext/standard/tests/serialize 002.phpt
Log:
Renamed the test name as per the convension
Index: php4/ext/standard/tests/serialize/bug14293.phpt
+++ php4/ext/standard/tests/serialize/bug14293.phpt
--TEST--
Bug #14293 (serialize() and __sleep())
--FILE--
a = 'hello';
}
function __sleep()
{
echo "__sleep called\n";
return array('a','b');
}
}
$t = new t();
$data = serialize($t);
echo "$data\n";
$t = unserialize($data);
var_dump($t);
?>
--EXPECT--
__sleep called
O:1:"t":2:{s:1:"a";s:5:"hello";s:1:"b";N;}
object(t)(2) {
["a"]=>
string(5) "hello"
["b"]=>
NULL
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/lang 029.phpt bug7515.phpt
moriyoshi Thu Jan 23 14:28:39 2003 EDT
Added files:
/php4/tests/langbug7515.phpt
Removed files:
/php4/tests/lang029.phpt
Log:
Changed the test's file name as per the convention
Index: php4/tests/lang/bug7515.phpt
+++ php4/tests/lang/bug7515.phpt
--TEST--
Bug #7515 (weired & invisible referencing of objects)
--SKIPIF--
--INI--
error_reporting=2039
--FILE--
root=new obj();
ob_start();
var_dump($o);
$x=ob_get_contents();
ob_end_clean();
$o->root->method();
ob_start();
var_dump($o);
$y=ob_get_contents();
ob_end_clean();
if ($x == $y) {
print "success";
} else {
print "failure
x=$x
y=$y
";
}
?>
--EXPECT--
success
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/lang bug7515.phpt
moriyoshi Thu Jan 23 14:31:02 2003 EDT Modified files: /php4/tests/langbug7515.phpt Log: Fixed typo Index: php4/tests/lang/bug7515.phpt diff -u php4/tests/lang/bug7515.phpt:1.1 php4/tests/lang/bug7515.phpt:1.2 --- php4/tests/lang/bug7515.phpt:1.1Thu Jan 23 14:28:39 2003 +++ php4/tests/lang/bug7515.phptThu Jan 23 14:31:02 2003 @@ -1,5 +1,5 @@ --TEST-- -Bug #7515 (weired & invisible referencing of objects) +Bug #7515 (weird & invisible referencing of objects) --SKIPIF-- --INI-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mbstring php_mbregex.c
moriyoshi Thu Jan 23 15:07:39 2003 EDT
Modified files:
/php4/ext/mbstring php_mbregex.c
Log:
Fixed a mb_ereg_replace() bug; the function was not completely multibyte-safe.
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.30 php4/ext/mbstring/php_mbregex.c:1.31
--- php4/ext/mbstring/php_mbregex.c:1.30Tue Jan 21 17:09:09 2003
+++ php4/ext/mbstring/php_mbregex.c Thu Jan 23 15:07:39 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.30 2003/01/21 22:09:09 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.31 2003/01/23 20:07:39 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -519,6 +519,17 @@
char *description = NULL;
char pat_buf[2];
+ const mbfl_encoding *enc;
+
+ {
+ const char *current_enc_name;
+ current_enc_name = php_mbregex_mbctype2name(MBSTRG(current_mbctype));
+ if (current_enc_name == NULL ||
+ (enc = mbfl_name2encoding(current_enc_name)) == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error");
+ RETURN_FALSE;
+ }
+ }
eval = 0;
{
char *option_str = NULL;
@@ -592,12 +603,13 @@
/* copy the part of the string before the match */
_php_mb_regex_strbuf_ncat(&outdev, (const unsigned char
*)&string[pos], regs.beg[0] - pos);
/* copy replacement and backrefs */
- /* FIXME: this code (\\digit replacement) is not mbyte aware!
*/
i = 0;
p = replace;
while (i < replace_len) {
+ int fwd = (int) php_mb_mbchar_bytes_ex(p, enc);
n = -1;
- if (p[0] == '\\' && p[1] >= '0' && p[1] <= '9') {
+ if ((replace_len - i) >= 2 && fwd == 1 &&
+ p[0] == '\\' && p[1] >= '0' && p[1] <= '9') {
n = p[1] - '0';
}
if (n >= 0 && n < regs.num_regs) {
@@ -608,8 +620,8 @@
i += 2;
} else {
_php_mb_regex_strbuf_ncat(pdevice, (const
unsigned char *)p, 1);
- p++;
- i++;
+ p += fwd;
+ i += fwd;
}
}
if (eval) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mbstring php_mbregex.c
moriyoshi Thu Jan 23 15:38:44 2003 EDT
Modified files:
/php4/ext/mbstring php_mbregex.c
Log:
Really fixed the mb issue of mb_ereg_replace()
# my previous patch is somewhat wrong
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.31 php4/ext/mbstring/php_mbregex.c:1.32
--- php4/ext/mbstring/php_mbregex.c:1.31Thu Jan 23 15:07:39 2003
+++ php4/ext/mbstring/php_mbregex.c Thu Jan 23 15:38:44 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.31 2003/01/23 20:07:39 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.32 2003/01/23 20:38:44 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -619,7 +619,7 @@
p += 2;
i += 2;
} else {
- _php_mb_regex_strbuf_ncat(pdevice, (const
unsigned char *)p, 1);
+ _php_mb_regex_strbuf_ncat(pdevice, (const
+unsigned char *)p, fwd);
p += fwd;
i += fwd;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / TODO-PHP5
sebastian Thu Jan 23 18:22:01 2003 EDT Added files: /php4 TODO-PHP5 Log: TODO for PHP 5. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/lang bug21849.phpt
moriyoshi Thu Jan 23 18:22:24 2003 EDT Added files: /php4/tests/langbug21849.phpt Log: Added test case for bug21849.phpt Index: php4/tests/lang/bug21849.phpt +++ php4/tests/lang/bug21849.phpt --TEST-- Bug #21849 (self::constant doesn't work as method's default parameter) --FILE-- --EXPECT-- fubar -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dbx dbx.c /ext/dio dio.c /ext/pcre php_pcre.c
iliaa Fri Jan 24 00:21:09 2003 EDT
Modified files:
/php4/ext/dbx dbx.c
/php4/ext/dio dio.c
/php4/ext/pcre php_pcre.c
Log:
zend_error() -> php_error_docref().
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.45 php4/ext/dbx/dbx.c:1.46
--- php4/ext/dbx/dbx.c:1.45 Sat Jan 18 14:49:24 2003
+++ php4/ext/dbx/dbx.c Fri Jan 24 00:21:08 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: dbx.c,v 1.45 2003/01/18 19:49:24 iliaa Exp $ */
+/* $Id: dbx.c,v 1.46 2003/01/24 05:21:08 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -104,7 +104,7 @@
MAKE_STD_ZVAL(zval_function_name);
ZVAL_STRING(zval_function_name, function_name, 1);
if (call_user_function_ex(EG(function_table), NULL, zval_function_name,
returnvalue, number_of_arguments, params, 0, NULL TSRMLS_CC) == FAILURE) {
- zend_error(E_ERROR, "function '%s' not found",
Z_STRVAL_P(zval_function_name));
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "function '%s' not found",
+Z_STRVAL_P(zval_function_name));
}
zval_dtor(zval_function_name); /* to free stringvalue memory */
FREE_ZVAL(zval_function_name);
@@ -262,19 +262,19 @@
if (Z_TYPE_PP(arguments[0]) == IS_LONG) {
if (!module_identifier_exists(Z_LVAL_PP(arguments[0]))) {
- zend_error(E_WARNING, "dbx: module '%ld' not loaded or not
supported.", Z_LVAL_PP(arguments[0]));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: module '%ld'
+not loaded or not supported.", Z_LVAL_PP(arguments[0]));
return;
}
module_identifier = Z_LVAL_PP(arguments[0]);
} else {
convert_to_string_ex(arguments[0]);
if (!module_exists(Z_STRVAL_PP(arguments[0]))) {
- zend_error(E_WARNING, "dbx: module '%s' not loaded.",
Z_STRVAL_PP(arguments[0]));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: module '%s'
+not loaded.", Z_STRVAL_PP(arguments[0]));
return;
}
module_identifier=get_module_identifier(Z_STRVAL_PP(arguments[0]));
if (!module_identifier) {
- zend_error(E_WARNING, "dbx: unsupported module '%s'.",
Z_STRVAL_PP(arguments[0]));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbx: unsupported
+module '%s'.", Z_STRVAL_PP(arguments[0]));
return;
}
}
@@ -303,7 +303,7 @@
}
if (object_init(return_value) != SUCCESS) {
- zend_error(E_ERROR, "dbx: unable to create resulting object...");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "dbx: unable to create
+resulting object...");
FREE_ZVAL(dbx_module);
zval_dtor(db_name); /* to free stringvalue memory */
FREE_ZVAL(db_name);
@@ -335,7 +335,7 @@
WRONG_PARAM_COUNT;
}
if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
&dbx_database TSRMLS_CC)) {
- zend_error(E_WARNING, "dbx_close: not a valid dbx_handle-object...");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid
+dbx_handle-object...");
RETURN_LONG(0);
}
@@ -387,7 +387,7 @@
WRONG_PARAM_COUNT;
}
if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
&dbx_database TSRMLS_CC)) {
- zend_error(E_WARNING, "dbx_query: not a valid dbx_handle-object...");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "not a valid
+dbx_handle-object...");
RETURN_LONG(0);
}
/* default values */
@@ -428,7 +428,7 @@
*/
/* init return_value as object (of rows) */
if (object_init(return_value) != SUCCESS) {
- zend_error(E_ERROR, "dbx_query: unable to create resulting object...");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "unable to create resulting
+object...");
FREE_ZVAL(rv_result_handle);
RETURN_LONG(0);
}
@@ -449,7 +449,7 @@
ZVAL_LONG(rv_column_count, 0);
result = switch_dbx_getcolumncount(&rv_column_count, &rv_result_handle,
INTERNAL_FUNCTION_PARAM_PASSTHRU, dbx_module);
if (!result) {
- zend_error(E_ERROR, "dbx_query: get column_count failed...");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "get column_count
+failed...");
FREE_ZVAL(rv_column_count);
RETURN_LONG(0);
}
@@ -543,7 +543,7 @@
WRONG_PARAM_COUNT;
}
if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
&dbx_database TSRMLS_CC)) {
- zend_error(E_WARNING, "db
[PHP-CVS] cvs: php4(PHP_4_3) /tests/func 001.phpt 005.phpt 005a.phpt 007.phpt 008.phpt 009.phpt
sniper Fri Jan 24 00:56:03 2003 EDT Modified files: (Branch: PHP_4_3) /php4/tests/func001.phpt 005.phpt 005a.phpt 007.phpt 008.phpt 009.phpt Log: Remove unused GET/POST entries Index: php4/tests/func/001.phpt diff -u php4/tests/func/001.phpt:1.1 php4/tests/func/001.phpt:1.1.16.1 --- php4/tests/func/001.phpt:1.1Sun Aug 27 15:46:04 2000 +++ php4/tests/func/001.phptFri Jan 24 00:56:03 2003 @@ -1,7 +1,5 @@ --TEST-- Strlen() function test ---POST-- ---GET-- --FILE-- --EXPECT-- Index: php4/tests/func/005.phpt diff -u php4/tests/func/005.phpt:1.1 php4/tests/func/005.phpt:1.1.16.1 --- php4/tests/func/005.phpt:1.1Sun Aug 27 15:46:04 2000 +++ php4/tests/func/005.phptFri Jan 24 00:56:03 2003 @@ -1,8 +1,5 @@ --TEST-- Testing register_shutdown_function() ---POST-- ---GET-- -ab+cd+ef+123+test --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/func 001.phpt 005.phpt 005a.phpt 007.phpt 008.phpt 009.phpt
sniper Fri Jan 24 00:56:56 2003 EDT Modified files: /php4/tests/func001.phpt 005.phpt 005a.phpt 007.phpt 008.phpt 009.phpt Log: MFB, removed unused GET/POST entries Index: php4/tests/func/001.phpt diff -u php4/tests/func/001.phpt:1.1 php4/tests/func/001.phpt:1.2 --- php4/tests/func/001.phpt:1.1Sun Aug 27 15:46:04 2000 +++ php4/tests/func/001.phptFri Jan 24 00:56:55 2003 @@ -1,7 +1,5 @@ --TEST-- Strlen() function test ---POST-- ---GET-- --FILE-- --EXPECT-- Index: php4/tests/func/005.phpt diff -u php4/tests/func/005.phpt:1.1 php4/tests/func/005.phpt:1.2 --- php4/tests/func/005.phpt:1.1Sun Aug 27 15:46:04 2000 +++ php4/tests/func/005.phptFri Jan 24 00:56:55 2003 @@ -1,8 +1,5 @@ --TEST-- Testing register_shutdown_function() ---POST-- ---GET-- -ab+cd+ef+123+test --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /tests/func 005a.phpt
On Thu, 23 Jan 2003, Marcus Börger wrote: >At 04:28 23.01.2003, Jani Taskinen wrote: >>sniper Wed Jan 22 22:28:41 2003 EDT >> >> Added files: >> /php4/tests/func005a.phpt >> Log: >> Added test for bug: #21513 >> >> >>Index: php4/tests/func/005a.phpt >>+++ php4/tests/func/005a.phpt >>--TEST-- >>Testing register_shutdown_function() with timeout. (Bug: #21513) >>--POST-- >>--GET-- >>--FILE-- >> >You do not need --POST-- and --GET-- >Empty sections take their time and space. Removed. :) --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / configure.in
On Thu, 23 Jan 2003, Marcus Börger wrote: >At 07:42 23.01.2003, Jani Taskinen wrote: >>sniper Thu Jan 23 01:42:43 2003 EDT >> >> Modified files: >> /php4 configure.in >> Log: >> remove this stupid highlight which causes trouble. >> > >Which trouble? Other parts of the scripts do exactly the same >thing so please revert. .oO(why, oh why didn't I put that bug report # there..?) :) No, it's used in different diverts where it doesn't cause any side-effects. There were quite many reports where this was mentioned, two of them here: http://bugs.php.net/bug.php?id=21511 http://bugs.php.net/bug.php?id=21284 It's only cosmetic thing anyway..and REALLY not important, so please don't put it back.. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
