date:20050103

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2005-01-03 Thread changelog

changelog   Mon Jan  3 20:36:36 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1852r2=1.1853ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1852 php-src/ChangeLog:1.1853
--- php-src/ChangeLog:1.1852Sun Jan  2 20:37:05 2005
+++ php-src/ChangeLog   Mon Jan  3 20:36:35 2005
@@ -1,3 +1,39 @@
+2005-01-03  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* ext/sqlite/libsqlite/src/auth.c
+  ext/sqlite/libsqlite/src/auth.c:
+  merge patch from http://www.sqlite.org/cvstrac/chngview?cn=1953
+  bug led to PHP exiting on queries with unknown columns
+
+* (PHP_5_0)
+  ZendEngine2/zend_language_scanner.l:
+  MFH:
+  Fix the following nasty bug:
+  - if compile bails out from the middle of compiling, current_buffer is 
not
+  restored
+  - if current_buffer is not null, yy_switch_to_buffer will do: *yy_c_buf_p
+  = yy_hold_char; on
+  the next request
+  - which would lead to memory corruption on next request
+
+* ZendEngine2/zend_language_scanner.l:
+  Fix the following nasty bug:
+  - if compile bails out from the middle of compiling, current_buffer is 
not
+  restored
+  - if current_buffer is not null, yy_switch_to_buffer will do: *yy_c_buf_p
+  = yy_hold_char; on
+  the next request
+  - which would lead to memory corruption on next request
+
+* (PHP_4_3)
+  Zend/zend_language_scanner.l:
+  Fix the following nasty bug:
+  - if compile bails out from the middle of compiling, current_buffer is 
not
+  restored
+  - if current_buffer is not null, yy_switch_to_buffer will do: *yy_c_buf_p
+  = yy_hold_char; on the next request
+  - which would lead to memory corruption on next request
+
 2005-01-02  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_4_3)
@@ -15178,7 +15214,7 @@
 2004-03-18  Pierre-Alain Joye  [EMAIL PROTECTED]
 
 * ext/gd/tests/bug27582_2.phpt:
-  - Fix the test description and $Id: ChangeLog,v 1.1852 2005/01/03 
01:37:05 changelog Exp $
+  - Fix the test description and $Id: ChangeLog,v 1.1853 2005/01/04 
01:36:35 changelog Exp $
 
 2004-03-18  Derick Rethans  [EMAIL PROTECTED]

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2005-01-03 Thread changelog

changelog   Mon Jan  3 20:36:41 2005 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.611r2=1.612ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.611 ZendEngine2/ChangeLog:1.612
--- ZendEngine2/ChangeLog:1.611 Sun Jan  2 20:37:14 2005
+++ ZendEngine2/ChangeLog   Mon Jan  3 20:36:40 2005
@@ -1,3 +1,25 @@
+2005-01-03  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  zend_language_scanner.l:
+  MFH:
+  Fix the following nasty bug:
+  - if compile bails out from the middle of compiling, current_buffer is 
not
+  restored
+  - if current_buffer is not null, yy_switch_to_buffer will do: *yy_c_buf_p
+  = yy_hold_char; on
+  the next request
+  - which would lead to memory corruption on next request
+
+* zend_language_scanner.l:
+  Fix the following nasty bug:
+  - if compile bails out from the middle of compiling, current_buffer is 
not
+  restored
+  - if current_buffer is not null, yy_switch_to_buffer will do: *yy_c_buf_p
+  = yy_hold_char; on
+  the next request
+  - which would lead to memory corruption on next request
+
 2005-01-02  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_5_0)
@@ -6637,7 +6659,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.611 2005/01/03 01:37:14 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.612 2005/01/04 01:36:40 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -8361,7 +8383,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.611 2005/01/03 01:37:14 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.612 2005/01/04 01:36:40 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: CVSROOT / avail

2005-01-03 Thread Stig Bakken

ssb Mon Jan  3 13:49:55 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  * luckec karma for pear/{HTTP_SessionServer,Services_Ebay,Date_Holidays}
and phpdoc
  
  http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.926r2=1.927ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.926 CVSROOT/avail:1.927
--- CVSROOT/avail:1.926 Tue Dec 21 12:33:06 2004
+++ CVSROOT/avail   Mon Jan  3 13:49:53 2005
@@ -29,7 +29,7 @@
 # The PHP Documentation Group maintains the documentation and its
 # translations.
 
-avail|dbs,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,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,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|phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,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-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/openssl xp_ssl.c

2005-01-03 Thread Ilia Alshanetsky

iliaa   Mon Jan  3 22:45:41 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/opensslxp_ssl.c 
  Log:
  Fixed compiler warning resulting from an unused variable.
  
  
http://cvs.php.net/diff.php/php-src/ext/openssl/xp_ssl.c?r1=1.16.2.2r2=1.16.2.3ty=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.16.2.2 
php-src/ext/openssl/xp_ssl.c:1.16.2.3
--- php-src/ext/openssl/xp_ssl.c:1.16.2.2   Tue Sep 28 05:13:36 2004
+++ php-src/ext/openssl/xp_ssl.cMon Jan  3 22:45:40 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_ssl.c,v 1.16.2.2 2004/09/28 09:13:36 wez Exp $ */
+/* $Id: xp_ssl.c,v 1.16.2.3 2005/01/04 03:45:40 iliaa Exp $ */
 
 #include php.h
 #include ext/standard/file.h
@@ -497,7 +497,6 @@
switch (option) {
case PHP_STREAM_OPTION_CHECK_LIVENESS:
{
-   fd_set rfds;
struct timeval tv;
char buf;
int alive = 1;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/gd config.m4 gd.c

2005-01-03 Thread Jani Taskinen

sniper  Tue Jan  4 01:51:58 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/gd config.m4 gd.c 
  Log:
  - Fixed bug #31396 (compile fails with gd 2.0.33 without freetype)
  
http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.144.2.4r2=1.144.2.5ty=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.144.2.4 php-src/ext/gd/config.m4:1.144.2.5
--- php-src/ext/gd/config.m4:1.144.2.4  Thu Dec 30 02:04:10 2004
+++ php-src/ext/gd/config.m4Tue Jan  4 01:51:58 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.144.2.4 2004/12/30 07:04:10 sniper Exp $
+dnl $Id: config.m4,v 1.144.2.5 2005/01/04 06:51:58 sniper Exp $
 dnl
 
 dnl
@@ -258,8 +258,9 @@
   PHP_CHECK_LIBRARY(gd, gdImageColorResolve,
[AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageGifCtx,  [AC_DEFINE(HAVE_GD_GIF_CTX,
  1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdCacheCreate,  
[AC_DEFINE(HAVE_GD_CACHE_CREATE, 1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
-  PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,
[AC_DEFINE(HAVE_GD_THREAD_SAFE,  1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
-  PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,  
[AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,
[AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdFreeFontCache,
[AC_DEFINE(HAVE_GD_FREEFONTCACHE,1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,  
[AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
 ])
 
 dnl
@@ -309,6 +310,7 @@
   AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])
   AC_DEFINE(HAVE_GD_GIF_CREATE,   1, [ ])
   AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])
+  AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])
   AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])
 
 dnl Make sure the libgd/ is first in the include path
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.294.2.6r2=1.294.2.7ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.294.2.6 php-src/ext/gd/gd.c:1.294.2.7
--- php-src/ext/gd/gd.c:1.294.2.6   Wed Dec 29 16:40:42 2004
+++ php-src/ext/gd/gd.c Tue Jan  4 01:51:58 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.294.2.6 2004/12/29 21:40:42 iliaa Exp $ */
+/* $Id: gd.c,v 1.294.2.7 2005/01/04 06:51:58 sniper Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -337,7 +337,7 @@
PHP_MINIT(gd),
PHP_MSHUTDOWN(gd),
NULL,
-#if HAVE_LIBGD20  HAVE_GD_STRINGFT
+#if HAVE_LIBGD20  HAVE_GD_STRINGFT  (HAVE_GD_FONTCACHESHUTDOWN || 
HAVE_GD_FREEFONTCACHE)
PHP_RSHUTDOWN(gd),
 #else
NULL,
@@ -456,10 +456,10 @@
 
 /* {{{ PHP_RSHUTDOWN_FUNCTION
  */
-#if HAVE_LIBGD20  HAVE_GD_STRINGFT
+#if HAVE_LIBGD20  HAVE_GD_STRINGFT  (HAVE_GD_FONTCACHESHUTDOWN || 
HAVE_GD_FREEFONTCACHE)
 PHP_RSHUTDOWN_FUNCTION(gd)
 {
-#if defined(HAVE_GD_THREAD_SAFE) || defined(HAVE_GD_BUNDLED)
+#if HAVE_GD_FONTCACHESHUTDOWN
gdFontCacheShutdown();
 #else
gdFreeFontCache();

-- 
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) /ext/gd config.m4 gd.c

2005-01-03 Thread Jani Taskinen

sniper  Tue Jan  4 01:52:18 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd config.m4 gd.c 
  Log:
  MFH: - Fixed bug #31396 (compile fails with gd 2.0.33 without freetype)
  
http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.120.2.23r2=1.120.2.24ty=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.120.2.23 php-src/ext/gd/config.m4:1.120.2.24
--- php-src/ext/gd/config.m4:1.120.2.23 Thu Dec 30 02:02:17 2004
+++ php-src/ext/gd/config.m4Tue Jan  4 01:52:18 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.120.2.23 2004/12/30 07:02:17 sniper Exp $
+dnl $Id: config.m4,v 1.120.2.24 2005/01/04 06:52:18 sniper Exp $
 dnl
 
 dnl
@@ -257,8 +257,9 @@
   PHP_CHECK_LIBRARY(gd, gdImageColorResolve,
[AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageGifCtx,  [AC_DEFINE(HAVE_GD_GIF_CTX,
  1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdCacheCreate,  
[AC_DEFINE(HAVE_GD_CACHE_CREATE, 1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
-  PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,
[AC_DEFINE(HAVE_GD_THREAD_SAFE,  1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
-  PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,  
[AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,
[AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdFreeFontCache,
[AC_DEFINE(HAVE_GD_FREEFONTCACHE,1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,  
[AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])], [], [ -L$GD_LIB 
$GD_SHARED_LIBADD ])
 ])
 
 dnl
@@ -308,6 +309,7 @@
   AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])
   AC_DEFINE(HAVE_GD_GIF_CREATE,   1, [ ])
   AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])
+  AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])
   AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])
 
 dnl Make sure the libgd/ is first in the include path
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.221.2.48r2=1.221.2.49ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.221.2.48 php-src/ext/gd/gd.c:1.221.2.49
--- php-src/ext/gd/gd.c:1.221.2.48  Wed Dec 29 16:41:07 2004
+++ php-src/ext/gd/gd.c Tue Jan  4 01:52:18 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.221.2.48 2004/12/29 21:41:07 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.49 2005/01/04 06:52:18 sniper Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -289,7 +289,7 @@
PHP_MINIT(gd),
PHP_MSHUTDOWN(gd),
NULL,
-#if HAVE_LIBGD20  HAVE_GD_STRINGFT
+#if HAVE_LIBGD20  HAVE_GD_STRINGFT  (HAVE_GD_FONTCACHESHUTDOWN || 
HAVE_GD_FREEFONTCACHE)
PHP_RSHUTDOWN(gd),
 #else
NULL,
@@ -393,10 +393,10 @@
 
 /* {{{ PHP_RSHUTDOWN_FUNCTION
  */
-#if HAVE_LIBGD20  HAVE_GD_STRINGFT
+#if HAVE_LIBGD20  HAVE_GD_STRINGFT  (HAVE_GD_FONTCACHESHUTDOWN || 
HAVE_GD_FREEFONTCACHE)
 PHP_RSHUTDOWN_FUNCTION(gd)
 {
-#if defined(HAVE_GD_THREAD_SAFE) || defined(HAVE_GD_BUNDLED)
+#if HAVE_GD_FONTCACHESHUTDOWN
gdFontCacheShutdown();
 #else 
gdFreeFontCache();

-- 
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

2005-01-03 Thread Jani Taskinen

sniper  Tue Jan  4 01:53:43 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.792r2=1.1247.2.793ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.792 php-src/NEWS:1.1247.2.793
--- php-src/NEWS:1.1247.2.792   Sun Jan  2 18:55:19 2005
+++ php-src/NEWSTue Jan  4 01:53:42 2005
@@ -2,6 +2,7 @@
 |||
 ?? ??? , Version 4.3.11
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
+- Fixed bug #31396 (compile fails with gd 2.0.33 without freetype). (Jani)
 - Fixed bug #31371 (highlight_file() trims new line after heredoc). (Ilia)
 - Fixed bug #31270 (missing safe_mode/open_basedir check in swf_openfile()). 
(Ilia)
 - Fixed bug #31174 (compile warning in url.c). (Ilia, lukem at NetBSD dot org)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/openssl xp_ssl.c

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/gd config.m4 gd.c

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd config.m4 gd.c

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

7 matches

Site Navigation

Mail list logo

Footer information