[PHP-CVS] svn: /SVNROOT/ global_avail
philip Wed, 20 Jan 2010 01:41:51 + Revision: http://svn.php.net/viewvc?view=revision&revision=293755 Log: Bump phpdoc karma for Pedro Antonio Gil Rodríguez (seros) from /es to full Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2010-01-20 00:58:37 UTC (rev 293754) +++ SVNROOT/global_avail 2010-01-20 01:41:51 UTC (rev 293755) @@ -47,7 +47,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,costra,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,jingfs,murphy,potatotsang,the_q,jsheets,xelis,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,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,jawed,ch,mgdm,ericstewart,mager,keito,juxecl,salathe,chx,vito,beverloo,joris,mumumu,brandon,santiago,ajcollison,rbowen,ruslany,satoruyoshida,seld,degeberg,yago|phpdoc,phd,web/doc,web/doc-editor +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,gla
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h trunk/ext/mysqlnd/mysqlnd_statistics.h
andrey Tue, 19 Jan 2010 15:31:39 +
Revision: http://svn.php.net/viewvc?view=revision&revision=293735
Log:
Fix possible lock-ups when a trigger triggers a trigger.
Hanging was possible on the subsequent try to acquire a mutex.
Now it is correctly implemented and if a trigger is being executed
then no other trigger will be fired, on recursive calls.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
2010-01-19 14:24:35 UTC (rev 293734)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
2010-01-19 15:31:39 UTC (rev 293735)
@@ -42,13 +42,20 @@
#define MYSQLND_STATS_UNLOCK(stats)
#endif
-#define MYSQLND_CHECK_AND_CALL_HANDLER(stats, statistic, value) \
+#define MYSQLND_UPDATE_VALUE_AND_CALL_TRIGGER(stats, statistic, value) \
{ \
+ MYSQLND_STATS_LOCK(stats); \
+ (stats)->values[(statistic)] += (value); \
if ((stats)->triggers[(statistic)] &&
(stats)->in_trigger == FALSE) { \
(stats)->in_trigger = TRUE; \
+ MYSQLND_STATS_UNLOCK(stats); \
+
\
(stats)->triggers[(statistic)]((stats),
(statistic), (value) TSRMLS_CC); \
+
\
+ MYSQLND_STATS_LOCK(stats); \
(stats)->in_trigger = FALSE; \
} \
+ MYSQLND_STATS_UNLOCK(_p_s); \
} \
#define MYSQLND_DEC_STATISTIC(enabler, stats, statistic) \
@@ -56,10 +63,7 @@
enum_mysqlnd_collected_stats _s = (statistic);\
MYSQLND_STATS * _p_s = (MYSQLND_STATS *) (stats); \
if ((enabler) && _p_s && _s != _p_s->count) { \
- MYSQLND_STATS_LOCK(_p_s); \
- MYSQLND_CHECK_AND_CALL_HANDLER(_p_s, _s, -1); \
- _p_s->values[_s]--; \
- MYSQLND_STATS_UNLOCK(_p_s); \
+ MYSQLND_UPDATE_VALUE_AND_CALL_TRIGGER(_p_s, _s, -1); \
}\
}
@@ -68,10 +72,7 @@
enum_mysqlnd_collected_stats _s = (statistic);\
MYSQLND_STATS * _p_s = (MYSQLND_STATS *) (stats); \
if ((enabler) && _p_s && _s != _p_s->count) { \
- MYSQLND_STATS_LOCK(_p_s); \
- MYSQLND_CHECK_AND_CALL_HANDLER(_p_s, _s, 1); \
- _p_s->values[_s]++; \
- MYSQLND_STATS_UNLOCK(_p_s); \
+ MYSQLND_UPDATE_VALUE_AND_CALL_TRIGGER(_p_s, _s, 1); \
}\
}
@@ -81,10 +82,7 @@
MYSQLND_STATS * _p_s = (MYSQLND_STATS *) (stats); \
if ((enabler) && _p_s && _s != _p_s->count) { \
uint64_t v = (uint64_t) (value); \
- MYSQLND_STATS_LOCK(_p_s); \
- MYSQLND_CHECK_AND_CALL_HANDLER(_p_s, _s, v); \
- _p_s->values[_s] += v; \
- MYSQLND_STATS_UNLOCK(_p_s); \
+ MYSQLND_UPDATE_VALUE_AND_CALL_TRIGGER(_p_s, _s, v); \
}\
}
@@ -96,16 +94,8 @@
uint64_t v2 = (uint64_t) (value2); \
enum_mysqlnd_collected_stats _s1 = (statistic1);\
enum_mysqlnd_collected_stats _s2 = (statistic2);\
- MYSQLND_STATS_LOCK(_p_s); \
- if (_s1 != _p_s->count) { \
- MYSQLND_CHECK_AND_CALL_HANDLER(_p_s, _s1, v1); \
- _p_s->values[_s1]+= v1; \
- } \
- if (_s2 != _p_s->count) { \
- MYSQLND_CHECK_AND_CALL_HANDLER(_p_s, _s2, v2); \
- _p_s->values[_s2]+= v2; \
- } \
- MYSQLND_STATS_UNLOCK(_p_s); \
+ if (_s1 != _p_s->count)
MYSQLND_UPDATE_VALUE_AND_CALL_TRIGGER(_p_s, _s1, v1); \
+ if (_s2 != _p_s->count)
MYSQLND_UPDATE_VALUE_AND_CALL_TRIGGER(_p_s, _s2, v2); \
}\
}
@@ -119,20 +109,9 @@
enum_mysqlnd_collected_stats _s1 = (statistic1);\
enum_mysqlnd_collected_stats _s2 = (statistic2);\
enum_mysqlnd_collected_stats _s3 = (statistic3);\
- MYSQLND_STATS_LOCK(_p_s); \
- if (_s1 != _p_s->count) { \
- MYSQLND_CHECK_AND_CALL_HANDLER(_p_s, _s1, v1); \
- _p_s->values[_s1]+= v1; \
- } \
- if (_s2 != _p_s->count) { \
-
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/streams.c branches/PHP_5_2/main/streams/cast.c branches/PHP_5_3/ext/curl/streams.c branches/PHP_5_3/main/streams/cast.c tru
jani Tue, 19 Jan 2010 13:44:08 +
Revision: http://svn.php.net/viewvc?view=revision&revision=293732
Log:
- Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie
emulation)
Bug: http://bugs.php.net/50791 (Assigned) Bad logic in defining fopencookie
emulation
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/curl/streams.c
U php/php-src/branches/PHP_5_2/main/streams/cast.c
U php/php-src/branches/PHP_5_3/ext/curl/streams.c
U php/php-src/branches/PHP_5_3/main/streams/cast.c
U php/php-src/trunk/ext/curl/streams.c
U php/php-src/trunk/main/streams/cast.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2010-01-19 13:28:26 UTC (rev 293731)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-01-19 13:44:08 UTC (rev 293732)
@@ -13,6 +13,8 @@
- Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)
+- Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie
+ emulation). (Jani)
- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket
streams). (vnegrier at optilian dot com, Ilia)
- Fixed bug #50761 (system.multiCall crashes in xmlrpc extension). (hiroaki
Modified: php/php-src/branches/PHP_5_2/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_2/ext/curl/streams.c 2010-01-19 13:28:26 UTC (rev 293731)
+++ php/php-src/branches/PHP_5_2/ext/curl/streams.c 2010-01-19 13:44:08 UTC (rev 293732)
@@ -277,7 +277,7 @@
* have a FILE* associated with it.
* Otherwise, use the "smart" memory stream that will turn itself into a file
* when it gets large */
-#if !HAVE_FOPENCOOKIE
+#ifndef HAVE_FOPENCOOKIE
if (options & STREAM_WILL_CAST) {
curlstream->readbuffer.buf = php_stream_fopen_tmpfile();
} else
@@ -442,7 +442,7 @@
php_stream_to_zval(curlstream->readbuffer.buf, tmp);
add_assoc_zval(stream->wrapperdata, "readbuf", tmp);
-#if !HAVE_FOPENCOOKIE
+#ifndef HAVE_FOPENCOOKIE
if (options & STREAM_WILL_CAST) {
/* we will need to download the whole resource now,
* since we cannot get the actual FD for the download,
Modified: php/php-src/branches/PHP_5_2/main/streams/cast.c
===
--- php/php-src/branches/PHP_5_2/main/streams/cast.c 2010-01-19 13:28:26 UTC (rev 293731)
+++ php/php-src/branches/PHP_5_2/main/streams/cast.c 2010-01-19 13:44:08 UTC (rev 293732)
@@ -30,7 +30,7 @@
#include "php_streams_int.h"
/* Under BSD, emulate fopencookie using funopen */
-#if HAVE_FUNOPEN
+#if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
typedef struct {
int (*reader)(void *, char *, int);
int (*writer)(void *, const char *, int);
@@ -43,13 +43,14 @@
return funopen(cookie, funcs->reader, funcs->writer, funcs->seeker, funcs->closer);
}
# define HAVE_FOPENCOOKIE 1
+# define PHP_EMULATE_FOPENCOOKIE 1
# define PHP_STREAM_COOKIE_FUNCTIONS &stream_cookie_functions
-#elif HAVE_FOPENCOOKIE
+#elif defined(HAVE_FOPENCOOKIE)
# define PHP_STREAM_COOKIE_FUNCTIONS stream_cookie_functions
#endif
/* {{{ STDIO with fopencookie */
-#if HAVE_FUNOPEN
+#if defined(PHP_EMULATE_FOPENCOOKIE)
/* use our fopencookie emulation */
static int stream_cookie_reader(void *cookie, char *buffer, int size)
{
@@ -83,8 +84,7 @@
stream->fclose_stdiocast = PHP_STREAM_FCLOSE_NONE;
return php_stream_close(stream);
}
-
-#elif HAVE_FOPENCOOKIE
+#elif defined(HAVE_FOPENCOOKIE)
static ssize_t stream_cookie_reader(void *cookie, char *buffer, size_t size)
{
ssize_t ret;
@@ -101,7 +101,7 @@
return php_stream_write(((php_stream *)cookie), (char *)buffer, size);
}
-#ifdef COOKIE_SEEKER_USES_OFF64_T
+# ifdef COOKIE_SEEKER_USES_OFF64_T
static int stream_cookie_seeker(void *cookie, __off64_t *position, int whence)
{
TSRMLS_FETCH();
@@ -113,14 +113,14 @@
}
return 0;
}
-#else
+# else
static int stream_cookie_seeker(void *cookie, off_t position, int whence)
{
TSRMLS_FETCH();
return php_stream_seek((php_stream *)cookie, position, whence);
}
-#endif
+# endif
static int stream_cookie_closer(void *cookie)
{
@@ -131,7 +131,7 @@
stream->fclose_stdiocast = PHP_STREAM_FCLOSE_NONE;
return php_stream_close(stream);
}
-#endif /* elif HAVE_FOPENCOOKIE */
+#endif /* elif defined(HAVE_FOPENCOOKIE) */
#if HAVE_FOPENCOOKIE
static COOKIE_IO_FUNCTIONS_T stream_cookie_functions =
Modified: php/php-src/branches/PHP_5_3/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/streams.c 2010-01-19 13:28:26 UTC (rev 293731)
+++ php/php-src/branches/PHP_5_3/ext/curl/streams.c 2010-01-19 13:44:08 UTC (rev 293732)
@@ -280,7 +280,7 @@
* have a FILE* associated with it.
* Otherwise, use the "smart" memory stream that will turn itself into a file
* when it gets large */
-#if
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/spl_dllist.h trunk/ext/spl/spl_dllist.h
johannes Tue, 19 Jan 2010 13:24:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=293730 Log: - A few more extern declarations Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/spl_dllist.h U php/php-src/trunk/ext/spl/spl_dllist.h Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_dllist.h === --- php/php-src/branches/PHP_5_3/ext/spl/spl_dllist.h 2010-01-19 13:10:31 UTC (rev 293729) +++ php/php-src/branches/PHP_5_3/ext/spl/spl_dllist.h 2010-01-19 13:24:02 UTC (rev 293730) @@ -24,9 +24,9 @@ #include "php.h" #include "php_spl.h" -PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList; -PHPAPI zend_class_entry *spl_ce_SplQueue; -PHPAPI zend_class_entry *spl_ce_SplStack; +extern PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList; +extern PHPAPI zend_class_entry *spl_ce_SplQueue; +extern PHPAPI zend_class_entry *spl_ce_SplStack; PHP_MINIT_FUNCTION(spl_dllist); Modified: php/php-src/trunk/ext/spl/spl_dllist.h === --- php/php-src/trunk/ext/spl/spl_dllist.h 2010-01-19 13:10:31 UTC (rev 293729) +++ php/php-src/trunk/ext/spl/spl_dllist.h 2010-01-19 13:24:02 UTC (rev 293730) @@ -24,9 +24,9 @@ #include "php.h" #include "php_spl.h" -PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList; -PHPAPI zend_class_entry *spl_ce_SplQueue; -PHPAPI zend_class_entry *spl_ce_SplStack; +extern PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList; +extern PHPAPI zend_class_entry *spl_ce_SplQueue; +extern PHPAPI zend_class_entry *spl_ce_SplStack; PHP_MINIT_FUNCTION(spl_dllist); -- 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_2/ext/zlib/tests/bug_40189.phpt branches/PHP_5_3/ext/zlib/tests/bug_40189.phpt trunk/ext/zlib/tests/bug_40189.phpt
iliaaTue, 19 Jan 2010 12:42:50 + Revision: http://svn.php.net/viewvc?view=revision&revision=293728 Log: Fixed test Changed paths: U php/php-src/branches/PHP_5_2/ext/zlib/tests/bug_40189.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/bug_40189.phpt U php/php-src/trunk/ext/zlib/tests/bug_40189.phpt Modified: php/php-src/branches/PHP_5_2/ext/zlib/tests/bug_40189.phpt === --- php/php-src/branches/PHP_5_2/ext/zlib/tests/bug_40189.phpt 2010-01-19 12:38:55 UTC (rev 293727) +++ php/php-src/branches/PHP_5_2/ext/zlib/tests/bug_40189.phpt 2010-01-19 12:42:50 UTC (rev 293728) @@ -21,5 +21,5 @@ ?> --EXPECT-- string(40) "AwCFRi98wqppK23l2/7kIY8AlyEdAgAAAEdCTUI=" -bool(false) +int(0) string(0) "" Modified: php/php-src/branches/PHP_5_3/ext/zlib/tests/bug_40189.phpt === --- php/php-src/branches/PHP_5_3/ext/zlib/tests/bug_40189.phpt 2010-01-19 12:38:55 UTC (rev 293727) +++ php/php-src/branches/PHP_5_3/ext/zlib/tests/bug_40189.phpt 2010-01-19 12:42:50 UTC (rev 293728) @@ -23,5 +23,5 @@ ?> --EXPECT-- string(40) "AwCFRi98wqppK23l2/7kIY8AlyEdAgAAAEdCTUI=" -bool(false) +int(0) string(0) "" Modified: php/php-src/trunk/ext/zlib/tests/bug_40189.phpt === --- php/php-src/trunk/ext/zlib/tests/bug_40189.phpt 2010-01-19 12:38:55 UTC (rev 293727) +++ php/php-src/trunk/ext/zlib/tests/bug_40189.phpt 2010-01-19 12:42:50 UTC (rev 293728) @@ -23,5 +23,5 @@ ?> --EXPECT-- string(40) "AwCFRi98wqppK23l2/7kIY8AlyEdAgAAAEdCTUI=" -bool(false) +int(0) string(0) "" -- 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/NEWS branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h trunk/ext/sqlite3/libsqlite/sqlite3.c trunk/ext/sql
iliaaTue, 19 Jan 2010 12:38:55 + Revision: http://svn.php.net/viewvc?view=revision&revision=293727 Log: Upgraded bundled sqlite to version 3.6.22. Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h -- 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_2/ext/standard/tests/misc/time_sleep_until_error2.phpt branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt trunk/ext/standard/tests/misc/t
jani Tue, 19 Jan 2010 12:31:29 + Revision: http://svn.php.net/viewvc?view=revision&revision=293726 Log: - Add missing skipif Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt U php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_error2.phpt Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt === --- php/php-src/branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt 2010-01-19 12:13:06 UTC (rev 293725) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt 2010-01-19 12:31:29 UTC (rev 293726) @@ -1,5 +1,9 @@ --TEST-- time_sleep_until() function - error test for time_sleep_until() +--SKIPIF-- + --CREDITS-- Filippo De Santis f...@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt 2010-01-19 12:13:06 UTC (rev 293725) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt 2010-01-19 12:31:29 UTC (rev 293726) @@ -1,5 +1,9 @@ --TEST-- time_sleep_until() function - error test for time_sleep_until() +--SKIPIF-- + --CREDITS-- Filippo De Santis f...@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 Modified: php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_error2.phpt === --- php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_error2.phpt 2010-01-19 12:13:06 UTC (rev 293725) +++ php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_error2.phpt 2010-01-19 12:31:29 UTC (rev 293726) @@ -1,5 +1,9 @@ --TEST-- time_sleep_until() function - error test for time_sleep_until() +--SKIPIF-- + --CREDITS-- Filippo De Santis f...@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 -- 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/mysqlnd/mysqlnd_debug.h trunk/ext/mysqlnd/mysqlnd_debug.h
andrey Tue, 19 Jan 2010 12:13:06 +
Revision: http://svn.php.net/viewvc?view=revision&revision=293725
Log:
Make it GCC only feature (tracing). VC7 and up do the work
too and it might be tweaked later.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-01-19
12:03:07 UTC (rev 293724)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-01-19
12:13:06 UTC (rev 293725)
@@ -80,7 +80,7 @@
PHPAPI char * mysqlnd_get_backtrace(TSRMLS_D);
-#if !defined(PHP_WIN32)
+#if defined(__GNUC__)
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg));
} while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg));
} while (0)
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ",
__VA_ARGS__); } while (0)
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-01-19 12:03:07 UTC
(rev 293724)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-01-19 12:13:06 UTC
(rev 293725)
@@ -80,7 +80,7 @@
PHPAPI char * mysqlnd_get_backtrace(TSRMLS_D);
-#if !defined(PHP_WIN32)
+#if defined(__GNUC__)
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg));
} while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg));
} while (0)
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ",
__VA_ARGS__); } while (0)
--
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_2/main/streams/cast.c branches/PHP_5_3/main/streams/cast.c trunk/main/streams/cast.c
jani Tue, 19 Jan 2010 12:03:07 +
Revision: http://svn.php.net/viewvc?view=revision&revision=293724
Log:
- WS + CS fixes
Changed paths:
U php/php-src/branches/PHP_5_2/main/streams/cast.c
U php/php-src/branches/PHP_5_3/main/streams/cast.c
U php/php-src/trunk/main/streams/cast.c
Modified: php/php-src/branches/PHP_5_2/main/streams/cast.c
===
--- php/php-src/branches/PHP_5_2/main/streams/cast.c 2010-01-19 11:44:43 UTC (rev 293723)
+++ php/php-src/branches/PHP_5_2/main/streams/cast.c 2010-01-19 12:03:07 UTC (rev 293724)
@@ -55,6 +55,7 @@
{
int ret;
TSRMLS_FETCH();
+
ret = php_stream_read((php_stream*)cookie, buffer, size);
return ret;
}
@@ -62,12 +63,14 @@
static int stream_cookie_writer(void *cookie, const char *buffer, int size)
{
TSRMLS_FETCH();
+
return php_stream_write((php_stream *)cookie, (char *)buffer, size);
}
static fpos_t stream_cookie_seeker(void *cookie, off_t position, int whence)
{
TSRMLS_FETCH();
+
return (fpos_t)php_stream_seek((php_stream *)cookie, position, whence);
}
@@ -86,6 +89,7 @@
{
ssize_t ret;
TSRMLS_FETCH();
+
ret = php_stream_read(((php_stream *)cookie), buffer, size);
return ret;
}
@@ -93,6 +97,7 @@
static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t size)
{
TSRMLS_FETCH();
+
return php_stream_write(((php_stream *)cookie), (char *)buffer, size);
}
@@ -103,14 +108,16 @@
*position = php_stream_seek((php_stream *)cookie, (off_t)*position, whence);
- if (*position == -1)
+ if (*position == -1) {
return -1;
+ }
return 0;
}
#else
static int stream_cookie_seeker(void *cookie, off_t position, int whence)
{
TSRMLS_FETCH();
+
return php_stream_seek((php_stream *)cookie, position, whence);
}
#endif
@@ -153,9 +160,9 @@
stream->readpos = stream->writepos = 0;
}
}
-
+
/* filtered streams can only be cast as stdio, and only when fopencookie is present */
-
+
if (castas == PHP_STREAM_AS_STDIO) {
if (stream->stdiocast) {
if (ret) {
@@ -167,31 +174,33 @@
/* if the stream is a stdio stream let's give it a chance to respond
* first, to avoid doubling up the layers of stdio with an fopencookie */
if (php_stream_is(stream, PHP_STREAM_IS_STDIO) &&
-stream->ops->cast &&
-!php_stream_is_filtered(stream) &&
-stream->ops->cast(stream, castas, ret TSRMLS_CC) == SUCCESS)
- {
+ stream->ops->cast &&
+ !php_stream_is_filtered(stream) &&
+ stream->ops->cast(stream, castas, ret TSRMLS_CC) == SUCCESS
+ ) {
goto exit_success;
}
-
+
#if HAVE_FOPENCOOKIE
/* if just checking, say yes we can be a FILE*, but don't actually create it yet */
- if (ret == NULL)
+ if (ret == NULL) {
goto exit_success;
+ }
*(FILE**)ret = fopencookie(stream, stream->mode, PHP_STREAM_COOKIE_FUNCTIONS);
if (*ret != NULL) {
off_t pos;
-
+
stream->fclose_stdiocast = PHP_STREAM_FCLOSE_FOPENCOOKIE;
/* If the stream position is not at the start, we need to force
* the stdio layer to believe it's real location. */
pos = php_stream_tell(stream);
- if (pos > 0)
+ if (pos > 0) {
fseek(*ret, pos, SEEK_SET);
-
+ }
+
goto exit_success;
}
@@ -221,9 +230,10 @@
} else {
int retcode = php_stream_cast(newstream, castas | flags, (void **)ret, show_err);
- if (retcode == SUCCESS)
+ if (retcode == SUCCESS) {
rewind(*(FILE**)ret);
-
+ }
+
/* do some specialized cleanup */
if ((flags & PHP_STREAM_CAST_RELEASE)) {
php_stream_free(stream, PHP_STREAM_FREE_CLOSE_CASTED);
@@ -245,13 +255,13 @@
if (show_err) {
/* these names depend on the values of the PHP_STREAM_AS_XXX defines in php_streams.h */
static const char *cast_names[4] = {
- "STDIO FILE*", "File Descriptor", "Socket Descriptor", "select()able descriptor"
+ "STDIO FILE*",
+ "File Descriptor",
+ "Socket Descriptor",
+ "select()able descriptor"
};
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot represent a stream of type %s as a %s",
- stream->ops->label,
- cast_names[castas]
- );
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot represent a stream of type %s as a %s", stream->ops->label, cast_names[castas]);
}
return FAILURE;
@@ -259,20 +269,20 @@
exit_success:
if ((stream->writepos - stream->readpos) > 0 &&
- stream->fclose_stdiocast != PHP_STREAM_FCLOSE_FOPENCOOKIE &&
- (flags & PHP_STREAM_CAST_INTERNAL) == 0) {
+ stream->fclose_stdiocast != PHP_STREAM_FCLOSE_FOPENCOOKIE &&
+ (flags & PHP_STREAM_CAST_INTERNAL) == 0
+ ) {
/* the data we have buffered will be lost to the third party library that
* will be accessing the stream. Emit a warning so that the end-user will
* know that they should try something else */
-
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
-"%ld bytes of buffered data lost during stream conversion!",
-(long)(stream->writepos - stream->readpos));
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h trunk/ext/mysqlnd/mysqlnd_debug.h
andrey Tue, 19 Jan 2010 11:44:43 +
Revision: http://svn.php.net/viewvc?view=revision&revision=293723
Log:
fix windows
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-01-19
10:47:51 UTC (rev 293722)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-01-19
11:44:43 UTC (rev 293723)
@@ -80,6 +80,7 @@
PHPAPI char * mysqlnd_get_backtrace(TSRMLS_D);
+#if !defined(PHP_WIN32)
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg));
} while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg));
} while (0)
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ",
__VA_ARGS__); } while (0)
@@ -89,7 +90,17 @@
#define DBG_RETURN_EX(dbg_obj, value) do { if ((dbg_obj))
(dbg_obj)->m->func_leave((dbg_obj), __LINE__, __FILE__); return (value); }
while (0)
#define DBG_VOID_RETURN_EX(dbg_obj)do { if ((dbg_obj))
(dbg_obj)->m->func_leave((dbg_obj), __LINE__, __FILE__); return; } while (0)
+#else
+static inline void DBG_INF_EX(MYSQLND_DEBUG * dbg_obj, const char * const msg)
{}
+static inline void DBG_ERR_EX(MYSQLND_DEBUG * dbg_obj, const char * const msg)
{}
+static inline void DBG_INF_FMT_EX(MYSQLND_DEBUG * dbg_obj, ...) {}
+static inline void DBG_ERR_FMT_EX(MYSQLND_DEBUG * dbg_obj, ...) {}
+static inline void DBG_ENTER_EX(MYSQLND_DEBUG * dbg_obj, const char * const
func_name) {}
+#define DBG_RETURN_EX(dbg_obj, value) return (value)
+#define DBG_VOID_RETURN_EX(dbg_obj) return
+#endif
+
#if MYSQLND_DBG_ENABLED == 1
#define DBG_INF(msg) DBG_INF_EX(MYSQLND_G(dbg), (msg))
@@ -103,6 +114,8 @@
#elif MYSQLND_DBG_ENABLED == 0
+
+
static inline void DBG_INF(const char * const msg) {}
static inline void DBG_ERR(const char * const msg) {}
static inline void DBG_INF_FMT(const char * const format, ...) {}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-01-19 10:47:51 UTC
(rev 293722)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-01-19 11:44:43 UTC
(rev 293723)
@@ -80,6 +80,7 @@
PHPAPI char * mysqlnd_get_backtrace(TSRMLS_D);
+#if !defined(PHP_WIN32)
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg));
} while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg));
} while (0)
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ",
__VA_ARGS__); } while (0)
@@ -89,7 +90,17 @@
#define DBG_RETURN_EX(dbg_obj, value) do { if ((dbg_obj))
(dbg_obj)->m->func_leave((dbg_obj), __LINE__, __FILE__); return (value); }
while (0)
#define DBG_VOID_RETURN_EX(dbg_obj)do { if ((dbg_obj))
(dbg_obj)->m->func_leave((dbg_obj), __LINE__, __FILE__); return; } while (0)
+#else
+static inline void DBG_INF_EX(MYSQLND_DEBUG * dbg_obj, const char * const msg)
{}
+static inline void DBG_ERR_EX(MYSQLND_DEBUG * dbg_obj, const char * const msg)
{}
+static inline void DBG_INF_FMT_EX(MYSQLND_DEBUG * dbg_obj, ...) {}
+static inline void DBG_ERR_FMT_EX(MYSQLND_DEBUG * dbg_obj, ...) {}
+static inline void DBG_ENTER_EX(MYSQLND_DEBUG * dbg_obj, const char * const
func_name) {}
+#define DBG_RETURN_EX(dbg_obj, value) return (value)
+#define DBG_VOID_RETURN_EX(dbg_obj) return
+#endif
+
#if MYSQLND_DBG_ENABLED == 1
#define DBG_INF(msg) DBG_INF_EX(MYSQLND_G(dbg), (msg))
@@ -103,6 +114,8 @@
#elif MYSQLND_DBG_ENABLED == 0
+
+
static inline void DBG_INF(const char * const msg) {}
static inline void DBG_ERR(const char * const msg) {}
static inline void DBG_INF_FMT(const char * const format, ...) {}
--
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/spl/spl_fixedarray.h branches/PHP_5_3/ext/spl/spl_heap.h branches/PHP_5_3/main/php_getopt.h trunk/ext/spl/spl_fixedarray.h trunk/ext/spl/spl_heap.h tr
johannes Tue, 19 Jan 2010 10:44:36 + Revision: http://svn.php.net/viewvc?view=revision&revision=293721 Log: - Add extern declarations for fixing the build with some compilers Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/spl_fixedarray.h U php/php-src/branches/PHP_5_3/ext/spl/spl_heap.h U php/php-src/branches/PHP_5_3/main/php_getopt.h U php/php-src/trunk/ext/spl/spl_fixedarray.h U php/php-src/trunk/ext/spl/spl_heap.h U php/php-src/trunk/main/php_getopt.h Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_fixedarray.h === --- php/php-src/branches/PHP_5_3/ext/spl/spl_fixedarray.h 2010-01-19 10:11:58 UTC (rev 293720) +++ php/php-src/branches/PHP_5_3/ext/spl/spl_fixedarray.h 2010-01-19 10:44:36 UTC (rev 293721) @@ -22,7 +22,7 @@ #ifndef SPL_FIXEDARRAY_H #define SPL_FIXEDARRAY_H -PHPAPI zend_class_entry *spl_ce_SplFixedArray; +extern PHPAPI zend_class_entry *spl_ce_SplFixedArray; PHP_MINIT_FUNCTION(spl_fixedarray); Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_heap.h === --- php/php-src/branches/PHP_5_3/ext/spl/spl_heap.h 2010-01-19 10:11:58 UTC (rev 293720) +++ php/php-src/branches/PHP_5_3/ext/spl/spl_heap.h 2010-01-19 10:44:36 UTC (rev 293721) @@ -24,11 +24,11 @@ #include "php.h" #include "php_spl.h" -PHPAPI zend_class_entry *spl_ce_SplHeap; -PHPAPI zend_class_entry *spl_ce_SplMinHeap; -PHPAPI zend_class_entry *spl_ce_SplMaxHeap; +extern PHPAPI zend_class_entry *spl_ce_SplHeap; +extern PHPAPI zend_class_entry *spl_ce_SplMinHeap; +extern PHPAPI zend_class_entry *spl_ce_SplMaxHeap; -PHPAPI zend_class_entry *spl_ce_SplPriorityQueue; +extern PHPAPI zend_class_entry *spl_ce_SplPriorityQueue; PHP_MINIT_FUNCTION(spl_heap); Modified: php/php-src/branches/PHP_5_3/main/php_getopt.h === --- php/php-src/branches/PHP_5_3/main/php_getopt.h 2010-01-19 10:11:58 UTC (rev 293720) +++ php/php-src/branches/PHP_5_3/main/php_getopt.h 2010-01-19 10:44:36 UTC (rev 293721) @@ -41,7 +41,7 @@ BEGIN_EXTERN_C() /* holds the index of the latest fetched element from the opts array */ -PHPAPI int php_optidx; +extern PHPAPI int php_optidx; PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err, int arg_start); END_EXTERN_C() Modified: php/php-src/trunk/ext/spl/spl_fixedarray.h === --- php/php-src/trunk/ext/spl/spl_fixedarray.h 2010-01-19 10:11:58 UTC (rev 293720) +++ php/php-src/trunk/ext/spl/spl_fixedarray.h 2010-01-19 10:44:36 UTC (rev 293721) @@ -22,7 +22,7 @@ #ifndef SPL_FIXEDARRAY_H #define SPL_FIXEDARRAY_H -PHPAPI zend_class_entry *spl_ce_SplFixedArray; +extern PHPAPI zend_class_entry *spl_ce_SplFixedArray; PHP_MINIT_FUNCTION(spl_fixedarray); Modified: php/php-src/trunk/ext/spl/spl_heap.h === --- php/php-src/trunk/ext/spl/spl_heap.h2010-01-19 10:11:58 UTC (rev 293720) +++ php/php-src/trunk/ext/spl/spl_heap.h2010-01-19 10:44:36 UTC (rev 293721) @@ -24,11 +24,11 @@ #include "php.h" #include "php_spl.h" -PHPAPI zend_class_entry *spl_ce_SplHeap; -PHPAPI zend_class_entry *spl_ce_SplMinHeap; -PHPAPI zend_class_entry *spl_ce_SplMaxHeap; +extern PHPAPI zend_class_entry *spl_ce_SplHeap; +extern PHPAPI zend_class_entry *spl_ce_SplMinHeap; +extern PHPAPI zend_class_entry *spl_ce_SplMaxHeap; -PHPAPI zend_class_entry *spl_ce_SplPriorityQueue; +extern PHPAPI zend_class_entry *spl_ce_SplPriorityQueue; PHP_MINIT_FUNCTION(spl_heap); Modified: php/php-src/trunk/main/php_getopt.h === --- php/php-src/trunk/main/php_getopt.h 2010-01-19 10:11:58 UTC (rev 293720) +++ php/php-src/trunk/main/php_getopt.h 2010-01-19 10:44:36 UTC (rev 293721) @@ -41,7 +41,7 @@ BEGIN_EXTERN_C() /* holds the index of the latest fetched element from the opts array */ -PHPAPI int php_optidx; +extern PHPAPI int php_optidx; PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err, int arg_start); END_EXTERN_C() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
