[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Dec 7 20:30:08 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.352 ZendEngine2/ChangeLog:1.353 --- ZendEngine2/ChangeLog:1.352 Sat Dec 6 20:32:57 2003 +++ ZendEngine2/ChangeLog Sun Dec 7 20:30:07 2003 @@ -1,3 +1,8 @@ +2003-12-07 Stanislav Malyshev [EMAIL PROTECTED] + +* zend_builtin_functions.c: + Apply Andrey Hristov's patch adding get_declared_interfaces() + 2003-12-06 Marcus Boerger [EMAIL PROTECTED] * zend_compile.c: @@ -2310,7 +2315,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.352 2003/12/07 01:32:57 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.353 2003/12/08 01:30:07 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -4034,7 +4039,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.352 2003/12/07 01:32:57 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.353 2003/12/08 01:30:07 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src /ext/mbstring config.m4
Marcus Boerger [EMAIL PROTECTED] wrote: Hmm, how does this change fix your problem? $ext_shared gets overwritten if i do not 'cache' it in another variable. With a quick look over the script, nowhere seems ext_shared to be overwritten. (And I've already tested shared build to see it work quite well..) BTW the patch is harmless, so maybe it'd better to leave it as is. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring config.m4
Moriyoshi Koizumi [EMAIL PROTECTED] wrote: overwritten. (And I've already tested shared build to see it work quite well..) Forgot to mention, I tested without the last patch. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/cpdf config.m4 /ext/dba config.m4 /ext/dom config.m4 /ext/gd config.m4
There was nothing wrong with these. So please explain in what situation these changes were needed? --Jani On Sun, 7 Dec 2003, Marcus Boerger wrote: helly Sat Dec 6 19:21:48 2003 EDT Modified files: /php-src/ext/cpdf config.m4 /php-src/ext/dba config.m4 /php-src/ext/dom config.m4 /php-src/ext/gdconfig.m4 Log: Fix enabling shared builds. Index: php-src/ext/cpdf/config.m4 diff -u php-src/ext/cpdf/config.m4:1.17 php-src/ext/cpdf/config.m4:1.18 --- php-src/ext/cpdf/config.m4:1.17Tue Sep 30 22:53:02 2003 +++ php-src/ext/cpdf/config.m4 Sat Dec 6 19:21:45 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.17 2003/10/01 02:53:02 sniper Exp $ +dnl $Id: config.m4,v 1.18 2003/12/07 00:21:45 helly Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ AC_ARG_WITH(jpeg-dir, @@ -47,41 +47,36 @@ ]) AC_MSG_CHECKING(for cpdflib support) -AC_ARG_WITH(cpdflib, -[ --with-cpdflib[=DIR]Include cpdflib support (requires cpdflib = 2).], -[ - PHP_WITH_SHARED - if test $withval != no; then -cpdf_withval=$withval -PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared,, \\$(GDLIB_CFLAGS)) -PHP_SUBST(CPDF_SHARED_LIBADD) -CPDF_JPEG_TEST -CPDF_TIFF_TEST - -for i in $cpdf_withval /usr/local /usr; do - if test -f $i/include/cpdflib.h; then -CPDFLIB_INCLUDE=$i/include -AC_MSG_CHECKING(for cpdflib.h) -AC_MSG_RESULT([in $i/include]) - -PHP_CHECK_LIBRARY(cpdf, cpdf_open, [ - PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) - PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD) - AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) -], [ - AC_MSG_ERROR([Cpdflib module requires cpdflib = 2.]) -], [ - -L$i/lib $CPDF_SHARED_LIBADD -]) -break - fi -done +PHP_ARG_WITH(cpdflib, +[ --with-cpdflib[=DIR]Include cpdflib support (requires cpdflib = 2).]) -if test -z $CPDFLIB_INCLUDE; then +if test $PHP_CPDFLIB != no; then + PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared,, \\$(GDLIB_CFLAGS)) + PHP_SUBST(CPDF_SHARED_LIBADD) + CPDF_JPEG_TEST + CPDF_TIFF_TEST + + for i in $PHP_CPDFLIB /usr/local /usr; do +if test -f $i/include/cpdflib.h; then + CPDFLIB_INCLUDE=$i/include AC_MSG_CHECKING(for cpdflib.h) - AC_MSG_ERROR([not found]) + AC_MSG_RESULT([in $i/include]) + + PHP_CHECK_LIBRARY(cpdf, cpdf_open, [ +PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) +PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD) +AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) + ], [ +AC_MSG_ERROR([Cpdflib module requires cpdflib = 2.]) + ], [ +-L$i/lib $CPDF_SHARED_LIBADD + ]) + break fi + done + + if test -z $CPDFLIB_INCLUDE; then +AC_MSG_CHECKING(for cpdflib.h) +AC_MSG_ERROR([not found]) fi -],[ - AC_MSG_RESULT(no) -]) +fi Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.56 php-src/ext/dba/config.m4:1.57 --- php-src/ext/dba/config.m4:1.56 Fri Oct 3 01:24:19 2003 +++ php-src/ext/dba/config.m4 Sat Dec 6 19:21:46 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.56 2003/10/03 05:24:19 sniper Exp $ +dnl $Id: config.m4,v 1.57 2003/12/07 00:21:46 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -64,6 +64,7 @@ PHP_ARG_ENABLE(dba,whether to enable DBA, [ --enable-dbaBuild DBA with builtin modules]) +dba_shared=$ext_shared AC_ARG_WITH(gdbm, [ --with-gdbm[=DIR] DBA: Include GDBM support],[ @@ -170,8 +171,8 @@ AC_MSG_ERROR(Version 4.1 requires patch level 25) ]) fi - if test $ext_shared = yes; then -AC_MSG_CHECKING(if db can be used as shared extension) + if test $dba_shared = yes; then +AC_MSG_CHECKING(if dba can be used as shared extension) AC_EGREP_CPP(yes,[ #include $THIS_INCLUDE #if DB_VERSION_MAJOR 3 || (DB_VERSION_MAJOR == 3 DB_VERSION_MINOR 2) @@ -429,7 +430,7 @@ if test $HAVE_DBA = 1; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_DBA, 1, [ ]) - PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $ext_shared) + PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $dba_shared) PHP_ADD_BUILD_DIR($ext_builddir/libinifile) PHP_ADD_BUILD_DIR($ext_builddir/libcdb) PHP_ADD_BUILD_DIR($ext_builddir/libflatfile) Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.13 php-src/ext/dom/config.m4:1.14 --- php-src/ext/dom/config.m4:1.13 Sat Nov 29 15:40:17 2003 +++ php-src/ext/dom/config.m4 Sat Dec 6 19:21:47 2003 @@ -1,9 +1,10 @@ dnl -dnl $Id: config.m4,v 1.13 2003/11/29 20:40:17 rrichards Exp $ +dnl $Id: config.m4,v 1.14 2003/12/07 00:21:47 helly Exp $ dnl
Re: [PHP-CVS] cvs: php-src /ext/ftp ftp.c ftp.h php_ftp.c
How does changing '#ifdef' to '#if' fix it..?
(see PHP_4_3 ext/openssl/config0.m4 for how really fix it)
Anyway, I thought that openssl stuff registers some streams
stuff so you can build it as shared in PHP 5??
--Jani
On Sat, 6 Dec 2003, Wez Furlong wrote:
wezSat Dec 6 11:12:10 2003 EDT
Modified files:
/php-src/ext/ftp ftp.c ftp.h php_ftp.c
Log:
Fix ftp build when openssl is built as a shared extension.
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.94 php-src/ext/ftp/ftp.c:1.95
--- php-src/ext/ftp/ftp.c:1.94 Fri Dec 5 19:00:28 2003
+++ php-src/ext/ftp/ftp.c Sat Dec 6 11:12:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.c,v 1.94 2003/12/06 00:00:28 wez Exp $ */
+/* $Id: ftp.c,v 1.95 2003/12/06 16:12:10 wez Exp $ */
#include php.h
@@ -65,7 +65,7 @@
#include sys/select.h
#endif
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
#include openssl/ssl.h
#endif
@@ -179,7 +179,7 @@
data_close(ftp, ftp-data);
}
if (ftp-fd != -1) {
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
if (ftp-ssl_active) {
SSL_shutdown(ftp-ssl_handle);
}
@@ -241,14 +241,14 @@
int
ftp_login(ftpbuf_t *ftp, const char *user, const char *pass TSRMLS_DC)
{
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
SSL_CTX *ctx = NULL;
#endif
if (ftp == NULL) {
return 0;
}
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
if (ftp-use_ssl !ftp-ssl_active) {
if (!ftp_putcmd(ftp, AUTH, TLS)) {
return 0;
@@ -1231,7 +1231,7 @@
return -1;
}
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
if (ftp-use_ssl ftp-fd == s ftp-ssl_active) {
sent = SSL_write(ftp-ssl_handle, buf, size);
} else if (ftp-use_ssl ftp-fd != s ftp-use_ssl_for_data
ftp-data-ssl_active) {
@@ -1239,7 +1239,7 @@
} else {
#endif
sent = send(s, buf, size, 0);
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
}
#endif
if (sent == -1) {
@@ -1279,7 +1279,7 @@
return -1;
}
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
if (ftp-use_ssl ftp-fd == s ftp-ssl_active) {
nr_bytes = SSL_read(ftp-ssl_handle, buf, len);
} else if (ftp-use_ssl ftp-fd != s ftp-use_ssl_for_data
ftp-data-ssl_active) {
@@ -1287,7 +1287,7 @@
} else {
#endif
nr_bytes = recv(s, buf, len, 0);
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
}
#endif
return (nr_bytes);
@@ -1507,7 +1507,7 @@
php_sockaddr_storage addr;
socklen_t size;
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
SSL_CTX *ctx;
#endif
@@ -1525,7 +1525,7 @@
}
data_accepted:
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
/* now enable ssl if we need to */
if (ftp-use_ssl ftp-use_ssl_for_data) {
@@ -1573,7 +1573,7 @@
return NULL;
}
if (data-listener != -1) {
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
if (data-ssl_active) {
SSL_shutdown(data-ssl_handle);
data-ssl_active = 0;
@@ -1582,7 +1582,7 @@
closesocket(data-listener);
}
if (data-fd != -1) {
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
if (data-ssl_active) {
SSL_shutdown(data-ssl_handle);
data-ssl_active = 0;
Index: php-src/ext/ftp/ftp.h
diff -u php-src/ext/ftp/ftp.h:1.40 php-src/ext/ftp/ftp.h:1.41
--- php-src/ext/ftp/ftp.h:1.40 Thu Sep 18 13:36:08 2003
+++ php-src/ext/ftp/ftp.h Sat Dec 6 11:12:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.h,v 1.40 2003/09/18 17:36:08 pollita Exp $ */
+/* $Id: ftp.h,v 1.41 2003/12/06 16:12:10 wez Exp $ */
#ifndef FTP_H
#define FTP_H
@@ -49,7 +49,7 @@
php_socket_tfd; /* data connection */
ftptype_t type; /* transfer type */
charbuf[FTP_BUFSIZE]; /* data buffer */
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
SSL *ssl_handle;/* ssl handle */
int ssl_active; /* flag if ssl is active or not */
#endif
@@ -78,7 +78,7 @@
int lastch; /* last char of previous call
*/
int direction; /* recv = 0 / send = 1 */
int closestream;/* close or not close stream */
-#ifdef HAVE_OPENSSL_EXT
+#if HAVE_OPENSSL_EXT
int
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 05:32:27 2003 EDT Modified files: /CVSROOTavail Log: phpdoc access for Nuno Lopes and Jakub Vrana Index: CVSROOT/avail diff -u CVSROOT/avail:1.779 CVSROOT/avail:1.780 --- CVSROOT/avail:1.779 Fri Dec 5 10:37:34 2003 +++ CVSROOT/avail Sun Dec 7 05:32:26 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,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|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
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 05:38:20 2003 EDT Modified files: /CVSROOTavail Log: batch phpdoc karma apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans Index: CVSROOT/avail diff -u CVSROOT/avail:1.780 CVSROOT/avail:1.781 --- CVSROOT/avail:1.780 Sun Dec 7 05:32:26 2003 +++ CVSROOT/avail Sun Dec 7 05:38:19 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,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,nlopess,vrana|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
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 05:52:07 2003 EDT Modified files: /CVSROOTavail Log: karma for hfuecks Index: CVSROOT/avail diff -u CVSROOT/avail:1.781 CVSROOT/avail:1.782 --- CVSROOT/avail:1.781 Sun Dec 7 05:38:19 2003 +++ CVSROOT/avail Sun Dec 7 05:52:06 2003 @@ -193,6 +193,7 @@ avail|mg|pecl/lzf avail|mg|pecl/tcpwrap avail|xnoguer|pecl/valkyrie +avail|hfuecks|pear/XML_HTMLSax,pear/XML_SaxFilters,pear/Calendar # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 05:52:40 2003 EDT Modified files: /CVSROOTavail Log: karma for ezdevelop Index: CVSROOT/avail diff -u CVSROOT/avail:1.782 CVSROOT/avail:1.783 --- CVSROOT/avail:1.782 Sun Dec 7 05:52:06 2003 +++ CVSROOT/avail Sun Dec 7 05:52:39 2003 @@ -194,6 +194,7 @@ avail|mg|pecl/tcpwrap avail|xnoguer|pecl/valkyrie avail|hfuecks|pear/XML_HTMLSax,pear/XML_SaxFilters,pear/Calendar +avail|ezdevelop|pecl/lzo # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 05:55:15 2003 EDT Modified files: /CVSROOTavail Log: peardoc for mcgyver5 Index: CVSROOT/avail diff -u CVSROOT/avail:1.783 CVSROOT/avail:1.784 --- CVSROOT/avail:1.783 Sun Dec 7 05:52:39 2003 +++ CVSROOT/avail Sun Dec 7 05:55:15 2003 @@ -55,7 +55,7 @@ avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews # Some people get access to the peardoc -avail|sroebke,thierry_bo,tony2001,schst|peardoc +avail|sroebke,thierry_bo,tony2001,schst,mcgyver5|peardoc avail|elf|peardoc/ja avail|elf|phpdoc/ja -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 05:56:02 2003 EDT Modified files: /CVSROOTavail Log: pear package access for ths Index: CVSROOT/avail diff -u CVSROOT/avail:1.784 CVSROOT/avail:1.785 --- CVSROOT/avail:1.784 Sun Dec 7 05:55:15 2003 +++ CVSROOT/avail Sun Dec 7 05:55:59 2003 @@ -195,6 +195,7 @@ avail|xnoguer|pecl/valkyrie avail|hfuecks|pear/XML_HTMLSax,pear/XML_SaxFilters,pear/Calendar avail|ezdevelop|pecl/lzo +avail|ths|pear/HTML_QuickForm_Renderers # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 05:58:45 2003 EDT Modified files: /CVSROOTavail Log: more phpdoc karma lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott Index: CVSROOT/avail diff -u CVSROOT/avail:1.785 CVSROOT/avail:1.786 --- CVSROOT/avail:1.785 Sun Dec 7 05:55:59 2003 +++ CVSROOT/avail Sun Dec 7 05:58:44 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,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,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans|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
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 06:00:03 2003 EDT Modified files: /CVSROOTavail Log: ecolinet for pecl/win32std Index: CVSROOT/avail diff -u CVSROOT/avail:1.787 CVSROOT/avail:1.788 --- CVSROOT/avail:1.787 Sun Dec 7 05:59:19 2003 +++ CVSROOT/avail Sun Dec 7 06:00:02 2003 @@ -196,6 +196,7 @@ avail|hfuecks|pear/XML_HTMLSax,pear/XML_SaxFilters,pear/Calendar avail|ezdevelop|pecl/lzo avail|ths|pear/HTML_QuickForm_Renderers +avail|ecolinet|pecl/win32std # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 06:00:48 2003 EDT Modified files: /CVSROOTavail Log: peardoc karma for sousk Index: CVSROOT/avail diff -u CVSROOT/avail:1.788 CVSROOT/avail:1.789 --- CVSROOT/avail:1.788 Sun Dec 7 06:00:02 2003 +++ CVSROOT/avail Sun Dec 7 06:00:47 2003 @@ -55,7 +55,7 @@ avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews # Some people get access to the peardoc -avail|sroebke,thierry_bo,tony2001,schst,mcgyver5|peardoc +avail|sroebke,thierry_bo,tony2001,schst,mcgyver5,sousk|peardoc avail|elf|peardoc/ja avail|elf|phpdoc/ja -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/cpdf config.m4 /ext/dba config.m4 /ext/dom config.m4 /ext/gd config.m4
Hello Jani, Sunday, December 7, 2003, 11:18:37 AM, you wrote: There was nothing wrong with these. So please explain in what situation these changes were needed? --Jani On Sun, 7 Dec 2003, Marcus Boerger wrote: helly Sat Dec 6 19:21:48 2003 EDT Modified files: /php-src/ext/cpdf config.m4 /php-src/ext/dba config.m4 /php-src/ext/dom config.m4 /php-src/ext/gd config.m4 Log: Fix enabling shared builds. Index: php-src/ext/cpdf/config.m4 diff -u php-src/ext/cpdf/config.m4:1.17 php-src/ext/cpdf/config.m4:1.18 --- php-src/ext/cpdf/config.m4:1.17 Tue Sep 30 22:53:02 2003 +++ php-src/ext/cpdf/config.m4Sat Dec 6 19:21:45 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.17 2003/10/01 02:53:02 sniper Exp $ +dnl $Id: config.m4,v 1.18 2003/12/07 00:21:45 helly Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ AC_ARG_WITH(jpeg-dir, @@ -47,41 +47,36 @@ ]) AC_MSG_CHECKING(for cpdflib support) -AC_ARG_WITH(cpdflib, -[ --with-cpdflib[=DIR]Include cpdflib support (requires cpdflib = 2).], -[ - PHP_WITH_SHARED - if test $withval != no; then -cpdf_withval=$withval -PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared,, \\$(GDLIB_CFLAGS)) -PHP_SUBST(CPDF_SHARED_LIBADD) -CPDF_JPEG_TEST -CPDF_TIFF_TEST - -for i in $cpdf_withval /usr/local /usr; do - if test -f $i/include/cpdflib.h; then -CPDFLIB_INCLUDE=$i/include -AC_MSG_CHECKING(for cpdflib.h) -AC_MSG_RESULT([in $i/include]) - -PHP_CHECK_LIBRARY(cpdf, cpdf_open, [ - PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) - PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD) - AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) -], [ - AC_MSG_ERROR([Cpdflib module requires cpdflib = 2.]) -], [ - -L$i/lib $CPDF_SHARED_LIBADD -]) -break - fi -done +PHP_ARG_WITH(cpdflib, +[ --with-cpdflib[=DIR]Include cpdflib support (requires cpdflib = 2).]) -if test -z $CPDFLIB_INCLUDE; then +if test $PHP_CPDFLIB != no; then + PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared,, \\$(GDLIB_CFLAGS)) + PHP_SUBST(CPDF_SHARED_LIBADD) + CPDF_JPEG_TEST + CPDF_TIFF_TEST + + for i in $PHP_CPDFLIB /usr/local /usr; do +if test -f $i/include/cpdflib.h; then + CPDFLIB_INCLUDE=$i/include AC_MSG_CHECKING(for cpdflib.h) - AC_MSG_ERROR([not found]) + AC_MSG_RESULT([in $i/include]) + + PHP_CHECK_LIBRARY(cpdf, cpdf_open, [ +PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) +PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD) +AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) + ], [ +AC_MSG_ERROR([Cpdflib module requires cpdflib = 2.]) + ], [ +-L$i/lib $CPDF_SHARED_LIBADD + ]) + break fi + done + + if test -z $CPDFLIB_INCLUDE; then +AC_MSG_CHECKING(for cpdflib.h) +AC_MSG_ERROR([not found]) fi -],[ - AC_MSG_RESULT(no) -]) +fi Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.56 php-src/ext/dba/config.m4:1.57 --- php-src/ext/dba/config.m4:1.56Fri Oct 3 01:24:19 2003 +++ php-src/ext/dba/config.m4 Sat Dec 6 19:21:46 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.56 2003/10/03 05:24:19 sniper Exp $ +dnl $Id: config.m4,v 1.57 2003/12/07 00:21:46 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -64,6 +64,7 @@ PHP_ARG_ENABLE(dba,whether to enable DBA, [ --enable-dbaBuild DBA with builtin modules]) +dba_shared=$ext_shared AC_ARG_WITH(gdbm, [ --with-gdbm[=DIR] DBA: Include GDBM support],[ @@ -170,8 +171,8 @@ AC_MSG_ERROR(Version 4.1 requires patch level 25) ]) fi - if test $ext_shared = yes; then -AC_MSG_CHECKING(if db can be used as shared extension) + if test $dba_shared = yes; then +AC_MSG_CHECKING(if dba can be used as shared extension) AC_EGREP_CPP(yes,[ #include $THIS_INCLUDE #if DB_VERSION_MAJOR 3 || (DB_VERSION_MAJOR == 3 DB_VERSION_MINOR 2) @@ -429,7 +430,7 @@ if test $HAVE_DBA = 1; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_DBA, 1, [ ]) - PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $ext_shared) + PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $dba_shared) PHP_ADD_BUILD_DIR($ext_builddir/libinifile) PHP_ADD_BUILD_DIR($ext_builddir/libcdb) PHP_ADD_BUILD_DIR($ext_builddir/libflatfile) Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.13 php-src/ext/dom/config.m4:1.14 --- php-src/ext/dom/config.m4:1.13Sat Nov 29 15:40:17 2003 +++ php-src/ext/dom/config.m4 Sat Dec 6 19:21:47 2003 @@ -1,9 +1,10 @@ dnl -dnl $Id: config.m4,v 1.13 2003/11/29 20:40:17 rrichards Exp $ +dnl $Id:
Re: [PHP-CVS] cvs: php-src /ext/mbstring config.m4
Hello Moriyoshi, Sunday, December 7, 2003, 9:28:50 AM, you wrote: Marcus Boerger [EMAIL PROTECTED] wrote: Hmm, how does this change fix your problem? $ext_shared gets overwritten if i do not 'cache' it in another variable. With a quick look over the script, nowhere seems ext_shared to be overwritten. (And I've already tested shared build to see it work quite well..) BTW the patch is harmless, so maybe it'd better to leave it as is. Any PHP_ARG_ENABLE or PHP_ARG_WITH macro overwrites $ext_shared, so i need to cache it, thats the problem. It *may* work without caching $ext_shared but it also may *not* work, now it always works. -- Best regards, Marcusmailto:[EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ftp ftp.c ftp.h php_ftp.c
win32 build defines those symbols to 0 or 1 depending on if it is present or not. openssl streams is unrelated to this fix as ftp extension doesn't use streams API. --Wez. - Original Message - From: Jani Taskinen [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Sunday, December 07, 2003 10:24 AM Subject: Re: [PHP-CVS] cvs: php-src /ext/ftp ftp.c ftp.h php_ftp.c How does changing '#ifdef' to '#if' fix it..? (see PHP_4_3 ext/openssl/config0.m4 for how really fix it) Anyway, I thought that openssl stuff registers some streams stuff so you can build it as shared in PHP 5?? --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 06:09:30 2003 EDT Modified files: /CVSROOTavail Log: lzo removed due to GPL concerns Index: CVSROOT/avail diff -u CVSROOT/avail:1.789 CVSROOT/avail:1.790 --- CVSROOT/avail:1.789 Sun Dec 7 06:00:47 2003 +++ CVSROOT/avail Sun Dec 7 06:09:28 2003 @@ -194,7 +194,6 @@ avail|mg|pecl/tcpwrap avail|xnoguer|pecl/valkyrie avail|hfuecks|pear/XML_HTMLSax,pear/XML_SaxFilters,pear/Calendar -avail|ezdevelop|pecl/lzo avail|ths|pear/HTML_QuickForm_Renderers avail|ecolinet|pecl/win32std -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl config.w32 /ext/xsl/tests area_list.xsl area_name.xml
rrichards Sun Dec 7 06:11:48 2003 EDT
Modified files:
/php-src/ext/xslconfig.w32
/php-src/ext/xsl/tests area_list.xsl area_name.xml
Log:
fix warning for shared debug
fix test bug26384 - WS issue
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.6 php-src/ext/xsl/config.w32:1.7
--- php-src/ext/xsl/config.w32:1.6 Fri Dec 5 16:24:48 2003
+++ php-src/ext/xsl/config.w32 Sun Dec 7 06:11:46 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2003/12/05 21:24:48 rrichards Exp $
+// $Id: config.w32,v 1.7 2003/12/07 11:11:46 rrichards Exp $
// vim: ft=javascript
ARG_WITH(xsl, xsl support, no);
@@ -20,6 +20,10 @@
AC_DEFINE(HAVE_XSL, 1, Define if xsl extension is enabled);
if (! PHP_XSL_SHARED) {
ADD_FLAG(CFLAGS_XSL, /D DOM_EXPORTS /D
LIBXML_STATIC);
+ } else {
+ if (PHP_DEBUG == yes) {
+ ADD_FLAG(LDFLAGS_XSL,
/nodefaultlib:msvcrt);
+ }
}
} else {
WARNING(xsl not enabled; libraries and headers not found);
Index: php-src/ext/xsl/tests/area_list.xsl
diff -u php-src/ext/xsl/tests/area_list.xsl:1.1 php-src/ext/xsl/tests/area_list.xsl:1.2
--- php-src/ext/xsl/tests/area_list.xsl:1.1 Sat Nov 29 11:38:09 2003
+++ php-src/ext/xsl/tests/area_list.xsl Sun Dec 7 06:11:47 2003
@@ -1,10 +1,10 @@
-?xml version=1.0 encoding=UTF-8?
-xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
-
- xsl:output method=text encoding=UTF-8/
-
- xsl:key name=area match=ROW use=substring(translate(AREA_NAME, 'quot;',
''), 1, 1)/
-xsl:template match=*
-HERE
-/xsl:template
-/xsl:stylesheet
+?xml version=1.0 encoding=UTF-8?
+xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
+
+ xsl:output method=text encoding=UTF-8/
+
+ xsl:key name=area match=ROW use=substring(translate(AREA_NAME, 'quot;',
''), 1, 1)/
+xsl:template match=*
+HERE
+/xsl:template
+/xsl:stylesheet
Index: php-src/ext/xsl/tests/area_name.xml
diff -u php-src/ext/xsl/tests/area_name.xml:1.1 php-src/ext/xsl/tests/area_name.xml:1.2
--- php-src/ext/xsl/tests/area_name.xml:1.1 Sat Nov 29 11:38:09 2003
+++ php-src/ext/xsl/tests/area_name.xml Sun Dec 7 06:11:47 2003
@@ -1,9 +1,12 @@
-?xml version=1.0 encoding=UTF-8?
-AREA_NAME
- ROW
- AREA_CODE13/AREA_CODE
- AREA_NAMEquot;Автовоquot; м./AREA_NAME
- AREA_NAME_ENGm.quot;Avtovoquot;/AREA_NAME_ENG
- /ROW
-/AREA_NAME
-
+?xml version=1.0 encoding=UTF-8?
+
+AREA_NAME
+ ROW
+ AREA_CODE13/AREA_CODE
+ AREA_NAMEquot;Автовоquot; м./AREA_NAME
+ AREA_NAME_ENGm.quot;Avtovoquot;/AREA_NAME_ENG
+ /ROW
+/AREA_NAME
+
+
+
--
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) /sapi/cgi/libfcgi os_unix.c
stasSun Dec 7 07:58:42 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/cgi/libfcgi os_unix.c
Log:
fix potential buffer overrun
Index: php-src/sapi/cgi/libfcgi/os_unix.c
diff -u php-src/sapi/cgi/libfcgi/os_unix.c:1.2.2.2
php-src/sapi/cgi/libfcgi/os_unix.c:1.2.2.3
--- php-src/sapi/cgi/libfcgi/os_unix.c:1.2.2.2 Sun Sep 21 18:08:16 2003
+++ php-src/sapi/cgi/libfcgi/os_unix.c Sun Dec 7 07:57:26 2003
@@ -17,7 +17,7 @@
*/
#ifndef lint
-static const char rcsid[] = $Id: os_unix.c,v 1.2.2.2 2003/09/21 22:08:16 sas Exp $;
+static const char rcsid[] = $Id: os_unix.c,v 1.2.2.3 2003/12/07 12:57:26 stas Exp $;
#endif /* not lint */
#include fcgi_config.h
@@ -103,6 +103,11 @@
static int shutdownPending = FALSE;
static int shutdownNow = FALSE;
+#ifndef HAVE_STRLCPY
+#define strlcpy php_strlcpy
+#endif
+size_t strlcpy(char *dst, const char *src, size_t siz);
+
void OS_ShutdownPending()
{
shutdownPending = TRUE;
@@ -293,7 +298,7 @@
short port = 0;
charhost[MAXPATHLEN];
-strcpy(host, bindPath);
+strlcpy(host, bindPath, MAXPATHLEN-1);
if((tp = strchr(host, ':')) != 0) {
*tp++ = 0;
if((port = atoi(tp)) == 0) {
@@ -396,7 +401,7 @@
short port = 0;
inttcp = FALSE;
-strcpy(host, bindPath);
+strlcpy(host, bindPath, MAXPATHLEN-1);
if((tp = strchr(host, ':')) != 0) {
*tp++ = 0;
if((port = atoi(tp)) == 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi/libfcgi os_unix.c
stasSun Dec 7 08:01:09 2003 EDT
Modified files:
/php-src/sapi/cgi/libfcgi os_unix.c
Log:
fix potential buffer overrun
Index: php-src/sapi/cgi/libfcgi/os_unix.c
diff -u php-src/sapi/cgi/libfcgi/os_unix.c:1.3 php-src/sapi/cgi/libfcgi/os_unix.c:1.4
--- php-src/sapi/cgi/libfcgi/os_unix.c:1.3 Tue Nov 26 00:51:16 2002
+++ php-src/sapi/cgi/libfcgi/os_unix.c Sun Dec 7 07:59:54 2003
@@ -17,7 +17,7 @@
*/
#ifndef lint
-static const char rcsid[] = $Id: os_unix.c,v 1.3 2002/11/26 05:51:16 shane Exp $;
+static const char rcsid[] = $Id: os_unix.c,v 1.4 2003/12/07 12:59:54 stas Exp $;
#endif /* not lint */
#include fcgi_config.h
@@ -103,6 +103,11 @@
static int shutdownPending = FALSE;
static int shutdownNow = FALSE;
+#ifndef HAVE_STRLCPY
+#define strlcpy php_strlcpy
+#endif
+size_t strlcpy(char *dst, const char *src, size_t siz);
+
void OS_ShutdownPending()
{
shutdownPending = TRUE;
@@ -293,7 +298,7 @@
short port = 0;
charhost[MAXPATHLEN];
-strcpy(host, bindPath);
+strlcpy(host, bindPath, MAXPATHLEN-1);
if((tp = strchr(host, ':')) != 0) {
*tp++ = 0;
if((port = atoi(tp)) == 0) {
@@ -396,7 +401,7 @@
short port = 0;
inttcp = FALSE;
-strcpy(host, bindPath);
+strlcpy(host, bindPath, MAXPATHLEN-1);
if((tp = strchr(host, ':')) != 0) {
*tp++ = 0;
if((port = atoi(tp)) == 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/session session.c
derick Sun Dec 7 09:29:43 2003 EDT Modified files: /php-srcNEWS /php-src/ext/sessionsession.c Log: - Fixed bug #26548 (Malformed HTTP dates in headers). Index: php-src/NEWS diff -u php-src/NEWS:1.1522 php-src/NEWS:1.1523 --- php-src/NEWS:1.1522 Thu Dec 4 20:16:14 2003 +++ php-src/NEWSSun Dec 7 09:29:42 2003 @@ -38,6 +38,7 @@ (Moriyoshi) - Fixed bug #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals). (Moriyoshi) +- Fixed bug #26548 (Malformed HTTP dates in headers). (Derick) 30 Oct 2003, PHP 5 Beta 2 - Lots and lots of changes in the Zend Engine 2 since beta 1: Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.378 php-src/ext/session/session.c:1.379 --- php-src/ext/session/session.c:1.378 Tue Dec 2 18:14:31 2003 +++ php-src/ext/session/session.c Sun Dec 7 09:29:43 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: session.c,v 1.378 2003/12/02 23:14:31 wez Exp $ */ +/* $Id: session.c,v 1.379 2003/12/07 14:29:43 derick Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -817,7 +817,7 @@ php_gmtime_r(when, tm); - n = sprintf(buf, %s, %d %s %d %02d:%02d:%02d GMT, /* SAFE */ + n = sprintf(buf, %s, %02d %s %d %02d:%02d:%02d GMT, /* SAFE */ week_days[tm.tm_wday], tm.tm_mday, month_names[tm.tm_mon], tm.tm_year + 1900, tm.tm_hour, tm.tm_min, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
derick Sun Dec 7 09:47:36 2003 EDT
Modified files:
/php-src/main rfc1867.c
Log:
- Add comment, I put this ina week ago and it already confused me :)
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.148 php-src/main/rfc1867.c:1.149
--- php-src/main/rfc1867.c:1.148Sat Nov 29 10:24:35 2003
+++ php-src/main/rfc1867.c Sun Dec 7 09:47:35 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.148 2003/11/29 15:24:35 derick Exp $ */
+/* $Id: rfc1867.c,v 1.149 2003/12/07 14:47:35 derick Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -881,7 +881,7 @@
if (!filename param) {
char *value = multipart_buffer_read_body(mbuff
TSRMLS_CC);
- unsigned int new_val_len;
+ unsigned int new_val_len; /* Dummy variable */
if (!value) {
value = estrdup();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.m4
helly Sun Dec 7 10:23:23 2003 EDT Modified files: /php-src/ext/gd config.m4 Log: Revert, not needed here Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.142 php-src/ext/gd/config.m4:1.143 --- php-src/ext/gd/config.m4:1.142 Sat Dec 6 19:21:47 2003 +++ php-src/ext/gd/config.m4Sun Dec 7 10:23:22 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.142 2003/12/07 00:21:47 helly Exp $ +dnl $Id: config.m4,v 1.143 2003/12/07 15:23:22 helly Exp $ dnl dnl @@ -9,7 +9,6 @@ PHP_ARG_WITH(gd, for GD support, [ --with-gd[=DIR] Include GD support where DIR is GD install prefix. If DIR is not set, the bundled GD library will be used.]) -gd_shared=$ext_shared if test -z $PHP_JPEG_DIR; then PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, @@ -400,7 +399,7 @@ dnl Common for both builtin and external GD dnl if test $PHP_GD != no; then - PHP_NEW_EXTENSION(gd, gd.c gdttf.c $extra_sources, $gd_shared,, \\$(GDLIB_CFLAGS)) + PHP_NEW_EXTENSION(gd, gd.c gdttf.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) if test $GD_MODULE_TYPE = builtin; then GDLIB_CFLAGS=-I$ext_srcdir/libgd $GDLIB_CFLAGS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql config.m4
helly Sun Dec 7 10:26:10 2003 EDT Modified files: /php-src/ext/mysql config.m4 Log: Revert, not needed here Index: php-src/ext/mysql/config.m4 diff -u php-src/ext/mysql/config.m4:1.58 php-src/ext/mysql/config.m4:1.59 --- php-src/ext/mysql/config.m4:1.58Fri Jul 18 05:53:04 2003 +++ php-src/ext/mysql/config.m4 Sun Dec 7 10:26:09 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.58 2003/07/18 09:53:04 sas Exp $ +dnl $Id: config.m4,v 1.59 2003/12/07 15:26:09 helly Exp $ dnl AC_DEFUN(MYSQL_LIB_CHK, [ @@ -117,7 +117,7 @@ PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) PHP_ADD_INCLUDE($MYSQL_INC_DIR) - PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared) + PHP_NEW_EXTENSION(mysql, php_mysql.c, $mysql_shared) MYSQL_MODULE_TYPE=external MYSQL_LIBS=-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli config.m4
sniper Sun Dec 7 10:33:20 2003 EDT Modified files: /php-src/ext/mysqli config.m4 Log: Fix logic Index: php-src/ext/mysqli/config.m4 diff -u php-src/ext/mysqli/config.m4:1.10 php-src/ext/mysqli/config.m4:1.11 --- php-src/ext/mysqli/config.m4:1.10 Sat Nov 22 16:20:06 2003 +++ php-src/ext/mysqli/config.m4Sun Dec 7 10:33:19 2003 @@ -1,17 +1,15 @@ dnl -dnl $Id: config.m4,v 1.10 2003/11/22 21:20:06 georg Exp $ +dnl $Id: config.m4,v 1.11 2003/12/07 15:33:19 sniper Exp $ dnl config.m4 for extension mysqli PHP_ARG_WITH(mysqli, for MySQLi support, [ --with-mysqli[=FILE]Include MySQLi support. FILE is the optional pathname to mysql_config.]) -PHP_ARG_WITH(embedded_mysqli, for embedded MySQLi support, -[ --with-embedded-mysqli[=FILE] - Include embedded MySQLi support. FILE is the optional - pathname to mysql_config.]) +PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, +[ --enable-embedded-mysqli MYSQLi: Enable embedded support.], no, no) -if test $PHP_MYSQLI != no || test $PHP_EMBEDDED_MYSQLI != no; then +if test $PHP_MYSQLI != no; then if test $PHP_MYSQL = yes; then AC_MSG_ERROR([--with-mysql (using bundled libs) can not be used together with --with-mysqli.]) @@ -20,18 +18,14 @@ if test $PHP_MYSQLI = yes; then MYSQL_CONFIG=`$php_shtool path mysql_config` else - if test $PHP_MYSQLI != no; then - MYSQL_CONFIG=$PHP_MYSQLI -else - MYSQL_CONFIG=$PHP_EMBEDDED_MYSQLI -fi +MYSQL_CONFIG=$PHP_MYSQLI fi - if test $PHP_MYSQLI != no; then -MYSQL_LIB_CFG='--libs' - else + if test $PHP_EMBEDDED_MYSQLI = yes; then AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled]) MYSQL_LIB_CFG='--libmysqld-libs' + else +MYSQL_LIB_CFG='--libs' fi if test -x $MYSQL_CONFIG $MYSQL_CONFIG $MYSQL_LIB_CFG /dev/null 21; then @@ -56,6 +50,6 @@ $MYSQLI_LIBLINE ]) - PHP_SUBST(MYSQLI_SHARED_LIBADD) PHP_NEW_EXTENSION(mysqli, mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c mysqli_fe.c mysqli_profiler.c mysqli_profiler_com.c, $ext_shared) + PHP_SUBST(MYSQLI_SHARED_LIBADD) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring config.m4
sniper Sun Dec 7 10:41:51 2003 EDT Modified files: /php-src/ext/mbstring config.m4 Log: revert, not needed Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.43 php-src/ext/mbstring/config.m4:1.44 --- php-src/ext/mbstring/config.m4:1.43 Sat Dec 6 20:58:54 2003 +++ php-src/ext/mbstring/config.m4 Sun Dec 7 10:41:50 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.43 2003/12/07 01:58:54 helly Exp $ +dnl $Id: config.m4,v 1.44 2003/12/07 15:41:50 sniper Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -200,11 +200,10 @@ dnl PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support, -[ --enable-mbstring Enable multibyte string support]) -mbstring_shared=$ext_shared +[ --enable-mbstring Enable multibyte string support.]) PHP_ARG_ENABLE([mbregex], [whether to enable multibyte regex support], -[ --disable-mbregex MBSTRING: Disable multibyte regex support], yes, no) +[ --disable-mbregex MBSTRING: Disable multibyte regex support.], yes, no) PHP_ARG_WITH(libmbfl, [for external libmbfl], [ --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl install prefix. @@ -221,6 +220,5 @@ dnl libmbfl is required PHP_MBSTRING_SETUP_LIBMBFL - ext_shared=$mbstring_shared PHP_MBSTRING_EXTENSION fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dba config.m4
helly Sun Dec 7 10:59:13 2003 EDT Modified files: /php-src/ext/dbaconfig.m4 Log: revert here too Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.57 php-src/ext/dba/config.m4:1.58 --- php-src/ext/dba/config.m4:1.57 Sat Dec 6 19:21:46 2003 +++ php-src/ext/dba/config.m4 Sun Dec 7 10:59:13 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.57 2003/12/07 00:21:46 helly Exp $ +dnl $Id: config.m4,v 1.58 2003/12/07 15:59:13 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -64,7 +64,6 @@ PHP_ARG_ENABLE(dba,whether to enable DBA, [ --enable-dbaBuild DBA with builtin modules]) -dba_shared=$ext_shared AC_ARG_WITH(gdbm, [ --with-gdbm[=DIR] DBA: Include GDBM support],[ @@ -171,7 +170,7 @@ AC_MSG_ERROR(Version 4.1 requires patch level 25) ]) fi - if test $dba_shared = yes; then + if test $ext_shared = yes; then AC_MSG_CHECKING(if dba can be used as shared extension) AC_EGREP_CPP(yes,[ #include $THIS_INCLUDE @@ -430,7 +429,7 @@ if test $HAVE_DBA = 1; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_DBA, 1, [ ]) - PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $dba_shared) + PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $ext_shared) PHP_ADD_BUILD_DIR($ext_builddir/libinifile) PHP_ADD_BUILD_DIR($ext_builddir/libcdb) PHP_ADD_BUILD_DIR($ext_builddir/libflatfile) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ftp ftp.c ftp.h php_ftp.c
On Sun, 7 Dec 2003, Wez Furlong wrote: win32 build defines those symbols to 0 or 1 depending on if it is present or not. Guess if the *nix build does that? :I Generally, everything is either defined or not.. openssl streams is unrelated to this fix as ftp extension doesn't use streams API. Maybe it should? :) Or (in *nix build and maybe the win23 build too) use the macro in acinclude.m4..like e.g. ext/mcve/config.m4 does.. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filepro filepro.c
sniper Sun Dec 7 11:16:03 2003 EDT Modified files: /php-src/ext/fileprofilepro.c Log: The correct (tm) way. Index: php-src/ext/filepro/filepro.c diff -u php-src/ext/filepro/filepro.c:1.53 php-src/ext/filepro/filepro.c:1.54 --- php-src/ext/filepro/filepro.c:1.53 Sat Dec 6 19:59:16 2003 +++ php-src/ext/filepro/filepro.c Sun Dec 7 11:16:02 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: filepro.c,v 1.53 2003/12/07 00:59:16 edink Exp $ */ +/* $Id: filepro.c,v 1.54 2003/12/07 16:16:02 sniper Exp $ */ /* filePro 4.x support developed by Chad Robinson, [EMAIL PROTECTED] @@ -34,7 +34,7 @@ #include safe_mode.h #include fopen_wrappers.h #include string.h -#ifndef PHP_WIN32 +#if HAVE_SYS_PARAM_H #include sys/param.h #endif #include errno.h -- 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 /ext/session session.c
sniper Sun Dec 7 11:53:31 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/sessionsession.c Log: MFH: Fix for bug #26548: Malformed HTTP dates in headers Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.492 php-src/NEWS:1.1247.2.493 --- php-src/NEWS:1.1247.2.492 Thu Dec 4 03:56:06 2003 +++ php-src/NEWSSun Dec 7 11:53:29 2003 @@ -5,8 +5,7 @@ (Jani) - Fixed header handler in NSAPI SAPI module (header-replace was ignored, send_default_content_type now sends value from php.ini). (Uwe Schindler) -- Fixed bug #25916 (get_browser() - PHP Fatal error: Nesting level - too deep - recursive dependency?). (Uwe Schindler) +- Fixed bug #26548 (ext/session: Malformed HTTP dates headers). (Derick) - Fixed bug #26488 (Missing declaration of CRTSCTS in ext/dio/dio.c). (Jani) - Fixed bug #26467 (flock() does not force the wouldblock parameter to be passed by reference). (Wez) @@ -56,6 +55,8 @@ under *BSD platforms). (Moriyoshi) - Fixed bug #26003 (Make fgetcsv() binary safe). (Ilia, Moriyoshi) - Fixed bug #25939 (feof() not working correctly for sockets). (Wez) +- Fixed bug #25916 (get_browser() - PHP Fatal error: Nesting level + too deep - recursive dependency?). (Uwe Schindler) - Fixed bug #25794 (Cannot open existing hash db3 file with write ext/dba). (Marcus) - Fixed Bug #25694 (round() and number_format() give inconsistent results). Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.336.2.29 php-src/ext/session/session.c:1.336.2.30 --- php-src/ext/session/session.c:1.336.2.29Wed Oct 8 06:25:39 2003 +++ php-src/ext/session/session.c Sun Dec 7 11:53:30 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: session.c,v 1.336.2.29 2003/10/08 10:25:39 sniper Exp $ */ +/* $Id: session.c,v 1.336.2.30 2003/12/07 16:53:30 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -718,6 +718,7 @@ php_gmtime_r(when, tm); n = sprintf(buf, %s, %d %s %d %02d:%02d:%02d GMT, /* SAFE */ + n = sprintf(buf, %s, %02d %s %d %02d:%02d:%02d GMT, /* SAFE */ week_days[tm.tm_wday], tm.tm_mday, month_names[tm.tm_mon], tm.tm_year + 1900, tm.tm_hour, tm.tm_min, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Sun Dec 7 11:54:09 2003 EDT Modified files: /php-srcNEWS Log: bfn reorder Index: php-src/NEWS diff -u php-src/NEWS:1.1523 php-src/NEWS:1.1524 --- php-src/NEWS:1.1523 Sun Dec 7 09:29:42 2003 +++ php-src/NEWSSun Dec 7 11:54:09 2003 @@ -28,17 +28,16 @@ - Fixed __autoload() to preserve case of the passed class name. (Andi) - Fixed bug #26528 (HTML entities are not being decoded by xml_parse()/xml_parse_into_struct()). (Ilia) -- Fixed bug #26072 (--disable-libxml does not work). (Jani) +- Fixed bug #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals). + (Moriyoshi) - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia) +- Fixed bug #26072 (--disable-libxml does not work). (Jani) - Fixed bug #26001 (serialize crashes when accessing an overloaded object that has no properties (NULL hashtable)). (Wez) - Fixed bug #25664 (COM crashes when calling a Delphi implementations of ITypeInfo). (Wez) - Fixed bug #24394 (Serializing cross-referenced objects causes segfault). (Moriyoshi) -- Fixed bug #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals). - (Moriyoshi) -- Fixed bug #26548 (Malformed HTTP dates in headers). (Derick) 30 Oct 2003, PHP 5 Beta 2 - Lots and lots of changes in the Zend Engine 2 since beta 1: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dba/libinifile inifile.c
sniper Sun Dec 7 11:56:52 2003 EDT
Modified files:
/php-src/ext/dba/libinifile inifile.c
Log:
Remove unnecessary #include
Index: php-src/ext/dba/libinifile/inifile.c
diff -u php-src/ext/dba/libinifile/inifile.c:1.8
php-src/ext/dba/libinifile/inifile.c:1.9
--- php-src/ext/dba/libinifile/inifile.c:1.8Wed Jul 16 16:53:17 2003
+++ php-src/ext/dba/libinifile/inifile.cSun Dec 7 11:56:51 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: inifile.c,v 1.8 2003/07/16 20:53:17 helly Exp $ */
+/* $Id: inifile.c,v 1.9 2003/12/07 16:56:51 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -25,7 +25,6 @@
#include php.h
#include php_globals.h
#include safe_mode.h
-#include php_network.h
#include stdlib.h
#include string.h
@@ -44,7 +43,7 @@
/* {{{ inifile_version */
char *inifile_version()
{
- return 1.0, $Revision: 1.8 $;
+ return 1.0, $Revision: 1.9 $;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Sun Dec 7 11:59:32 2003 EDT Modified files: /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1524 php-src/NEWS:1.1525 --- php-src/NEWS:1.1524 Sun Dec 7 11:54:09 2003 +++ php-src/NEWSSun Dec 7 11:59:32 2003 @@ -26,6 +26,7 @@ - Fixed include_once() / require_once() on Windows to honor case-insensitivity of files. (Andi) - Fixed __autoload() to preserve case of the passed class name. (Andi) +- Fixed bug #26534 (stream_get_meta_data() - Access Violation). (Wez) - Fixed bug #26528 (HTML entities are not being decoded by xml_parse()/xml_parse_into_struct()). (Ilia) - Fixed bug #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals). -- 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
sniper Sun Dec 7 12:02:27 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.493 php-src/NEWS:1.1247.2.494 --- php-src/NEWS:1.1247.2.493 Sun Dec 7 11:53:29 2003 +++ php-src/NEWSSun Dec 7 12:02:26 2003 @@ -6,6 +6,8 @@ - Fixed header handler in NSAPI SAPI module (header-replace was ignored, send_default_content_type now sends value from php.ini). (Uwe Schindler) - Fixed bug #26548 (ext/session: Malformed HTTP dates headers). (Derick) +- Fixed bug #26531 (ext/domxml: get_elements_by_tag_name() wildcard fails). + (Rob Richards) - Fixed bug #26488 (Missing declaration of CRTSCTS in ext/dio/dio.c). (Jani) - Fixed bug #26467 (flock() does not force the wouldblock parameter to be passed by reference). (Wez) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns.c
sniper Sun Dec 7 13:19:31 2003 EDT
Modified files:
/php-src/ext/standard dns.c
Log:
ws
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.64 php-src/ext/standard/dns.c:1.65
--- php-src/ext/standard/dns.c:1.64 Fri Oct 24 13:09:36 2003
+++ php-src/ext/standard/dns.c Sun Dec 7 13:19:30 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.64 2003/10/24 17:09:36 markonen Exp $ */
+/* $Id: dns.c,v 1.65 2003/12/07 18:19:30 sniper Exp $ */
/* {{{ includes */
#include php.h
@@ -89,7 +89,7 @@
addr = php_gethostbyaddr(Z_STRVAL_PP(arg));
- if(addr == NULL) {
+ if (addr == NULL) {
#if HAVE_IPV6 HAVE_INET_PTON
php_error_docref(NULL TSRMLS_CC, E_WARNING, Address is not a valid
IPv4 or IPv6 address);
#else
@@ -321,7 +321,8 @@
} querybuf;
/* {{{ php_parserr */
-static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int
store, zval **subarray) {
+static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int
store, zval **subarray)
+{
u_short type, class, dlen;
u_long ttl;
long n, i;
@@ -572,7 +573,7 @@
for(type = (type_param==PHP_DNS_ANY ? (PHP_DNS_NUM_TYPES + 1) : 0); type
(addtl_recs ? (PHP_DNS_NUM_TYPES + 2) : PHP_DNS_NUM_TYPES) || first_query; type++)
{
first_query = 0;
- switch(type) {
+ switch (type) {
case 0:
type_to_fetch = type_paramPHP_DNS_A ? T_A : 0;
break;
@@ -711,7 +712,7 @@
u_char *cp, *end;
int i;
- switch(ZEND_NUM_ARGS()) {
+ switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters(ht, 2, host, mx_list) == FAILURE) {
WRONG_PARAM_COUNT;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c
iliaa Sun Dec 7 13:39:10 2003 EDT
Modified files:
/php-src/ext/pgsql pgsql.c
Log:
Removed unused variable.
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.298 php-src/ext/pgsql/pgsql.c:1.299
--- php-src/ext/pgsql/pgsql.c:1.298 Sat Dec 6 16:36:21 2003
+++ php-src/ext/pgsql/pgsql.c Sun Dec 7 13:39:09 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.298 2003/12/06 21:36:21 helly Exp $ */
+/* $Id: pgsql.c,v 1.299 2003/12/07 18:39:09 iliaa Exp $ */
#include stdlib.h
@@ -537,7 +537,6 @@
smart_str str = {0};
zval **args[5];
int i, connect_type = 0;
- char *msgbuf;
PGresult *pg_result;
if (ZEND_NUM_ARGS() 1 || ZEND_NUM_ARGS() 5
@@ -1021,7 +1020,6 @@
PGresult *pgsql_result;
ExecStatusType status;
pgsql_result_handle *pg_result;
- char *msgbuf;
switch(ZEND_NUM_ARGS()) {
case 1:
@@ -2545,7 +2543,6 @@
int id = -1;
PGconn *pgsql;
int result = 0;
- char *msgbuf;
switch(ZEND_NUM_ARGS()) {
case 0:
@@ -2586,7 +2583,6 @@
int id = -1;
PGconn *pgsql;
int result = 0;
- char *msgbuf;
switch(ZEND_NUM_ARGS()) {
case 1:
@@ -2640,7 +2636,6 @@
char *csv = (char *)NULL;
int ret;
int argc = ZEND_NUM_ARGS();
- char *msgbuf;
if (zend_parse_parameters(argc TSRMLS_CC, rs|ss,
pgsql_link, table_name,
table_name_len,
@@ -2751,7 +2746,6 @@
PGresult *pgsql_result;
ExecStatusType status;
int argc = ZEND_NUM_ARGS();
- char *msgbuf;
if (zend_parse_parameters(argc TSRMLS_CC, rs/a|ss,
pgsql_link, table_name,
table_name_len, pg_rows,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 14:39:49 2003 EDT Modified files: /CVSROOTavail Log: php-src/sapi/continuity karma for aleigh Index: CVSROOT/avail diff -u CVSROOT/avail:1.790 CVSROOT/avail:1.791 --- CVSROOT/avail:1.790 Sun Dec 7 06:09:28 2003 +++ CVSROOT/avail Sun Dec 7 14:39:48 2003 @@ -196,6 +196,7 @@ avail|hfuecks|pear/XML_HTMLSax,pear/XML_SaxFilters,pear/Calendar avail|ths|pear/HTML_QuickForm_Renderers avail|ecolinet|pecl/win32std +avail|aleigh|php-src/sapi/continuity # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Dec 7 16:40:15 2003 EDT Modified files: /CVSROOTavail Log: add phpdoc-pt Index: CVSROOT/avail diff -u CVSROOT/avail:1.791 CVSROOT/avail:1.792 --- CVSROOT/avail:1.791 Sun Dec 7 14:39:48 2003 +++ CVSROOT/avail Sun Dec 7 16:40:15 2003 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,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 +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,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-pt # People who work on the Engine @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations.
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard file.c
moriyoshi Sun Dec 7 16:55:17 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard file.c
Log:
Those casts are really necessary.
# Heads up; please be careful using is*() functions. The function of that kind
# takes an integer value as its argument and expects the value to be range of
# 0-255 as a parameter. So if you pass a plain char value to it, the char
# value will be converted implicitly to an integer value of the range
# -128 ~ 127, which will end up with an unwanted result, most likely with
# non-ASCII characters. This has been considered to be a big flaw in the
# specification of the ctype functions. However, the malfunction is not
# reproducible with the recent versions of the GNU C library because it is
# made to deal with such exceptional cases, while Microsoft's C library
# and several standard C libraries of BSD origin aren't.
#
# See also bug #10896, #12127, #18318, and #21689.
#
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.42 php-src/ext/standard/file.c:1.279.2.43
--- php-src/ext/standard/file.c:1.279.2.42 Sat Dec 6 17:07:00 2003
+++ php-src/ext/standard/file.c Sun Dec 7 16:55:16 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.279.2.42 2003/12/06 22:07:00 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.43 2003/12/07 21:55:16 moriyoshi Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2257,11 +2257,11 @@
re = e = buf + buf_len;
/* strip leading spaces */
- while (isspace(*s) *s != delimiter) {
+ while (isspace((int)*(unsigned char *)s) *s != delimiter) {
s++;
}
/* strip trailing spaces */
- while (isspace(*(--e)) *e != delimiter);
+ while (isspace((int)*(unsigned char *)(--e)) *e != delimiter);
e++;
array_init(return_value);
@@ -2305,7 +2305,7 @@
s = p = buf;
re = e = buf + buf_len;
/* strip trailing spaces */
- while (isspace(*(--e)) *e != delimiter);
+ while (isspace((int)*(unsigned char *)(--e)) *e !=
delimiter);
e++;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
andrey Sun Dec 7 17:24:23 2003 EDT Modified files: /php-srcNEWS Log: entries for get_declared_interfaces/get_declared_classes Index: php-src/NEWS diff -u php-src/NEWS:1.1525 php-src/NEWS:1.1526 --- php-src/NEWS:1.1525 Sun Dec 7 11:59:32 2003 +++ php-src/NEWSSun Dec 7 17:24:22 2003 @@ -22,9 +22,12 @@ . image_type_to_extension(). return extension based on image type. (Ilia) . stream_socket_sendto() and stream_socket_recvfrom(). (Wez) . iconv_mime_decode_headers(). (Moriyoshi) + . get_declared_interfaces(). (Andrey, Marcus) - Changed stat() and family to be routed via streams API. (Sara) - Fixed include_once() / require_once() on Windows to honor case-insensitivity of files. (Andi) +- Fixex get_declared_classes() to return only classes and not + interfaces. (Andrey, Marcus) - Fixed __autoload() to preserve case of the passed class name. (Andi) - Fixed bug #26534 (stream_get_meta_data() - Access Violation). (Wez) - Fixed bug #26528 (HTML entities are not being decoded by -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4) /sapi/continuity CREDITS capi.c config.m4
aleigh Sun Dec 7 17:26:01 2003 EDT Added files: (Branch: PHP_4) /php-src/sapi/continuityCREDITS capi.c config.m4 Log: SAPI module for Continuity - found at http://www.ashpool.com/ Index: php-src/sapi/continuity/capi.c +++ php-src/sapi/continuity/capi.c Index: php-src/sapi/continuity/config.m4 +++ php-src/sapi/continuity/config.m4 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4) /sapi/continuity CREDITS capi.c config.m4
On Sun, 7 Dec 2003, Alex Leigh wrote: aleighSun Dec 7 17:26:01 2003 EDT Added files: (Branch: PHP_4) /php-src/sapi/continuity CREDITS capi.c config.m4 Why are you adding this to the PHP_4 branch?? This is a totally dead one, and we're not adding new stuff to PHP 4 anyway... Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4) /sapi/continuity CREDITS capi.c config.m4
Derick, It was implied on http://www.php.net/anoncvs.php that PHP_4 was the branch for the PHP 4 releases, and I wanted to include it in case there is another 4, partly so it was available and partly to get the code in this state into CVS before I went through and qualified it (and made any changes) to support 5. I didn't want to have to maintain separate version state for the 4 version, which my users use, in another place; otherwise I have to explain to 4 users that they have to download some tar from me whereas 5 users already have support. I wasn't aware PHP 4 was feature-frozen, since releases seem to still come out for it. Where did I go wrong? Alex On Dec 7, 2003, at 4:38 PM, Derick Rethans wrote: On Sun, 7 Dec 2003, Alex Leigh wrote: aleigh Sun Dec 7 17:26:01 2003 EDT Added files: (Branch: PHP_4) /php-src/sapi/continuityCREDITS capi.c config.m4 Why are you adding this to the PHP_4 branch?? This is a totally dead one, and we're not adding new stuff to PHP 4 anyway... Derick -- The difference between theory and reality is that in theory there is no difference. Alex Leigh - www.tessier.com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard file.c
Correct me if I am wrong but as far as I know the issue you mention only affects tolower(), toupper() and is* functions that operate on letters. Functions such as isspace() are safe since their limited character set only covers a very limited range of characters that are not affected by the behavior you've described. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4) /sapi/continuity CREDITS capi.c config.m4
On December 7, 2003 05:45 pm, Alex Leigh wrote: Where did I go wrong? PHP 4.3.X tree is while still active is not open to any new features such as a new SAPI. All such changes should ONLY go into the development tree. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4) /sapi/continuity CREDITS capi.c config.m4
Ilia, And, I see now, 4_3_2 is that branch it looks like. I'm really disappointed that 4 is closed to my module because I think people are going to keep using 4 for some time after 5 releases, but, I'll get over it. 5 current isn't building, which I doubt is unusual. What's the usual practice, work off one of the tags (5_0_0b2?) and then commit into current? Also, is there any information on this (CVS practices on branches and release status) already? I looked around, read the CVS readme, and couldn't find anything that didn't seem out of date or wasn't about me contributing to the manual. I hate to waste people's time with already asked questions. Alex On Dec 7, 2003, at 5:16 PM, Ilia Alshanetsky wrote: On December 7, 2003 05:45 pm, Alex Leigh wrote: Where did I go wrong? PHP 4.3.X tree is while still active is not open to any new features such as a new SAPI. All such changes should ONLY go into the development tree. Ilia -- The difference between theory and reality is that in theory there is no difference. Alex Leigh - www.tessier.com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard file.c
On 2003/12/08, at 8:15, Ilia Alshanetsky wrote: Correct me if I am wrong but as far as I know the issue you mention only affects tolower(), toupper() and is* functions that operate on letters. Functions such as isspace() are safe since their limited character set only covers a very limited range of characters that are not affected by the behavior you've described. Nope. Regardless of the range the function covers, it may return an unwanted value because the function is likely backed by a simple vector and a negative argument may make it refer to a point out of the valid address space. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4) /sapi/continuity CREDITS capi.c config.m4
And, I see now, 4_3_2 is that branch it looks like. No, PHP_4_3 is the stable, feature-frozen branch. I'm really disappointed that 4 is closed to my module because I think people are going to keep using 4 for some time after 5 releases, but, I'll get over it. Nothing is stopping you from maintaining a patch against PHP_4_3. 5 current isn't building, which I doubt is unusual. What's the usual practice, work off one of the tags (5_0_0b2?) and then commit into current? Work against HEAD; the RM (Release Master) takes care of branching, and once branched for a release, only bug fixes are merged into that branch. Also, is there any information on this (CVS practices on branches and release status) already? I could have sworn that we used to have a release process readme in the tree, but don't see it now; if in doubt, ask on internals@ (actually, searching php-dev@ archives might have been a good first step too ;-). --Wez. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard file.c
On 2003/12/08, at 8:50, Ilia Alshanetsky wrote: While I cannot speak for behavior of the win32 libc library I've just tested a simple C program with positive negative ranges for the values of isspace(). In glibc 2.2.X, 2.3.X, libc4 (FreeBSD 4.7), libc5 (FreeBSD 5.1) the function works properly without long winded casts. The vector-based table varies by the locale setting. And it really matters on win32. Why do you still want to keep it wrong? Even though you get the correct values, it's wrong usage anyway. If you don't like ugly casts, just use unsigned char in the first place, as I already mentioned. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard filters.c
moriyoshi Sun Dec 7 19:22:23 2003 EDT
Modified files:
/php-src/ext/standard filters.c
Log:
Fix a convert filters bug that occurs when multiple buckets are coming in.
Index: php-src/ext/standard/filters.c
diff -u php-src/ext/standard/filters.c:1.36 php-src/ext/standard/filters.c:1.37
--- php-src/ext/standard/filters.c:1.36 Thu Aug 28 12:49:57 2003
+++ php-src/ext/standard/filters.c Sun Dec 7 19:22:22 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: filters.c,v 1.36 2003/08/28 16:49:57 sas Exp $ */
+/* $Id: filters.c,v 1.37 2003/12/08 00:22:22 moriyoshi Exp $ */
#include php.h
#include php_globals.h
@@ -1615,7 +1615,7 @@
}
/* update consumed by the number of bytes just used */
- consumed = bucket-buflen - icnt;
+ consumed += bucket-buflen - icnt;
/* give output bucket to next in chain */
if (out_buf_size - ocnt 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv iconv.c
moriyoshi Sun Dec 7 19:38:01 2003 EDT
Modified files:
/php-src/ext/iconv iconv.c
Log:
Fix iconv stream filter to properly handle multibyte characters that
span at the alignment of a hunk.
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.108 php-src/ext/iconv/iconv.c:1.109
--- php-src/ext/iconv/iconv.c:1.108 Sat Dec 6 06:10:13 2003
+++ php-src/ext/iconv/iconv.c Sun Dec 7 19:38:00 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: iconv.c,v 1.108 2003/12/06 11:10:13 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.109 2003/12/08 00:38:00 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2234,6 +2234,8 @@
size_t to_charset_len;
char *from_charset;
size_t from_charset_len;
+ char stub[128];
+ size_t stub_len;
} php_iconv_stream_filter;
/* {{{ php_iconv_stream_filter_dtor */
@@ -2271,39 +2273,43 @@
return PHP_ICONV_ERR_UNKNOWN;
}
self-persistent = persistent;
-
+ self-stub_len = 0;
return PHP_ICONV_ERR_SUCCESS;
}
/* }}} */
-/* {{{ php_iconv_stream_filter_do_filter */
-static php_stream_filter_status_t php_iconv_stream_filter_do_filter(
+/* {{{ php_iconv_stream_filter_append_bucket */
+static size_t php_iconv_stream_filter_append_bucket(
+ php_iconv_stream_filter *self,
php_stream *stream, php_stream_filter *filter,
- php_stream_bucket_brigade *buckets_in,
php_stream_bucket_brigade *buckets_out,
- size_t *bytes_consumed, int flags TSRMLS_DC)
+ const char *ps, size_t buf_len, size_t *consumed,
+ int persistent TSRMLS_DC)
{
- php_stream_bucket *bucket = NULL, *new_bucket;
- size_t consumed = 0;
- php_iconv_stream_filter *self = (php_iconv_stream_filter *)filter-abstract;
+ php_stream_bucket *new_bucket;
char *out_buf = NULL;
size_t out_buf_size;
- char *pd;
- size_t ocnt, prev_ocnt;
-
- if (flags != PSFS_FLAG_NORMAL) {
- /* flush operation */
+ char *pd, *pt;
+ size_t ocnt, prev_ocnt, icnt, tcnt;
+ size_t initial_out_buf_size;
+
+ if (ps == NULL) {
+ initial_out_buf_size = 64;
+ icnt = 1;
+ } else {
+ initial_out_buf_size = buf_len;
+ icnt = buf_len;
+ }
- out_buf_size = 64;
- out_buf = pemalloc(out_buf_size, self-persistent);
- ocnt = prev_ocnt = out_buf_size;
- pd = out_buf;
+ out_buf_size = ocnt = prev_ocnt = initial_out_buf_size;
+ out_buf = pd = pemalloc(out_buf_size, self-persistent);
- /* trying hard to reduce the number of buckets to hand to the
-* next filter */
+ if (self-stub_len 0) {
+ pt = self-stub;
+ tcnt = self-stub_len;
- for (;;) {
- if (iconv(self-cd, NULL, NULL, pd, ocnt) == (size_t)-1) {
+ while (tcnt 0) {
+ if (iconv(self-cd, pt, tcnt, pd, ocnt) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EILSEQ:
@@ -2311,12 +2317,46 @@
goto out_failure;
case EINVAL:
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, iconv stream filter (\%s\=\%s\): unexpected octet values,
self-from_charset, self-to_charset);
- goto out_failure;
-
- case E2BIG:
+ if (ps != NULL) {
+ if (icnt 0) {
+ if (self-stub_len =
sizeof(self-stub)) {
+
php_error_docref(NULL TSRMLS_CC, E_WARNING, iconv stream filter (\%s\=\%s\):
insufficient buffer, self-from_charset, self-to_charset);
+ goto
out_failure;
+ }
+
self-stub[self-stub_len++] = *(ps++);
+ icnt--;
+ pt = self-stub;
+ tcnt = self-stub_len;
+ } else {
+ tcnt = 0;
+ break;
+
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard file.c
On 2003/12/08, at 8:50, Ilia Alshanetsky wrote: While I cannot speak for behavior of the win32 libc library I've just tested a simple C program with positive negative ranges for the values of isspace(). In glibc 2.2.X, 2.3.X, libc4 (FreeBSD 4.7), libc5 (FreeBSD 5.1) the function works properly without long winded casts. See also those patches on the libc in the FreeBSD tree: [1.2 - 1.3] * Move more stuff out to XPG4 * Handle negative chars inside runetype/tolower/toupper http://www.freebsd.org/cgi/cvsweb.cgi/src/lib/libc/locale/ runetype.c.diff?r1=1.2r2=1.3f=h [1.3 - 1.4] * Remove half-dancing solution for signed chars to help finding POSIXly-incorrect programs. http://www.freebsd.org/cgi/cvsweb.cgi/src/lib/libc/locale/ runetype.c.diff?r1=1.3r2=1.4f=h And I already noted that the GNU libc kindly takes care of non-standard-compliant codes. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
