[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
helly Sat Aug 2 09:44:50 2003 EDT Modified files: /php-src/ext/standard basic_functions.c Log: Use correct macro Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.617 php-src/ext/standard/basic_functions.c:1.618 --- php-src/ext/standard/basic_functions.c:1.617Thu Jul 24 04:02:08 2003 +++ php-src/ext/standard/basic_functions.c Sat Aug 2 09:44:50 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.617 2003/07/24 08:02:08 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.618 2003/08/02 13:44:50 helly Exp $ */ #include php.h #include php_streams.h @@ -657,10 +657,10 @@ PHP_FE(fgets, NULL) PHP_FE(fgetss, NULL) PHP_FE(fread, NULL) - PHP_STATIC_FE(fopen, php_if_fopen, NULL) + PHP_NAMED_FE(fopen, php_if_fopen, NULL) PHP_FE(fpassthru, NULL) - PHP_STATIC_FE(ftruncate, php_if_ftruncate, NULL) - PHP_STATIC_FE(fstat, php_if_fstat, NULL) + PHP_NAMED_FE(ftruncate, php_if_ftruncate, NULL) + PHP_NAMED_FE(fstat, php_if_fstat, NULL) PHP_FE(fseek, NULL) PHP_FE(ftell, NULL) PHP_FE(fflush, NULL) @@ -670,7 +670,7 @@ PHP_FE(rename, NULL) PHP_FE(copy, NULL) PHP_FE(tempnam, NULL) - PHP_STATIC_FE(tmpfile,php_if_tmpfile, NULL) + PHP_NAMED_FE(tmpfile, php_if_tmpfile, NULL) PHP_FE(file, NULL) PHP_FE(file_get_contents, NULL) PHP_FE(file_put_contents, NULL) @@ -746,7 +746,7 @@ PHP_FE(getcwd, NULL) PHP_FE(rewinddir, NULL) - PHP_STATIC_FE(readdir,php_if_readdir, NULL) + PHP_NAMED_FE(readdir, php_if_readdir, NULL) PHP_FALIAS(dir, getdir, NULL) PHP_FE(scandir, NULL) #ifdef HAVE_GLOB @@ -770,8 +770,8 @@ PHP_FE(is_file, NULL) PHP_FE(is_dir, NULL) PHP_FE(is_link, NULL) - PHP_STATIC_FE(stat, php_if_stat, NULL) -
[PHP-CVS] cvs: php-src /ext/standard dir.c
helly Sat Aug 2 09:49:12 2003 EDT
Modified files:
/php-src/ext/standard dir.c
Log:
Use correct macro
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.126 php-src/ext/standard/dir.c:1.127
--- php-src/ext/standard/dir.c:1.126Wed Jul 23 17:41:44 2003
+++ php-src/ext/standard/dir.c Sat Aug 2 09:49:12 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.126 2003/07/23 21:41:44 iliaa Exp $ */
+/* $Id: dir.c,v 1.127 2003/08/02 13:49:12 helly Exp $ */
/* {{{ includes/startup/misc */
@@ -95,7 +95,7 @@
static zend_function_entry php_dir_class_functions[] = {
PHP_FALIAS(close, closedir, NULL)
PHP_FALIAS(rewind, rewinddir, NULL)
- PHP_STATIC_FE(read, php_if_readdir, NULL)
+ PHP_NAMED_FE(read, php_if_readdir, NULL)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c
iliaa Sat Aug 2 14:29:31 2003 EDT Modified files: /php-src/sapi/apache2handlersapi_apache2.c /php-src/sapi/apache2filter sapi_apache2.c Log: Fixed bug #24177 (Status not set correctly after flush() in Apache 2) Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.23 php-src/sapi/apache2handler/sapi_apache2.c:1.24 --- php-src/sapi/apache2handler/sapi_apache2.c:1.23 Fri Aug 1 16:20:11 2003 +++ php-src/sapi/apache2handler/sapi_apache2.c Sat Aug 2 14:29:30 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.23 2003/08/01 20:20:11 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.24 2003/08/02 18:29:30 iliaa Exp $ */ #include fcntl.h @@ -254,6 +254,8 @@ r = ctx-r; brigade = ctx-brigade; + + r-status = SG(sapi_headers).http_response_code; /* Send a flush bucket down the filter chain. */ bucket = apr_bucket_flush_create(r-connection-bucket_alloc); Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.117 php-src/sapi/apache2filter/sapi_apache2.c:1.118 --- php-src/sapi/apache2filter/sapi_apache2.c:1.117 Fri Aug 1 16:20:11 2003 +++ php-src/sapi/apache2filter/sapi_apache2.c Sat Aug 2 14:29:30 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.117 2003/08/01 20:20:11 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.118 2003/08/02 18:29:30 iliaa Exp $ */ #include fcntl.h @@ -241,7 +241,9 @@ * then don't bother flushing. */ if (!server_context) return; - + + ctx-r-status = SG(sapi_headers).http_response_code; + f = ctx-f; /* Send a flush bucket down the filter chain. The current default -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c
iliaa Sat Aug 2 14:30:22 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2handlersapi_apache2.c /php-src/sapi/apache2filter sapi_apache2.c /php-srcNEWS Log: MFH: Fixed bug #24177 (Status not set correctly after flush() in Apache 2) Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.18 php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.19 --- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.18 Fri Aug 1 16:21:21 2003 +++ php-src/sapi/apache2handler/sapi_apache2.c Sat Aug 2 14:30:21 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.1.2.18 2003/08/01 20:21:21 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.19 2003/08/02 18:30:21 iliaa Exp $ */ #include fcntl.h @@ -259,6 +259,8 @@ r = ctx-r; brigade = ctx-brigade; + + r-status = SG(sapi_headers).http_response_code; /* Send a flush bucket down the filter chain. */ bucket = apr_bucket_flush_create(r-connection-bucket_alloc); Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.18 php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.19 --- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.18 Fri Aug 1 16:21:21 2003 +++ php-src/sapi/apache2filter/sapi_apache2.c Sat Aug 2 14:30:22 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.91.2.18 2003/08/01 20:21:21 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.91.2.19 2003/08/02 18:30:22 iliaa Exp $ */ #include fcntl.h @@ -236,7 +236,9 @@ * then don't bother flushing. */ if (!server_context) return; - + + ctx-r-status = SG(sapi_headers).http_response_code; + f = ctx-f; /* Send a flush bucket down the filter chain. The current default Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.320 php-src/NEWS:1.1247.2.321 --- php-src/NEWS:1.1247.2.320 Fri Aug 1 16:21:21 2003 +++ php-src/NEWSSat Aug 2 14:30:22 2003 @@ -3,6 +3,7 @@ ?? Aug 2003, Version 4.3.3RC3 - Fixed bug #24883 (variables_order and gpc_order being ignored). (Ilia) - Fixed bug #24871 (methods misidentified as constructors). (Ilia) +- Fixed bug #24177 (Status not set correctly after flush() in Apache 2). (Ilia) - Fixed bug #23509 (exit code lost when exit() called from register_shutdown_function()). (Ilia) - Fixed bug #22154 (Possible crash when memory_limit is reached and -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sat Aug 2 22:56:12 2003 EDT Modified files: /CVSROOTavail Log: phpdoc karma for dufiga_php Index: CVSROOT/avail diff -u CVSROOT/avail:1.724 CVSROOT/avail:1.725 --- CVSROOT/avail:1.724 Fri Aug 1 22:39:33 2003 +++ CVSROOT/avail Sat Aug 2 22:56:12 2003 @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,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,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,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,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,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,tony2001,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,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo|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,phpdoc-el,phpdoc-id
