[PHP-CVS] cvs: php4(PHP_4_3) /ext/dba/tests dba_handler.inc
iliaa Thu Dec 26 23:47:45 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dba/tests dba_handler.inc
Log:
MFH
Index: php4/ext/dba/tests/dba_handler.inc
diff -u php4/ext/dba/tests/dba_handler.inc:1.7.2.2
php4/ext/dba/tests/dba_handler.inc:1.7.2.3
--- php4/ext/dba/tests/dba_handler.inc:1.7.2.2 Fri Dec 20 15:25:19 2002
+++ php4/ext/dba/tests/dba_handler.inc Thu Dec 26 23:47:45 2002
@@ -67,7 +67,7 @@
} else {
echo "Error reading database\n";
}
- if ($dba_reader) {
+ if (!empty($dba_reader)) {
dba_close($dba_reader);
}
if (($db_file = dba_popen($db_filename, 'r'.($handler!='gdbm'?'-':''),
$handler))!==FALSE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba/tests dba_handler.inc
iliaa Thu Dec 26 23:46:40 2002 EDT
Modified files:
/php4/ext/dba/tests dba_handler.inc
Log:
Made DBA tests not dependant on error reporting settings.
Index: php4/ext/dba/tests/dba_handler.inc
diff -u php4/ext/dba/tests/dba_handler.inc:1.9 php4/ext/dba/tests/dba_handler.inc:1.10
--- php4/ext/dba/tests/dba_handler.inc:1.9 Fri Dec 20 12:47:58 2002
+++ php4/ext/dba/tests/dba_handler.inc Thu Dec 26 23:46:40 2002
@@ -67,7 +67,7 @@
} else {
echo "Error reading database\n";
}
- if ($dba_reader) {
+ if (!empty($dba_reader)) {
dba_close($dba_reader);
}
if (($db_file = dba_popen($db_filename, 'r'.($handler!='gdbm'?'-':''),
$handler))!==FALSE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Thu Dec 26 23:25:12 2002 EDT Modified files: /CVSROOTavail Log: 2 doc accounts Index: CVSROOT/avail diff -u CVSROOT/avail:1.564 CVSROOT/avail:1.565 --- CVSROOT/avail:1.564 Sat Dec 21 19:38:58 2002 +++ CVSROOT/avail Thu Dec 26 23:25:12 2002 @@ -27,7 +27,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,chad,torben,lynch,kk,ted,kwazy,aka,affinity,paul,skaag,pglat,mbritton,coar,lwest,joey,bibi,mrobinso,lwh,perugini,hamoralesr,tzwenny,hirokawa,drews,paulsen,hartmann,philross,leon,valdirh,dmarion,dubois,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,cris,goba,samesch,jon,soneca,kaufm,ronabop,glace,latoserver,phpguru_dk,lojmann,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,voize,phaethon,mgx,mj,corean,pandach,brown,cycle98,vizvil,openlife,regina,cynic,jpm,dams,alponce,menuconfig,obst,topgoods,karoora,pcraft,suvia,zak,zimt,mgx,sintoris,jmoore,ftfuture,uttam,ag315,ropik,jbi1979,bbonev,malo,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,andreroq,eduardh,cnewbill,fuzzy74,inki,bjoern,fams,smasiello,dim,lucasr,cpereira,lagflores,kjh90,ernani,theseer,cevm,noribsd,eskaly,mctrash,berto,leobopp,tcr,subjective,ufux,virtual,fireclaw,hadar_p,asautins,dbenson,aleczapka,flaviobrito,mattias,tom,amiller,cortesi,lancelot_,irc-html,mkaufman,rarruda,j-f,betz,philip,alindeman,thyla,cucinato,jpsantos,zyprexia,tpug,ozgurakan,mitja,conni,sts,stefanhinz,georg,nmav,subbie,leszek,spheroid,joona,kjartno,slawek,nooboo,alan_dangelo,ae,ahambazaza,nohn,kaser01,visualmind,abohamam,stefan,kurtz,luk,tronic,moh,bernd,wilko,yohgaki,fujimoto,gerzson,webler,spooky,tinenie,cece,daniel,offs,boo,nhoizey,nogada,albaity,joerg,mazen,neil536t,maco,imajes,hakan,chief977,dwestfal,ott,shlomi,holev,raful,yuval,tomer,masterjy,barak,ido,mork,lior,gal,adiju,cr_depend,cyberowl,daniel.paul,florian,iulianphp,kappu,michelinux,muricaru,narcotic,dt,valy,critix,spg1et,ck,costra,fancao0515,rbenea,tibee,ins0mnia,eriksson,wenz,jaxler,volker,avaly,bernardojts,bs,phaser,tal,sander,matroz,thales,dorun,ave,adu,adamf1,figuric,katow,l30n4rd0,samih,mmeier,wentzel,scaro,amtd,aspinei,costello,coti,lmaxcar,lucaiacono,manuzhai,mcastro,sukamade,darvina,peter,maxim,adir,roland,romakhin,jmurin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,machado,progcom,verdana,yincheng,surfmax,arzt,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,daif,aber_sabeel,alzahrani,ayman_h,thomaslio,sfox,jippie,floripa,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,spic,truelight,gnuhacker,_batman_,sachat,dallas,dart,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,feyge,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,phpclub,xelis,adrianr,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn|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-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|frogger,coldocean,alan_k,fleaslob,chad,torben,lynch,kk,ted,kwazy,aka,affinity,paul,skaag,pglat,mbritton,coar,lwest,joey,bibi,mrobinso,lwh,perugini,hamoralesr,tzwenny,hirokawa,drews,paulsen,hartmann,philross,leon,valdirh,dmarion,dubois,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,cris,goba,samesch,jon,soneca,kaufm,ronabop,glace,latoserver,phpguru_dk,lojmann,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,voize,phaethon,mgx,mj,corean,pandach,brown,cycle98,vizvil,openlife,regina,cynic,jpm,dams,alponce,menuconfig,obst,topgoods,karoora,pcraft,suvia,zak,zimt,mgx,sintoris,jmoore,ftfuture,uttam,ag315,ropik,jbi1979,bbonev,malo,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,andreroq,eduardh,cnewbill,fuzzy74,inki,bjoern,fams,smasiello,dim,lucasr,cpereira,lagflores,kjh90,ernani,theseer,cevm,noribsd,eskaly,mctrash,berto,leobopp,tcr,subjective,ufux,virtual,fireclaw,hadar_p,asautins,dbenson,aleczapka,flaviobrito,mattias,tom,amiller,cortesi,lancelot_,irc-html,mkaufman,rarruda,j-f,betz,philip,alindeman,thyla,cucinato,jpsantos,zyprexia,tpug,ozgurakan,mitja,conni,sts,stefanhinz,georg,nmav,subbie,leszek,spheroid,joona,kjartno,slawek,nooboo,alan_dangelo,ae,ahambazaza,nohn,kaser01,visualmind,abohamam,stefan,kurtz,luk,tronic,moh,bernd,wilko,yohgaki,fujimoto,gerzson,webler,spoo
[PHP-CVS] cvs: php4(PHP_4_3) / configure.in /main php_version.h
andrei Thu Dec 26 23:07:19 2002 EDT Modified files: (Branch: PHP_4_3) /php4 configure.in /php4/main php_version.h Log: Go with 4.3.0. Index: php4/configure.in diff -u php4/configure.in:1.396.2.18 php4/configure.in:1.396.2.19 --- php4/configure.in:1.396.2.18Fri Dec 20 20:34:14 2002 +++ php4/configure.in Thu Dec 26 23:07:18 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.18 2002/12/21 01:34:14 andrei Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.19 2002/12/27 04:07:18 andrei Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -44,7 +44,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=0 -EXTRA_VERSION="-dev" +EXTRA_VERSION="" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context Index: php4/main/php_version.h diff -u php4/main/php_version.h:1.66.2.8 php4/main/php_version.h:1.66.2.9 --- php4/main/php_version.h:1.66.2.8Fri Dec 20 20:34:15 2002 +++ php4/main/php_version.h Thu Dec 26 23:07:19 2002 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "4.3.0-dev" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "4.3.0" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard string.c
sterlingThu Dec 26 22:22:42 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard string.c
Log:
mfh
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.333.2.3 php4/ext/standard/string.c:1.333.2.4
--- php4/ext/standard/string.c:1.333.2.3Thu Dec 12 08:45:33 2002
+++ php4/ext/standard/string.c Thu Dec 26 22:22:42 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.333.2.3 2002/12/12 13:45:33 iliaa Exp $ */
+/* $Id: string.c,v 1.333.2.4 2002/12/27 03:22:42 sterling Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1352,6 +1352,9 @@
if (Z_TYPE_PP(needle) == IS_STRING) {
if (!Z_STRLEN_PP(needle)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty
delimiter.");
+ efree(haystack_orig);
+ zval_ptr_dtor(haystack);
+ zval_ptr_dtor(needle);
RETURN_FALSE;
}
@@ -1372,6 +1375,8 @@
RETVAL_FALSE;
}
+ zval_ptr_dtor(haystack);
+ zval_ptr_dtor(needle);
efree(haystack_orig);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard flock_compat.c
andrei Thu Dec 26 22:22:13 2002 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard flock_compat.c Log: MFH Index: php4/ext/standard/flock_compat.c diff -u php4/ext/standard/flock_compat.c:1.21 php4/ext/standard/flock_compat.c:1.21.2.1 --- php4/ext/standard/flock_compat.c:1.21 Tue Nov 12 04:09:55 2002 +++ php4/ext/standard/flock_compat.cThu Dec 26 22:22:13 2002 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: flock_compat.c,v 1.21 2002/11/12 09:09:55 helly Exp $ */ +/* $Id: flock_compat.c,v 1.21.2.1 2002/12/27 03:22:13 andrei Exp $ */ #include #include @@ -25,6 +25,7 @@ #if HAVE_STRUCT_FLOCK #include #include +#include #endif #ifdef PHP_WIN32 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
edink Thu Dec 26 22:17:17 2002 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: MFB: Mention the fact that zlib extension is now built-in in win32 distro. Index: php4/NEWS diff -u php4/NEWS:1.1247.2.33 php4/NEWS:1.1247.2.34 --- php4/NEWS:1.1247.2.33 Thu Dec 26 19:21:17 2002 +++ php4/NEWS Thu Dec 26 22:17:17 2002 @@ -21,6 +21,8 @@ - Moved extensions to PECL (http://pear.php.net/): (James, Derick) . ext/vpopmail . ext/cybermut +- ZLIB extension is now built-in in the Windows distribution. + External extension (php_zlib.dll) has been removed. (Edin) - Fixed a bug in ISO-8601 week calculation - Fixed a crash when using invalid color index with imagecolortransparent() (Pierre-Alain Joye). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
edink Thu Dec 26 22:16:01 2002 EDT Modified files: /php4 NEWS Log: Mention the fact that zlib extension is now built-in in win32 distro. Index: php4/NEWS diff -u php4/NEWS:1.1289 php4/NEWS:1.1290 --- php4/NEWS:1.1289Thu Dec 26 21:55:37 2002 +++ php4/NEWS Thu Dec 26 22:16:01 2002 @@ -39,6 +39,8 @@ - Moved extensions to PECL (http://pear.php.net/): (James, Derick) . ext/vpopmail . ext/cybermut +- ZLIB extension is now built-in in the Windows distribution. + External extension (php_zlib.dll) has been removed. (Edin) - Fix a crash when using invalid color index with imagecolortransparent() (Pierre-Alain Joye). - Fixed bug #20987 (no handling for client certificates). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
edink Thu Dec 26 21:55:37 2002 EDT Modified files: /php4 NEWS Log: Resolved apperent cvs commit confict. Index: php4/NEWS diff -u php4/NEWS:1.1288 php4/NEWS:1.1289 --- php4/NEWS:1.1288Thu Dec 26 20:32:47 2002 +++ php4/NEWS Thu Dec 26 21:55:37 2002 @@ -1,14 +1,11 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 4.4.0 -<<< NEWS - Make uniqid() parameters optional and allow any prefix length. (Marcus) -=== - New range() functionality . Support for float modifier. . Detection of numeric values inside strings passed as high & low. . Proper handle the situations where high == low. ->>> 1.1286 - Let array_search() accept objects as a needle under ZendEngine2. (Moriyoshi) - Fixed bug #20442 (upgraded bundled expat to 1.95.5). (Ilia) - Added imagefilter() function which allows application of various filters. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
georg Thu Dec 26 19:21:18 2002 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: ISO-8601 bug, typo Index: php4/NEWS diff -u php4/NEWS:1.1247.2.32 php4/NEWS:1.1247.2.33 --- php4/NEWS:1.1247.2.32 Thu Dec 26 19:09:35 2002 +++ php4/NEWS Thu Dec 26 19:21:17 2002 @@ -21,7 +21,8 @@ - Moved extensions to PECL (http://pear.php.net/): (James, Derick) . ext/vpopmail . ext/cybermut -- Fix a crash when using invalid color index with imagecolortransparent() +- Fixed a bug in ISO-8601 week calculation +- Fixed a crash when using invalid color index with imagecolortransparent() (Pierre-Alain Joye). - Fixed bug #20987 (no handling for client certificates). (Ilia) - Fixed bug #21039 (crash when not supplying an IV to mcrypt_generic_init). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
iliaa Thu Dec 26 19:09:39 2002 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: MFH Index: php4/NEWS diff -u php4/NEWS:1.1247.2.31 php4/NEWS:1.1247.2.32 --- php4/NEWS:1.1247.2.31 Sat Dec 21 17:03:46 2002 +++ php4/NEWS Thu Dec 26 19:09:35 2002 @@ -21,6 +21,8 @@ - Moved extensions to PECL (http://pear.php.net/): (James, Derick) . ext/vpopmail . ext/cybermut +- Fix a crash when using invalid color index with imagecolortransparent() + (Pierre-Alain Joye). - Fixed bug #20987 (no handling for client certificates). (Ilia) - Fixed bug #21039 (crash when not supplying an IV to mcrypt_generic_init). (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
iliaa Thu Dec 26 19:09:13 2002 EDT Modified files: /php4 NEWS Log: Bug fixing news. Index: php4/NEWS diff -u php4/NEWS:1.1286 php4/NEWS:1.1287 --- php4/NEWS:1.1286Sat Dec 21 17:05:55 2002 +++ php4/NEWS Thu Dec 26 19:09:13 2002 @@ -38,6 +38,8 @@ - Moved extensions to PECL (http://pear.php.net/): (James, Derick) . ext/vpopmail . ext/cybermut +- Fix a crash when using invalid color index with imagecolortransparent() + (Pierre-Alain Joye). - Fixed bug #20987 (no handling for client certificates). (Ilia) - Fixed bug #21039 (crash when not supplying an IV to mcrypt_generic_init). (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/ftp CREDITS /ext/ncurses CREDITS /ext/standard credits.c credits_ext.h
derick Thu Dec 26 18:45:05 2002 EDT
Modified files:
/php4/ext/ftp CREDITS
/php4/ext/ncurses CREDITS
/php4/ext/standard credits.c credits_ext.h
Log:
- MFB
Index: php4/ext/ftp/CREDITS
diff -u php4/ext/ftp/CREDITS:1.2 php4/ext/ftp/CREDITS:1.3
--- php4/ext/ftp/CREDITS:1.2Fri Jul 26 09:03:08 2002
+++ php4/ext/ftp/CREDITSThu Dec 26 18:45:04 2002
@@ -1,3 +1,2 @@
FTP
-Andrew Skalski
-Stefan Esser
\ No newline at end of file
+Stefan Esser, Andrew Skalski
Index: php4/ext/ncurses/CREDITS
diff -u php4/ext/ncurses/CREDITS:1.2 php4/ext/ncurses/CREDITS:1.3
--- php4/ext/ncurses/CREDITS:1.2Thu Dec 26 18:38:18 2002
+++ php4/ext/ncurses/CREDITSThu Dec 26 18:45:05 2002
@@ -1,5 +1,2 @@
ncurses
-Hartmut Holzgraefe
-Georg Richter
-Wez Furlong
-Ilia Alshanetsky
+Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter
Index: php4/ext/standard/credits.c
diff -u php4/ext/standard/credits.c:1.22 php4/ext/standard/credits.c:1.23
--- php4/ext/standard/credits.c:1.22Wed Nov 13 21:05:53 2002
+++ php4/ext/standard/credits.c Thu Dec 26 18:45:05 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: credits.c,v 1.22 2002/11/14 02:05:53 imajes Exp $ */
+/* $Id: credits.c,v 1.23 2002/12/26 23:45:05 derick Exp $ */
#include "php.h"
#include "info.h"
@@ -95,8 +95,8 @@
if (flag & PHP_CREDITS_QA) {
php_info_print_table_start();
- php_info_print_table_header(1, "PHP Quality Assurance Team");
- php_info_print_table_row(1, "Andre Langhorst, Derick Rethans, Hellekin
O. Wolf, Jalal Pushman, James Moore, Jani Taskinen, Joey Smith, Olivier Cahagne, Phil
Driscoll, Sebastian Bergmann, Zak Greant");
+ php_info_print_table_header(1, "PHP 4.4 Quality Assurance Team");
+ php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens, Stefan
+Esser, Moriyoshi Koizumi, Sebastian Nohn, Derick Rethans, Melvyn Sopacua, Jani
+Taskinen");
php_info_print_table_end();
}
Index: php4/ext/standard/credits_ext.h
diff -u php4/ext/standard/credits_ext.h:1.14 php4/ext/standard/credits_ext.h:1.15
--- php4/ext/standard/credits_ext.h:1.14Tue Nov 19 10:11:27 2002
+++ php4/ext/standard/credits_ext.h Thu Dec 26 18:45:05 2002
@@ -31,7 +31,7 @@
CREDIT_LINE("FDF", "Uwe Steinmann");
CREDIT_LINE("FilePro", "Chad Robinson");
CREDIT_LINE("FriBidi", "Onn Ben-Zvi, Tal Peer");
-CREDIT_LINE("FTP", "Andrew Skalski");
+CREDIT_LINE("FTP", "Stefan Esser, Andrew Skalski");
CREDIT_LINE("GD imaging", "Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto");
CREDIT_LINE("GetText", "Alex Plotnick");
CREDIT_LINE("GNU GMP support", "Stanislav Malyshev");
@@ -56,7 +56,7 @@
CREDIT_LINE("MS SQL", "Frank M. Kromann");
CREDIT_LINE("Multibyte (Japanese) String Functions", "Tsukada Takuya, Rui Hirokawa");
CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
-CREDIT_LINE("ncurses", "Hartmut Holzgraefe");
+CREDIT_LINE("ncurses", "Ilia Alshanetsky, Hartmut Holzgraefe, Georg Richter");
CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson");
CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R.
Kalowsky");
CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/ncurses CREDITS
derick Thu Dec 26 18:41:59 2002 EDT Modified files: (Branch: PHP_4_3) /php4/ext/ncurses CREDITS Log: All on one line Index: php4/ext/ncurses/CREDITS diff -u php4/ext/ncurses/CREDITS:1.1.10.1 php4/ext/ncurses/CREDITS:1.1.10.2 --- php4/ext/ncurses/CREDITS:1.1.10.1 Thu Dec 26 18:36:57 2002 +++ php4/ext/ncurses/CREDITSThu Dec 26 18:41:59 2002 @@ -1,5 +1,2 @@ ncurses -Hartmut Holzgraefe -Georg Richter -Wez Furlong -Ilia Alshanetsky +Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/ftp CREDITS /ext/standard credits.c credits_ext.h
derick Thu Dec 26 18:39:51 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/ftp CREDITS
/php4/ext/standard credits.c credits_ext.h
Log:
- update credits
Index: php4/ext/ftp/CREDITS
diff -u php4/ext/ftp/CREDITS:1.2 php4/ext/ftp/CREDITS:1.2.4.1
--- php4/ext/ftp/CREDITS:1.2Fri Jul 26 09:03:08 2002
+++ php4/ext/ftp/CREDITSThu Dec 26 18:39:51 2002
@@ -1,3 +1,2 @@
FTP
-Andrew Skalski
-Stefan Esser
\ No newline at end of file
+Stefan Esser, Andrew Skalski
Index: php4/ext/standard/credits.c
diff -u php4/ext/standard/credits.c:1.21.2.1 php4/ext/standard/credits.c:1.21.2.2
--- php4/ext/standard/credits.c:1.21.2.1Wed Nov 13 21:07:37 2002
+++ php4/ext/standard/credits.c Thu Dec 26 18:39:51 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: credits.c,v 1.21.2.1 2002/11/14 02:07:37 imajes Exp $ */
+/* $Id: credits.c,v 1.21.2.2 2002/12/26 23:39:51 derick Exp $ */
#include "php.h"
#include "info.h"
@@ -95,8 +95,8 @@
if (flag & PHP_CREDITS_QA) {
php_info_print_table_start();
- php_info_print_table_header(1, "PHP Quality Assurance Team");
- php_info_print_table_row(1, "Andre Langhorst, Derick Rethans, Hellekin
O. Wolf, Jalal Pushman, James Moore, Jani Taskinen, Joey Smith, Olivier Cahagne, Phil
Driscoll, Sebastian Bergmann, Zak Greant");
+ php_info_print_table_header(1, "PHP 4.3 Quality Assurance Team");
+ php_info_print_table_row(1, "Ilia Alshanetsky, Stefan Esser, Moriyoshi
+Koizumi, Sebastian Nohn, Derick Rethans, Melvyn Sopacua, Jani Taskinen");
php_info_print_table_end();
}
Index: php4/ext/standard/credits_ext.h
diff -u php4/ext/standard/credits_ext.h:1.13.2.1
php4/ext/standard/credits_ext.h:1.13.2.2
--- php4/ext/standard/credits_ext.h:1.13.2.1Tue Nov 19 10:11:33 2002
+++ php4/ext/standard/credits_ext.h Thu Dec 26 18:39:51 2002
@@ -30,7 +30,7 @@
CREDIT_LINE("FDF", "Uwe Steinmann");
CREDIT_LINE("FilePro", "Chad Robinson");
CREDIT_LINE("FriBidi", "Onn Ben-Zvi, Tal Peer");
-CREDIT_LINE("FTP", "Andrew Skalski");
+CREDIT_LINE("FTP", "Stefan Esser, Andrew Skalski");
CREDIT_LINE("GD imaging", "Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto");
CREDIT_LINE("GetText", "Alex Plotnick");
CREDIT_LINE("GNU GMP support", "Stanislav Malyshev");
@@ -55,7 +55,7 @@
CREDIT_LINE("MS SQL", "Frank M. Kromann");
CREDIT_LINE("Multibyte (Japanese) String Functions", "Tsukada Takuya, Rui Hirokawa");
CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
-CREDIT_LINE("ncurses", "Hartmut Holzgraefe");
+CREDIT_LINE("ncurses", "Ilia Alshanetsky, Hartmut Holzgraefe, Georg Richter");
CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson");
CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R.
Kalowsky");
CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/ncurses CREDITS
georg Thu Dec 26 18:38:18 2002 EDT Modified files: /php4/ext/ncurses CREDITS Log: added Wez, Ilia & myself Index: php4/ext/ncurses/CREDITS diff -u php4/ext/ncurses/CREDITS:1.1 php4/ext/ncurses/CREDITS:1.2 --- php4/ext/ncurses/CREDITS:1.1Tue Jun 12 17:15:49 2001 +++ php4/ext/ncurses/CREDITSThu Dec 26 18:38:18 2002 @@ -1,2 +1,5 @@ ncurses Hartmut Holzgraefe +Georg Richter +Wez Furlong +Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/ncurses CREDITS
georg Thu Dec 26 18:36:57 2002 EDT Modified files: (Branch: PHP_4_3) /php4/ext/ncurses CREDITS Log: added Wez, Ilia and myself Index: php4/ext/ncurses/CREDITS diff -u php4/ext/ncurses/CREDITS:1.1 php4/ext/ncurses/CREDITS:1.1.10.1 --- php4/ext/ncurses/CREDITS:1.1Tue Jun 12 17:15:49 2001 +++ php4/ext/ncurses/CREDITSThu Dec 26 18:36:57 2002 @@ -1,2 +1,5 @@ ncurses Hartmut Holzgraefe +Georg Richter +Wez Furlong +Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard file.c
wez Thu Dec 26 17:36:21 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard file.c
Log:
MFH: get_meta_tags() stream leak
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.279.2.3 php4/ext/standard/file.c:1.279.2.4
--- php4/ext/standard/file.c:1.279.2.3 Thu Dec 5 15:05:19 2002
+++ php4/ext/standard/file.cThu Dec 26 17:36:21 2002
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.279.2.3 2002/12/05 20:05:19 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.4 2002/12/26 22:36:21 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -273,14 +273,9 @@
return;
}
- php_stream_open_wrapper(filename, "rb", 0, NULL);
-
-
md.stream = php_stream_open_wrapper(filename, "rb",
(use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE |
REPORT_ERRORS,
NULL);
-
-
if (!md.stream) {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard file.c
wez Thu Dec 26 17:35:01 2002 EDT
Modified files:
/php4/ext/standard file.c
Log:
Remove cruft that opened a stream that was never closed in get_meta_tags().
(probably my fault).
Noticed by Philip Olson
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.282 php4/ext/standard/file.c:1.283
--- php4/ext/standard/file.c:1.282 Thu Dec 5 15:01:18 2002
+++ php4/ext/standard/file.cThu Dec 26 17:35:00 2002
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.282 2002/12/05 20:01:18 iliaa Exp $ */
+/* $Id: file.c,v 1.283 2002/12/26 22:35:00 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -273,14 +273,9 @@
return;
}
- php_stream_open_wrapper(filename, "rb", 0, NULL);
-
-
md.stream = php_stream_open_wrapper(filename, "rb",
(use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE |
REPORT_ERRORS,
NULL);
-
-
if (!md.stream) {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard string.c
sterlingThu Dec 26 15:52:42 2002 EDT
Modified files:
/php4/ext/standard string.c
Log:
if needle is empty free allocated memory
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.337 php4/ext/standard/string.c:1.338
--- php4/ext/standard/string.c:1.337Thu Dec 26 14:56:44 2002
+++ php4/ext/standard/string.c Thu Dec 26 15:52:42 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.337 2002/12/26 19:56:44 sterling Exp $ */
+/* $Id: string.c,v 1.338 2002/12/26 20:52:42 sterling Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1352,6 +1352,9 @@
if (Z_TYPE_PP(needle) == IS_STRING) {
if (!Z_STRLEN_PP(needle)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty
delimiter.");
+ efree(haystack_orig);
+ zval_ptr_dtor(haystack);
+ zval_ptr_dtor(needle);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard string.c
sterlingThu Dec 26 14:56:44 2002 EDT Modified files: /php4/ext/standard string.c Log: remove memleak Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.336 php4/ext/standard/string.c:1.337 --- php4/ext/standard/string.c:1.336Thu Dec 12 08:38:18 2002 +++ php4/ext/standard/string.c Thu Dec 26 14:56:44 2002 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.336 2002/12/12 13:38:18 iliaa Exp $ */ +/* $Id: string.c,v 1.337 2002/12/26 19:56:44 sterling Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1372,6 +1372,8 @@ RETVAL_FALSE; } + zval_ptr_dtor(haystack); + zval_ptr_dtor(needle); efree(haystack_orig); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba/tests dba_db4.phpt
helly Thu Dec 26 14:55:06 2002 EDT
Added files:
/php4/ext/dba/tests dba_db4.phpt
Log:
Add missing test for db4 handler
Index: php4/ext/dba/tests/dba_db4.phpt
+++ php4/ext/dba/tests/dba_db4.phpt
--TEST--
DBA DB4 handler test
--SKIPIF--
--FILE--
--EXPECT--
database handler: db4
3NYNYY
Content String 2
Content 2 replaced
Read during write: not allowed
Content 2 replaced 2nd time
The 6th value
array(3) {
["key number 6"]=>
string(13) "The 6th value"
["key2"]=>
string(27) "Content 2 replaced 2nd time"
["key5"]=>
string(23) "The last content string"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/mysql php_mysql.c
georg Thu Dec 26 08:48:00 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mysql php_mysql.c
Log:
fixed some compiler warnings when using external libmysqlclient 4.x
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.174.2.3 php4/ext/mysql/php_mysql.c:1.174.2.4
--- php4/ext/mysql/php_mysql.c:1.174.2.3Thu Dec 5 15:02:21 2002
+++ php4/ext/mysql/php_mysql.c Thu Dec 26 08:47:59 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.174.2.3 2002/12/05 20:02:21 helly Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.4 2002/12/26 13:47:59 georg Exp $ */
/* TODO:
*
@@ -889,7 +889,7 @@
WRONG_PARAM_COUNT;
}
- RETURN_STRING(mysql_get_client_info(),1);
+ RETURN_STRING((char *)mysql_get_client_info(),1);
}
/* }}} */
@@ -919,7 +919,7 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link",
le_link, le_plink);
- RETURN_STRING(mysql_get_host_info(&mysql->conn),1);
+ RETURN_STRING((char *)mysql_get_host_info(&mysql->conn),1);
}
/* }}} */
@@ -979,7 +979,7 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link",
le_link, le_plink);
- RETURN_STRING(mysql_get_server_info(&mysql->conn),1);
+ RETURN_STRING((char *)mysql_get_server_info(&mysql->conn),1);
}
/* }}} */
@@ -1003,7 +1003,7 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link",
le_link, le_plink);
- if ((str = mysql_info(&mysql->conn))) {
+ if ((str = (char *)mysql_info(&mysql->conn))) {
RETURN_STRING(str,1);
} else {
RETURN_FALSE;
@@ -1051,7 +1051,7 @@
}
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link",
le_link, le_plink);
- RETURN_STRING(mysql_stat(&mysql->conn), 1);
+ RETURN_STRING((char *)mysql_stat(&mysql->conn), 1);
}
/* }}} */
@@ -1542,7 +1542,7 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link",
le_link, le_plink);
- RETURN_STRING(mysql_error(&mysql->conn), 1);
+ RETURN_STRING((char *)mysql_error(&mysql->conn), 1);
}
/* }}} */
@@ -1857,7 +1857,6 @@
MYSQL_ROW mysql_row;
MYSQL_FIELD *mysql_field;
mysql_row_length_type *mysql_row_lengths;
- int num_fields;
int i;
if (ZEND_NUM_ARGS() > expected_args) {
@@ -1892,8 +1891,6 @@
RETURN_FALSE;
}
- num_fields = mysql_num_fields(mysql_result);
-
if (array_init(return_value)==FAILURE) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / php.ini-dist php.ini-recommended /main config.w32.h.in internal_functions_win32.c /win32 php4dllts.dsp
edink Thu Dec 26 08:40:33 2002 EDT
Modified files:
/php4 php.ini-dist php.ini-recommended
/php4/main config.w32.h.in internal_functions_win32.c
/php4/win32 php4dllts.dsp
Log:
MFB:
Made ZLIB extension built in on Windows. Fixes #21139.
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.174 php4/php.ini-dist:1.175
--- php4/php.ini-dist:1.174 Sat Dec 21 17:19:51 2002
+++ php4/php.ini-dist Thu Dec 26 08:40:32 2002
@@ -564,7 +564,6 @@
;extension=php_xslt.dll
;extension=php_yaz.dll
;extension=php_zip.dll
-;extension=php_zlib.dll
;;;
Index: php4/php.ini-recommended
diff -u php4/php.ini-recommended:1.121 php4/php.ini-recommended:1.122
--- php4/php.ini-recommended:1.121 Sat Dec 21 17:19:51 2002
+++ php4/php.ini-recommendedThu Dec 26 08:40:32 2002
@@ -579,7 +579,6 @@
;extension=php_xslt.dll
;extension=php_yaz.dll
;extension=php_zip.dll
-;extension=php_zlib.dll
;;;
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.25 php4/main/config.w32.h.in:1.26
--- php4/main/config.w32.h.in:1.25 Mon Dec 2 15:11:59 2002
+++ php4/main/config.w32.h.in Thu Dec 26 08:40:32 2002
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h.in,v 1.25 2002/12/02 20:11:59 moriyoshi Exp $
+ $Id: config.w32.h.in,v 1.26 2002/12/26 13:40:32 edink Exp $
*/
/* Default PHP / PEAR directories */
@@ -74,6 +74,9 @@
/* Enable / Disable XML extension (default: enabled) */
#define HAVE_LIBEXPAT 1
+
+/* Enable / Disable ZLIB extension (default: enabled) */
+#define HAVE_ZLIB 1
/* PHP Runtime Configuration */
#define FORCE_CGI_REDIRECT 1
Index: php4/main/internal_functions_win32.c
diff -u php4/main/internal_functions_win32.c:1.65
php4/main/internal_functions_win32.c:1.66
--- php4/main/internal_functions_win32.c:1.65 Wed Sep 4 09:55:52 2002
+++ php4/main/internal_functions_win32.cThu Dec 26 08:40:32 2002
@@ -16,7 +16,7 @@
| Zeev Suraski <[EMAIL PROTECTED]>|
+--+
- $Id: internal_functions_win32.c,v 1.65 2002/09/04 13:55:52 sebastian Exp $
+ $Id: internal_functions_win32.c,v 1.66 2002/12/26 13:40:32 edink Exp $
*/
/* {{{ includes
@@ -90,6 +90,9 @@
#if HAVE_TOKENIZER
#include "ext/tokenizer/php_tokenizer.h"
#endif
+#if HAVE_ZLIB
+#include "ext/zlib/php_zlib.h"
+#endif
/* }}} */
/* {{{ php_builtin_extensions[]
@@ -139,6 +142,9 @@
#endif
#if HAVE_LIBEXPAT && HAVE_WDDX
,phpext_wddx_ptr
+#endif
+#if HAVE_ZLIB
+ ,phpext_zlib_ptr
#endif
};
/* }}} */
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.90 php4/win32/php4dllts.dsp:1.91
--- php4/win32/php4dllts.dsp:1.90 Wed Nov 20 16:21:35 2002
+++ php4/win32/php4dllts.dspThu Dec 26 08:40:32 2002
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug
/machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc"
/out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS"
/libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug"
/libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib
+advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
+ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /debug
+/machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc"
+/out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS"
+/libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug"
+/libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS"
!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386
/nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll"
/libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS"
[PHP-CVS] cvs: php4(PHP_4_3) / php.ini-dist php.ini-recommended /main config.w32.h.in internal_functions_win32.c /win32 php4dllts.dsp
edink Thu Dec 26 08:27:09 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4 php.ini-dist php.ini-recommended
/php4/main config.w32.h.in internal_functions_win32.c
/php4/win32 php4dllts.dsp
Log:
Made ZLIB extension built in on Windows. Fixes #21139.
# Approved by the release master.
# Will merge this patch into HEAD a bit later.
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.171.2.3 php4/php.ini-dist:1.171.2.4
--- php4/php.ini-dist:1.171.2.3 Sat Dec 21 17:16:35 2002
+++ php4/php.ini-dist Thu Dec 26 08:27:08 2002
@@ -564,7 +564,6 @@
;extension=php_xslt.dll
;extension=php_yaz.dll
;extension=php_zip.dll
-;extension=php_zlib.dll
;;;
Index: php4/php.ini-recommended
diff -u php4/php.ini-recommended:1.119.2.2 php4/php.ini-recommended:1.119.2.3
--- php4/php.ini-recommended:1.119.2.2 Sat Dec 21 17:16:35 2002
+++ php4/php.ini-recommendedThu Dec 26 08:27:08 2002
@@ -579,7 +579,6 @@
;extension=php_xslt.dll
;extension=php_yaz.dll
;extension=php_zip.dll
-;extension=php_zlib.dll
;;;
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.22.2.2 php4/main/config.w32.h.in:1.22.2.3
--- php4/main/config.w32.h.in:1.22.2.2 Sun Dec 1 18:30:22 2002
+++ php4/main/config.w32.h.in Thu Dec 26 08:27:08 2002
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h.in,v 1.22.2.2 2002/12/01 23:30:22 shane Exp $
+ $Id: config.w32.h.in,v 1.22.2.3 2002/12/26 13:27:08 edink Exp $
*/
/* Default PHP / PEAR directories */
@@ -74,6 +74,9 @@
/* Enable / Disable XML extension (default: enabled) */
#define HAVE_LIBEXPAT 1
+
+/* Enable / Disable ZLIB extension (default: enabled) */
+#define HAVE_ZLIB 1
/* PHP Runtime Configuration */
#define FORCE_CGI_REDIRECT 1
Index: php4/main/internal_functions_win32.c
diff -u php4/main/internal_functions_win32.c:1.65
php4/main/internal_functions_win32.c:1.65.2.1
--- php4/main/internal_functions_win32.c:1.65 Wed Sep 4 09:55:52 2002
+++ php4/main/internal_functions_win32.cThu Dec 26 08:27:08 2002
@@ -16,7 +16,7 @@
| Zeev Suraski <[EMAIL PROTECTED]>|
+--+
- $Id: internal_functions_win32.c,v 1.65 2002/09/04 13:55:52 sebastian Exp $
+ $Id: internal_functions_win32.c,v 1.65.2.1 2002/12/26 13:27:08 edink Exp $
*/
/* {{{ includes
@@ -90,6 +90,9 @@
#if HAVE_TOKENIZER
#include "ext/tokenizer/php_tokenizer.h"
#endif
+#if HAVE_ZLIB
+#include "ext/zlib/php_zlib.h"
+#endif
/* }}} */
/* {{{ php_builtin_extensions[]
@@ -139,6 +142,9 @@
#endif
#if HAVE_LIBEXPAT && HAVE_WDDX
,phpext_wddx_ptr
+#endif
+#if HAVE_ZLIB
+ ,phpext_zlib_ptr
#endif
};
/* }}} */
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.87.2.1 php4/win32/php4dllts.dsp:1.87.2.2
--- php4/win32/php4dllts.dsp:1.87.2.1 Wed Nov 13 16:38:57 2002
+++ php4/win32/php4dllts.dspThu Dec 26 08:27:08 2002
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug
/machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc"
/out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS"
/libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug"
/libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib
+advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
+ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /debug
+/machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc"
+/out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS"
+/libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug"
+/libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS"
!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386
/nodef
