cvs: php4 / README.EXTENSIONS /ext/aspell aspell.c /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/ccvs ccvs.c /ext/com COM.c
/ext/cpdf cpdf.c /ext/crack crack.c /ext/ctype ctype.c /ext/curl curl.c /ext/cybercash cybercash.c /ext/cybermut cybermut.c /ext/cyrus cyrus.c
/ext/db db.c /ext/dba dba.c /ext/dbase dbase.c /ext/dbplus dbplus.c /ext/dbx dbx.c /ext/domxml php_domxml.c /ext/dotnet dotnet.cpp /ext/exif
exif.c /ext/fbsql php_fbsql.c /ext/fdf fdf.c /ext/filepro filepro.c /ext/fribidi fribidi.c /ext/ftp php_ftp.c /ext/gd gd.c /ext/gettext
gettext.c /ext/gmp gmp.c /ext/hyperwave hw.c /ext/icap php_icap.c /ext/iconv iconv.c /ext/iisfunc setup.c /ext/imap php_imap.c /ext/informix
ifx.ec /ext/ingres_ii ii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext/java java.c /ext/ldap ldap.c /ext/mailparse mailparse.c
/ext/mbstring mbstring.c /ext/mcal php_mcal.c /ext/mcrypt mcrypt.c /ext/mhash mhash.c /ext/ming ming.c /ext/mnogosearch php_mnogo.c
/ext/msession msession.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/muscat muscat.c /ext/mysql php_mysql.c /ext/ncurses ncurses.c
/ext/notes php_notes.c /ext/oci8 oci8.c /ext/odbc php_odbc.c velocis.c /ext/openssl openssl.c /ext/oracle oracle.c /ext/ovrimos ovrimos.c
/ext/pcntl pcntl.c /ext/pcre php_pcre.c /ext/pdf pdf.c /ext/pfpro pfpro.c /ext/pgsql pgsql.c /ext/posix posix.c /ext/printer printer.c
/ext/pspell pspell.c /ext/qtdom qtdom.c /ext/readline readline.c /ext/recode recode.c /ext/sablot sablot.c /ext/satellite php_orbit.c
/ext/session mod_mm.c session.c /ext/shmop shmop.c /ext/skeleton skeleton.c /ext/snmp snmp.c winsnmp.c /ext/sockets sockets.c /ext/standard
basic_functions.c info.c /ext/swf swf.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/sysvsem sysvsem.c /ext/sysvshm sysvshm.c
/ext/vpopmail php_vpopmail.c /ext/wddx wddx.c /ext/xml xml.c /ext/xmlrpc xmlrpc-epi-php.c /ext/xslt sablot.c /ext/yaz php_yaz.c /ext/yp yp.c
/ext/zip zip.c /ext/zlib zlib.c

ssb Thu Oct 11 19:34:04 2001 EDT Added files: /php4 README.EXTENSIONS Modified files: /php4/ext/aspell aspell.c /php4/ext/bcmath bcmath.c /php4/ext/bz2 bz2.c /php4/ext/calendar calendar.c /php4/ext/ccvs ccvs.c /php4/ext/com COM.c /php4/ext/cpdf cpdf.c /php4/ext/crack crack.c /php4/ext/ctype ctype.c /php4/ext/curl curl.c /php4/ext/cybercash cybercash.c /php4/ext/cybermut cybermut.c /php4/ext/cyrus cyrus.c /php4/ext/db db.c /php4/ext/dba dba.c /php4/ext/dbase dbase.c /php4/ext/dbplus dbplus.c /php4/ext/dbx dbx.c /php4/ext/domxml php_domxml.c /php4/ext/dotnet dotnet.cpp /php4/ext/exif exif.c /php4/ext/fbsql php_fbsql.c /php4/ext/fdf fdf.c /php4/ext/filepro filepro.c /php4/ext/fribidi fribidi.c /php4/ext/ftp php_ftp.c /php4/ext/gd gd.c /php4/ext/gettext gettext.c /php4/ext/gmp gmp.c /php4/ext/hyperwave hw.c /php4/ext/icap php_icap.c /php4/ext/iconv iconv.c /php4/ext/iisfunc setup.c /php4/ext/imap php_imap.c /php4/ext/informix ifx.ec /php4/ext/ingres_ii ii.c /php4/ext/interbase interbase.c /php4/ext/ircg ircg.c /php4/ext/java java.c /php4/ext/ldap ldap.c /php4/ext/mailparse mailparse.c /php4/ext/mbstring mbstring.c /php4/ext/mcal php_mcal.c /php4/ext/mcrypt mcrypt.c /php4/ext/mhash mhash.c /php4/ext/ming ming.c /php4/ext/mnogosearch php_mnogo.c /php4/ext/msession msession.c /php4/ext/msql php_msql.c /php4/ext/mssql php_mssql.c /php4/ext/muscat muscat.c /php4/ext/mysql php_mysql.c /php4/ext/ncurses ncurses.c /php4/ext/notes php_notes.c /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c velocis.c /php4/ext/openssl openssl.c /php4/ext/oracle oracle.c /php4/ext/ovrimos ovrimos.c /php4/ext/pcntl pcntl.c /php4/ext/pcre php_pcre.c /php4/ext/pdf pdf.c /php4/ext/pfpro pfpro.c /php4/ext/pgsql pgsql.c /php4/ext/posix posix.c /php4/ext/printer printer.c /php4/ext/pspell pspell.c /php4/ext/qtdom qtdom.c /php4/ext/readline readline.c /php4/ext/recode recode.c /php4/ext/sablot sablot.c /php4/ext/satellite php_orbit.c /php4/ext/session mod_mm.c session.c /php4/ext/shmop shmop.c /php4/ext/skeleton skeleton.c /php4/ext/snmp snmp.c winsnmp.c /php4/ext/sockets sockets.c /php4/ext/standard basic_functions.c info.c /php4/ext/swf swf.c /php4/ext/sybase php_sybase_db.c /php4/ext/sybase_ct php_sybase_ct.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm sysvshm.c /php4/ext/vpopmail php_vpopmail.c /php4/ext/wddx wddx.c /php4/ext/xml xml.c /php4/ext/xmlrpc xmlrpc-epi-php.c /php4/ext/xslt sablot.c /php4/ext/yaz php_yaz.c /php4/ext/yp yp.c /php4/ext/zip zip.c /php4/ext/zlib zlib.c Log: * zend_module_entry change: apino, debug and zts are moved first, see README.EXTENSIONS file for upgrade help. @Introduced extension version numbers (Stig)

Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.34 php4/ext/aspell/aspell.c:1.35 --- php4/ext/aspell/aspell.c:1.34 Tue Sep 25 17:57:48 2001 +++ php4/ext/aspell/aspell.c Thu Oct 11 19:32:28 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.34 2001/09/25 21:57:48 jeroen Exp $ */ +/* $Id: aspell.c,v 1.35 2001/10/11 23:32:28 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -51,7 +51,8 @@ static int le_aspell; zend_module_entry aspell_module_entry = { - "aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_ASPELL Index: php4/ext/bcmath/bcmath.c diff -u php4/ext/bcmath/bcmath.c:1.33 php4/ext/bcmath/bcmath.c:1.34 --- php4/ext/bcmath/bcmath.c:1.33 Tue Sep 25 17:57:48 2001 +++ php4/ext/bcmath/bcmath.c Thu Oct 11 19:32:28 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bcmath.c,v 1.33 2001/09/25 21:57:48 jeroen Exp $ */ +/* $Id: bcmath.c,v 1.34 2001/10/11 23:32:28 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -44,13 +44,15 @@ }; zend_module_entry bcmath_module_entry = { + STANDARD_MODULE_HEADER, "bcmath", - bcmath_functions, + bcmath_functions, PHP_MINIT(bcmath), PHP_MSHUTDOWN(bcmath), PHP_RINIT(bcmath), NULL, PHP_MINFO(bcmath), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/bz2/bz2.c diff -u php4/ext/bz2/bz2.c:1.24 php4/ext/bz2/bz2.c:1.25 --- php4/ext/bz2/bz2.c:1.24 Sun Sep 9 09:28:38 2001 +++ php4/ext/bz2/bz2.c Thu Oct 11 19:32:29 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.24 2001/09/09 13:28:38 derick Exp $ */ +/* $Id: bz2.c,v 1.25 2001/10/11 23:32:29 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -60,6 +60,7 @@ }; zend_module_entry bz2_module_entry = { + STANDARD_MODULE_HEADER, "bz2", bz2_functions, PHP_MINIT(bz2), @@ -67,6 +68,7 @@ NULL, NULL, PHP_MINFO(bz2), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/calendar/calendar.c diff -u php4/ext/calendar/calendar.c:1.22 php4/ext/calendar/calendar.c:1.23 --- php4/ext/calendar/calendar.c:1.22 Tue Sep 25 17:57:48 2001 +++ php4/ext/calendar/calendar.c Thu Oct 11 19:32:30 2001 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.22 2001/09/25 21:57:48 jeroen Exp $ */ +/* $Id: calendar.c,v 1.23 2001/10/11 23:32:30 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,6 +57,7 @@ zend_module_entry calendar_module_entry = { + STANDARD_MODULE_HEADER, "calendar", calendar_functions, PHP_MINIT(calendar), @@ -64,6 +65,7 @@ NULL, NULL, PHP_MINFO(calendar), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; Index: php4/ext/ccvs/ccvs.c diff -u php4/ext/ccvs/ccvs.c:1.20 php4/ext/ccvs/ccvs.c:1.21 --- php4/ext/ccvs/ccvs.c:1.20 Sat Oct 6 16:13:36 2001 +++ php4/ext/ccvs/ccvs.c Thu Oct 11 19:32:32 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ /* -* cvvs.c $Revision: 1.20 $ - PHP4 Interface to the RedHat CCVS API +* cvvs.c $Revision: 1.21 $ - PHP4 Interface to the RedHat CCVS API * ------- * Interfaces RedHat's CCVS [Credit Card Verification System] <http://www.redhat.com/products/ccvs/> * This code is ported from an original php3 interface written by RedHat's Doug DeJulio <ddj@redhat.com> @@ -27,10 +27,10 @@ /* * Code started on 2000.07.24@09.04.EST by Brendan W. McAdams <bmcadams@php.net> -* $Revision: 1.20 $ +* $Revision: 1.21 $ */ -static char const cvsid[] = "$Id: ccvs.c,v 1.20 2001/10/06 20:13:36 derick Exp $"; +static char const cvsid[] = "$Id: ccvs.c,v 1.21 2001/10/11 23:32:32 ssb Exp $"; #include <php.h> #include <stdlib.h> @@ -97,15 +97,17 @@ /* Declare our module to the Zend engine */ zend_module_entry ccvs_module_entry = { + STANDARD_MODULE_HEADER, "CCVS", ccvs_functions, NULL, NULL, NULL, NULL, PHP_MINFO(ccvs), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; -#ifdef COMPILE_DL_LDAP -ZEND_GET_MODULE(ldap) +#ifdef COMPILE_DL_CCVS +ZEND_GET_MODULE(ccvs) #endif /* Full Functions (The actual CCVS functions and any internal php hooked functions such as MINFO) */ Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.59 php4/ext/com/COM.c:1.60 --- php4/ext/com/COM.c:1.59 Wed Sep 26 18:52:15 2001 +++ php4/ext/com/COM.c Thu Oct 11 19:32:33 2001 @@ -1810,7 +1810,16 @@ /* exports for external object creation */ zend_module_entry COM_module_entry = { - "com", COM_functions, PHP_MINIT(COM), PHP_MSHUTDOWN(COM), NULL, NULL, PHP_MINFO(COM), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "com", + COM_functions, + PHP_MINIT(COM), + PHP_MSHUTDOWN(COM), + NULL, + NULL, + PHP_MINFO(COM), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; PHPAPI int php_COM_get_le_comval() @@ -1819,3 +1828,11 @@ } #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + */ Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.36 php4/ext/cpdf/cpdf.c:1.37 --- php4/ext/cpdf/cpdf.c:1.36 Tue Sep 25 18:48:32 2001 +++ php4/ext/cpdf/cpdf.c Thu Oct 11 19:32:33 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.36 2001/09/25 22:48:32 jeroen Exp $ */ +/* $Id: cpdf.c,v 1.37 2001/10/11 23:32:33 ssb Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -155,7 +155,16 @@ }; zend_module_entry cpdf_module_entry = { - "cpdf", cpdf_functions, PHP_MINIT(cpdf), PHP_MSHUTDOWN(cpdf), PHP_RINIT(cpdf), NULL, PHP_MINFO(cpdf), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "cpdf", + cpdf_functions, + PHP_MINIT(cpdf), + PHP_MSHUTDOWN(cpdf), + PHP_RINIT(cpdf), + NULL, + PHP_MINFO(cpdf), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_CPDF Index: php4/ext/crack/crack.c diff -u php4/ext/crack/crack.c:1.12 php4/ext/crack/crack.c:1.13 --- php4/ext/crack/crack.c:1.12 Tue Sep 25 17:57:50 2001 +++ php4/ext/crack/crack.c Thu Oct 11 19:32:36 2001 @@ -15,7 +15,7 @@ | Authors: | +----------------------------------------------------------------------+ */ -/* $Id: crack.c,v 1.12 2001/09/25 21:57:50 jeroen Exp $ */ +/* $Id: crack.c,v 1.13 2001/10/11 23:32:36 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -43,6 +43,7 @@ }; zend_module_entry crack_module_entry = { + STANDARD_MODULE_HEADER, "crack", crack_functions, ZEND_MODULE_STARTUP_N(crack), @@ -50,6 +51,7 @@ ZEND_MODULE_ACTIVATE_N(crack), ZEND_MODULE_DEACTIVATE_N(crack), ZEND_MODULE_INFO_N(crack), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/ctype/ctype.c diff -u php4/ext/ctype/ctype.c:1.15 php4/ext/ctype/ctype.c:1.16 --- php4/ext/ctype/ctype.c:1.15 Tue Sep 25 17:57:51 2001 +++ php4/ext/ctype/ctype.c Thu Oct 11 19:32:37 2001 @@ -62,6 +62,7 @@ /* {{{ ctype_mpodule_entry */ zend_module_entry ctype_module_entry = { + STANDARD_MODULE_HEADER, "ctype", ctype_functions, NULL, @@ -69,6 +70,7 @@ NULL, NULL, PHP_MINFO(ctype), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.91 php4/ext/curl/curl.c:1.92 --- php4/ext/curl/curl.c:1.91 Wed Sep 26 18:24:42 2001 +++ php4/ext/curl/curl.c Thu Oct 11 19:32:37 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.91 2001/09/26 22:24:42 jeroen Exp $ */ +/* $Id: curl.c,v 1.92 2001/10/11 23:32:37 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -69,6 +69,7 @@ /* {{{ curl_module_entry */ zend_module_entry curl_module_entry = { + STANDARD_MODULE_HEADER, "curl", curl_functions, PHP_MINIT(curl), @@ -76,6 +77,7 @@ NULL, NULL, PHP_MINFO(curl), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/cybercash/cybercash.c diff -u php4/ext/cybercash/cybercash.c:1.15 php4/ext/cybercash/cybercash.c:1.16 --- php4/ext/cybercash/cybercash.c:1.15 Sun Sep 9 09:28:42 2001 +++ php4/ext/cybercash/cybercash.c Thu Oct 11 19:32:38 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cybercash.c,v 1.15 2001/09/09 13:28:42 derick Exp $ */ +/* $Id: cybercash.c,v 1.16 2001/10/11 23:32:38 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -45,6 +45,7 @@ /* {{{ cybercash_module_entry */ zend_module_entry cybercash_module_entry = { + STANDARD_MODULE_HEADER, "cybercash", cybercash_functions, NULL, @@ -52,6 +53,7 @@ NULL, NULL, PHP_MINFO(cybercash), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; /* }}} */ Index: php4/ext/cybermut/cybermut.c diff -u php4/ext/cybermut/cybermut.c:1.6 php4/ext/cybermut/cybermut.c:1.7 --- php4/ext/cybermut/cybermut.c:1.6 Sun Sep 9 09:28:43 2001 +++ php4/ext/cybermut/cybermut.c Thu Oct 11 19:32:38 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cybermut.c,v 1.6 2001/09/09 13:28:43 derick Exp $ */ +/* $Id: cybermut.c,v 1.7 2001/10/11 23:32:38 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -48,6 +48,7 @@ /* {{{ cybermut_module_entry */ zend_module_entry cybermut_module_entry = { + STANDARD_MODULE_HEADER, "cybermut", cybermut_functions, PHP_MINIT(cybermut), @@ -55,6 +56,7 @@ NULL, NULL, PHP_MINFO(cybermut), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/cyrus/cyrus.c diff -u php4/ext/cyrus/cyrus.c:1.3 php4/ext/cyrus/cyrus.c:1.4 --- php4/ext/cyrus/cyrus.c:1.3 Tue Aug 21 13:58:37 2001 +++ php4/ext/cyrus/cyrus.c Thu Oct 11 19:32:39 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cyrus.c,v 1.3 2001/08/21 17:58:37 sterling Exp $ */ +/* $Id: cyrus.c,v 1.4 2001/10/11 23:32:39 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -48,6 +48,7 @@ }; zend_module_entry cyrus_module_entry = { + STANDARD_MODULE_HEADER, "cyrus", cyrus_functions, PHP_MINIT(cyrus), @@ -55,6 +56,7 @@ NULL, NULL, PHP_MINFO(cyrus), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.65 php4/ext/db/db.c:1.66 --- php4/ext/db/db.c:1.65 Sun Sep 9 09:28:43 2001 +++ php4/ext/db/db.c Thu Oct 11 19:32:39 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.65 2001/09/09 13:28:43 derick Exp $ */ +/* $Id: db.c,v 1.66 2001/10/11 23:32:39 ssb Exp $ */ #define IS_EXT_MODULE #if 1 @@ -1234,7 +1234,16 @@ /* }}} */ zend_module_entry dbm_module_entry = { - "db", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "db", + dbm_functions, + PHP_MINIT(db), + PHP_MSHUTDOWN(db), + PHP_RINIT(db), + NULL, + PHP_MINFO(db), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_DB Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.39 php4/ext/dba/dba.c:1.40 --- php4/ext/dba/dba.c:1.39 Tue Sep 25 18:48:32 2001 +++ php4/ext/dba/dba.c Thu Oct 11 19:32:40 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.39 2001/09/25 22:48:32 jeroen Exp $ */ +/* $Id: dba.c,v 1.40 2001/10/11 23:32:40 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -60,11 +60,15 @@ static PHP_MINFO_FUNCTION(dba); zend_module_entry dba_module_entry = { - "dba", dba_functions, + STANDARD_MODULE_HEADER, + "dba", + dba_functions, PHP_MINIT(dba), PHP_MSHUTDOWN(dba), - NULL, NULL, + NULL, + NULL, PHP_MINFO(dba), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.51 php4/ext/dbase/dbase.c:1.52 --- php4/ext/dbase/dbase.c:1.51 Mon Oct 8 17:51:12 2001 +++ php4/ext/dbase/dbase.c Thu Oct 11 19:32:41 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbase.c,v 1.51 2001/10/08 21:51:12 jimw Exp $ */ +/* $Id: dbase.c,v 1.52 2001/10/11 23:32:41 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -787,7 +787,8 @@ /* }}} */ zend_module_entry dbase_module_entry = { - "dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/dbplus/dbplus.c diff -u php4/ext/dbplus/dbplus.c:1.9 php4/ext/dbplus/dbplus.c:1.10 --- php4/ext/dbplus/dbplus.c:1.9 Tue Sep 25 17:57:52 2001 +++ php4/ext/dbplus/dbplus.c Thu Oct 11 19:32:41 2001 @@ -118,6 +118,7 @@ /* {{{ module entry */ zend_module_entry dbplus_module_entry = { + STANDARD_MODULE_HEADER, "dbplus", dbplus_functions, PHP_MINIT(dbplus), @@ -125,6 +126,7 @@ PHP_RINIT(dbplus), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(dbplus), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(dbplus), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/dbx/dbx.c diff -u php4/ext/dbx/dbx.c:1.28 php4/ext/dbx/dbx.c:1.29 --- php4/ext/dbx/dbx.c:1.28 Tue Sep 25 18:48:32 2001 +++ php4/ext/dbx/dbx.c Thu Oct 11 19:32:42 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx.c,v 1.28 2001/09/25 22:48:32 jeroen Exp $ */ +/* $Id: dbx.c,v 1.29 2001/10/11 23:32:42 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -148,6 +148,7 @@ }; zend_module_entry dbx_module_entry = { + STANDARD_MODULE_HEADER, "dbx", dbx_functions, ZEND_MINIT(dbx), @@ -155,6 +156,7 @@ NULL, /*ZEND_RINIT(dbx), /* Replace with NULL if there's nothing to do at request start */ NULL, /*ZEND_RSHUTDOWN(dbx), /* Replace with NULL if there's nothing to do at request end */ ZEND_MINFO(dbx), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.76 php4/ext/domxml/php_domxml.c:1.77 --- php4/ext/domxml/php_domxml.c:1.76 Tue Sep 25 17:57:54 2001 +++ php4/ext/domxml/php_domxml.c Thu Oct 11 19:32:43 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.76 2001/09/25 21:57:54 jeroen Exp $ */ +/* $Id: php_domxml.c,v 1.77 2001/10/11 23:32:43 ssb Exp $ */ #ifdef HAVE_CONFIG_H @@ -267,6 +267,7 @@ }; zend_module_entry domxml_module_entry = { + STANDARD_MODULE_HEADER, "domxml", domxml_functions, PHP_MINIT(domxml), @@ -274,6 +275,7 @@ PHP_RINIT(domxml), NULL, PHP_MINFO(domxml), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/dotnet/dotnet.cpp diff -u php4/ext/dotnet/dotnet.cpp:1.17 php4/ext/dotnet/dotnet.cpp:1.18 --- php4/ext/dotnet/dotnet.cpp:1.17 Wed Aug 15 06:39:56 2001 +++ php4/ext/dotnet/dotnet.cpp Thu Oct 11 19:32:44 2001 @@ -226,7 +226,8 @@ zend_module_entry dotnet_module_entry = { - "dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; BEGIN_EXTERN_C() Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.34 php4/ext/exif/exif.c:1.35 --- php4/ext/exif/exif.c:1.34 Tue Sep 25 17:57:54 2001 +++ php4/ext/exif/exif.c Thu Oct 11 19:32:44 2001 @@ -131,11 +131,13 @@ /* {{{ exif_module_entry */ zend_module_entry exif_module_entry = { + STANDARD_MODULE_HEADER, "exif", exif_functions, NULL, NULL, NULL, NULL, PHP_MINFO(exif), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.54 php4/ext/fbsql/php_fbsql.c:1.55 --- php4/ext/fbsql/php_fbsql.c:1.54 Wed Oct 10 18:24:57 2001 +++ php4/ext/fbsql/php_fbsql.c Thu Oct 11 19:32:45 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.54 2001/10/10 22:24:57 fmk Exp $ */ +/* $Id: php_fbsql.c,v 1.55 2001/10/11 23:32:45 ssb Exp $ */ /* TODO: * @@ -231,14 +231,16 @@ /* }}} */ zend_module_entry fbsql_module_entry = { - "fbsql", - fbsql_functions, - PHP_MINIT(fbsql), - PHP_MSHUTDOWN(fbsql), - PHP_RINIT(fbsql), - PHP_RSHUTDOWN(fbsql), - PHP_MINFO(fbsql), - STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "fbsql", + fbsql_functions, + PHP_MINIT(fbsql), + PHP_MSHUTDOWN(fbsql), + PHP_RINIT(fbsql), + PHP_RSHUTDOWN(fbsql), + PHP_MINFO(fbsql), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; ZEND_DECLARE_MODULE_GLOBALS(fbsql) Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.60 php4/ext/fdf/fdf.c:1.61 --- php4/ext/fdf/fdf.c:1.60 Sun Sep 9 09:28:47 2001 +++ php4/ext/fdf/fdf.c Thu Oct 11 19:32:46 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.60 2001/09/09 13:28:47 derick Exp $ */ +/* $Id: fdf.c,v 1.61 2001/10/11 23:32:46 ssb Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -68,6 +68,7 @@ /* }}} */ zend_module_entry fdf_module_entry = { + STANDARD_MODULE_HEADER, "fdf", fdf_functions, PHP_MINIT(fdf), @@ -75,6 +76,7 @@ NULL, NULL, PHP_MINFO(fdf), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.40 php4/ext/filepro/filepro.c:1.41 --- php4/ext/filepro/filepro.c:1.40 Tue Sep 25 17:57:55 2001 +++ php4/ext/filepro/filepro.c Thu Oct 11 19:32:47 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.40 2001/09/25 21:57:55 jeroen Exp $ */ +/* $Id: filepro.c,v 1.41 2001/10/11 23:32:47 ssb Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -144,7 +144,8 @@ }; zend_module_entry filepro_module_entry = { - "filepro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "filepro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/fribidi/fribidi.c diff -u php4/ext/fribidi/fribidi.c:1.10 php4/ext/fribidi/fribidi.c:1.11 --- php4/ext/fribidi/fribidi.c:1.10 Tue Oct 9 15:19:18 2001 +++ php4/ext/fribidi/fribidi.c Thu Oct 11 19:32:48 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fribidi.c,v 1.10 2001/10/09 19:19:18 derick Exp $ */ +/* $Id: fribidi.c,v 1.11 2001/10/11 23:32:48 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -47,6 +47,7 @@ }; zend_module_entry fribidi_module_entry = { + STANDARD_MODULE_HEADER, "fribidi", fribidi_functions, PHP_MINIT(fribidi), @@ -54,6 +55,7 @@ NULL, NULL, PHP_MINFO(fribidi), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.39 php4/ext/ftp/php_ftp.c:1.40 --- php4/ext/ftp/php_ftp.c:1.39 Sat Aug 11 12:38:28 2001 +++ php4/ext/ftp/php_ftp.c Thu Oct 11 19:32:48 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.39 2001/08/11 16:38:28 zeev Exp $ */ +/* $Id: php_ftp.c,v 1.40 2001/10/11 23:32:48 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -62,6 +62,7 @@ }; zend_module_entry php_ftp_module_entry = { + STANDARD_MODULE_HEADER, "ftp", php_ftp_functions, PHP_MINIT(ftp), @@ -69,6 +70,7 @@ NULL, NULL, PHP_MINFO(ftp), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -854,3 +856,11 @@ /* }}} */ #endif /* HAVE_FTP */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + */ Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.165 php4/ext/gd/gd.c:1.166 --- php4/ext/gd/gd.c:1.165 Mon Oct 8 14:39:42 2001 +++ php4/ext/gd/gd.c Thu Oct 11 19:32:49 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.165 2001/10/08 18:39:42 eschmid Exp $ */ +/* $Id: gd.c,v 1.166 2001/10/11 23:32:49 ssb Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -202,7 +202,16 @@ /* }}} */ zend_module_entry gd_module_entry = { - "gd", gd_functions, PHP_MINIT(gd), NULL, NULL, NULL, PHP_MINFO(gd), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "gd", + gd_functions, + PHP_MINIT(gd), + NULL, + NULL, + NULL, + PHP_MINFO(gd), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_GD Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.34 php4/ext/gettext/gettext.c:1.35 --- php4/ext/gettext/gettext.c:1.34 Sun Sep 9 09:28:50 2001 +++ php4/ext/gettext/gettext.c Thu Oct 11 19:32:50 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.34 2001/09/09 13:28:50 derick Exp $ */ +/* $Id: gettext.c,v 1.35 2001/10/11 23:32:50 ssb Exp $ */ #include <stdio.h> #ifdef HAVE_CONFIG_H @@ -54,6 +54,7 @@ /* }}} */ zend_module_entry php_gettext_module_entry = { + STANDARD_MODULE_HEADER, "gettext", php_gettext_functions, NULL, @@ -61,6 +62,7 @@ NULL, NULL, PHP_MINFO(gettext), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/gmp/gmp.c diff -u php4/ext/gmp/gmp.c:1.20 php4/ext/gmp/gmp.c:1.21 --- php4/ext/gmp/gmp.c:1.20 Sun Sep 9 09:28:50 2001 +++ php4/ext/gmp/gmp.c Thu Oct 11 19:32:50 2001 @@ -86,6 +86,7 @@ /* {{{ gmp_module_entry */ zend_module_entry gmp_module_entry = { + STANDARD_MODULE_HEADER, "gmp", gmp_functions, ZEND_MODULE_STARTUP_N(gmp), @@ -93,6 +94,7 @@ NULL, /* Replace with NULL if there's nothing to do at request start */ NULL, /* Replace with NULL if there's nothing to do at request end */ ZEND_MODULE_INFO_N(gmp), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.98 php4/ext/hyperwave/hw.c:1.99 --- php4/ext/hyperwave/hw.c:1.98 Wed Sep 26 05:00:28 2001 +++ php4/ext/hyperwave/hw.c Thu Oct 11 19:32:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.98 2001/09/26 09:00:28 jeroen Exp $ */ +/* $Id: hw.c,v 1.99 2001/10/11 23:32:51 ssb Exp $ */ #include <stdlib.h> #include <errno.h> @@ -129,7 +129,8 @@ }; zend_module_entry hw_module_entry = { - "hyperwave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "hyperwave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.30 php4/ext/icap/php_icap.c:1.31 --- php4/ext/icap/php_icap.c:1.30 Tue Sep 25 17:57:57 2001 +++ php4/ext/icap/php_icap.c Thu Oct 11 19:32:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_icap.c,v 1.30 2001/09/25 21:57:57 jeroen Exp $ */ +/* $Id: php_icap.c,v 1.31 2001/10/11 23:32:52 ssb Exp $ */ #define ICAP1 @@ -89,7 +89,16 @@ zend_module_entry php_icap_module_entry = { - "icap", icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL + STANDARD_MODULE_HEADER, + "icap", + icap_functions, + PHP_MINIT(icap), + NULL, + NULL, + NULL, + PHP_MINFO(icap), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.21 php4/ext/iconv/iconv.c:1.22 --- php4/ext/iconv/iconv.c:1.21 Sun Sep 9 09:28:51 2001 +++ php4/ext/iconv/iconv.c Thu Oct 11 19:32:52 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.21 2001/09/09 13:28:51 derick Exp $ */ +/* $Id: iconv.c,v 1.22 2001/10/11 23:32:52 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -62,6 +62,7 @@ /* {{{ iconv_module_entry */ zend_module_entry iconv_module_entry = { + STANDARD_MODULE_HEADER, "iconv", iconv_functions, PHP_MINIT(miconv), @@ -69,6 +70,7 @@ NULL, NULL, PHP_MINFO(miconv), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/iisfunc/setup.c diff -u php4/ext/iisfunc/setup.c:1.10 php4/ext/iisfunc/setup.c:1.11 --- php4/ext/iisfunc/setup.c:1.10 Tue Sep 25 23:33:44 2001 +++ php4/ext/iisfunc/setup.c Thu Oct 11 19:32:53 2001 @@ -15,7 +15,7 @@ | Authors: Frank M. Kromann <fmk@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: setup.c,v 1.10 2001/09/26 03:33:44 fmk Exp $ */ +/* $Id: setup.c,v 1.11 2001/10/11 23:32:53 ssb Exp $ */ #ifdef COMPILE_DL_IISFUNC #define HAVE_IISFUNC 1 @@ -73,6 +73,7 @@ }; zend_module_entry iisfunc_module_entry = { + STANDARD_MODULE_HEADER, "iisfunc", iisfunc_functions, PHP_MINIT(iisfunc), @@ -80,6 +81,7 @@ PHP_RINIT(iisfunc), PHP_RSHUTDOWN(iisfunc), PHP_MINFO(iisfunc), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.104 php4/ext/imap/php_imap.c:1.105 --- php4/ext/imap/php_imap.c:1.104 Wed Sep 26 04:35:41 2001 +++ php4/ext/imap/php_imap.c Thu Oct 11 19:32:54 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.104 2001/09/26 08:35:41 jeroen Exp $ */ +/* $Id: php_imap.c,v 1.105 2001/10/11 23:32:54 ssb Exp $ */ #define IMAP41 @@ -158,12 +158,15 @@ /* {{{ imap_module_entry */ zend_module_entry imap_module_entry = { + STANDARD_MODULE_HEADER, "imap", imap_functions, PHP_MINIT(imap), - NULL, PHP_RINIT(imap), + NULL, + PHP_RINIT(imap), PHP_RSHUTDOWN(imap), PHP_MINFO(imap), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/informix/ifx.ec diff -u php4/ext/informix/ifx.ec:1.61 php4/ext/informix/ifx.ec:1.62 --- php4/ext/informix/ifx.ec:1.61 Thu Oct 4 16:19:45 2001 +++ php4/ext/informix/ifx.ec Thu Oct 11 19:32:55 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ifx.ec,v 1.61 2001/10/04 20:19:45 dbeu Exp $ */ +/* $Id: ifx.ec,v 1.62 2001/10/11 23:32:55 ssb Exp $ */ /* ------------------------------------------------------------------- * if you want a function reference : "grep '^\*\*' ifx.ec" will give @@ -165,6 +165,7 @@ }; zend_module_entry ifx_module_entry = { + STANDARD_MODULE_HEADER, "informix", ifx_functions, PHP_MINIT(ifx), @@ -172,6 +173,7 @@ PHP_RINIT(ifx), NULL, PHP_MINFO(ifx), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.29 php4/ext/ingres_ii/ii.c:1.30 --- php4/ext/ingres_ii/ii.c:1.29 Tue Sep 25 17:57:59 2001 +++ php4/ext/ingres_ii/ii.c Thu Oct 11 19:32:56 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.29 2001/09/25 21:57:59 jeroen Exp $ */ +/* $Id: ii.c,v 1.30 2001/10/11 23:32:56 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -67,6 +67,7 @@ }; zend_module_entry ingres_ii_module_entry = { + STANDARD_MODULE_HEADER, "ingres_ii", ii_functions, PHP_MINIT(ii), @@ -74,6 +75,7 @@ PHP_RINIT(ii), PHP_RSHUTDOWN(ii), PHP_MINFO(ii), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -1462,4 +1464,4 @@ * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - \ No newline at end of file + Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.72 php4/ext/interbase/interbase.c:1.73 --- php4/ext/interbase/interbase.c:1.72 Tue Sep 25 18:48:37 2001 +++ php4/ext/interbase/interbase.c Thu Oct 11 19:32:57 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.72 2001/09/25 22:48:37 jeroen Exp $ */ +/* $Id: interbase.c,v 1.73 2001/10/11 23:32:57 ssb Exp $ */ /* TODO: Arrays, roles? @@ -108,6 +108,7 @@ zend_module_entry ibase_module_entry = { + STANDARD_MODULE_HEADER, "interbase", ibase_functions, PHP_MINIT(ibase), @@ -115,6 +116,7 @@ PHP_RINIT(ibase), PHP_RSHUTDOWN(ibase), PHP_MINFO(ibase), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -587,7 +589,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.72 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.73 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/ircg/ircg.c diff -u php4/ext/ircg/ircg.c:1.110 php4/ext/ircg/ircg.c:1.111 --- php4/ext/ircg/ircg.c:1.110 Tue Sep 18 18:27:18 2001 +++ php4/ext/ircg/ircg.c Thu Oct 11 19:32:59 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg.c,v 1.110 2001/09/18 22:27:18 sas Exp $ */ +/* $Id: ircg.c,v 1.111 2001/10/11 23:32:59 ssb Exp $ */ #include <time.h> @@ -1787,6 +1787,7 @@ /* }}} */ zend_module_entry ircg_module_entry = { + STANDARD_MODULE_HEADER, "ircg", ircg_functions, PHP_MINIT(ircg), @@ -1794,6 +1795,7 @@ NULL, NULL, PHP_MINFO(ircg), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.61 php4/ext/java/java.c:1.62 --- php4/ext/java/java.c:1.61 Wed Sep 26 04:35:41 2001 +++ php4/ext/java/java.c Thu Oct 11 19:33:00 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.61 2001/09/26 08:35:41 jeroen Exp $ */ +/* $Id: java.c,v 1.62 2001/10/11 23:33:00 ssb Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -631,14 +631,16 @@ } zend_module_entry java_module_entry = { - "java", - java_functions, - PHP_MINIT(java), - PHP_MSHUTDOWN(java), - NULL, - NULL, - PHP_MINFO(java), - STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "java", + java_functions, + PHP_MINIT(java), + PHP_MSHUTDOWN(java), + NULL, + NULL, + PHP_MINFO(java), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; ZEND_GET_MODULE(java) Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.99 php4/ext/ldap/ldap.c:1.100 --- php4/ext/ldap/ldap.c:1.99 Tue Oct 9 17:14:14 2001 +++ php4/ext/ldap/ldap.c Thu Oct 11 19:33:01 2001 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.99 2001/10/09 21:14:14 venaas Exp $ */ +/* $Id: ldap.c,v 1.100 2001/10/11 23:33:01 ssb Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -124,6 +124,7 @@ /* }}} */ zend_module_entry ldap_module_entry = { + STANDARD_MODULE_HEADER, "ldap", ldap_functions, PHP_MINIT(ldap), @@ -131,6 +132,7 @@ NULL, NULL, PHP_MINFO(ldap), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -255,7 +257,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.99 2001/10/09 21:14:14 venaas Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.100 2001/10/11 23:33:01 ssb Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION Index: php4/ext/mailparse/mailparse.c diff -u php4/ext/mailparse/mailparse.c:1.11 php4/ext/mailparse/mailparse.c:1.12 --- php4/ext/mailparse/mailparse.c:1.11 Tue Sep 25 17:58:02 2001 +++ php4/ext/mailparse/mailparse.c Thu Oct 11 19:33:01 2001 @@ -18,7 +18,7 @@ | the support routines for this extension were based upon. | +----------------------------------------------------------------------+ */ -/* $Id: mailparse.c,v 1.11 2001/09/25 21:58:02 jeroen Exp $ */ +/* $Id: mailparse.c,v 1.12 2001/10/11 23:33:01 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -66,6 +66,7 @@ }; zend_module_entry mailparse_module_entry = { + STANDARD_MODULE_HEADER, "mailparse", mailparse_functions, PHP_MINIT(mailparse), @@ -73,6 +74,7 @@ PHP_RINIT(mailparse), PHP_RSHUTDOWN(mailparse), PHP_MINFO(mailparse), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.31 php4/ext/mbstring/mbstring.c:1.32 --- php4/ext/mbstring/mbstring.c:1.31 Tue Sep 25 18:48:37 2001 +++ php4/ext/mbstring/mbstring.c Thu Oct 11 19:33:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.31 2001/09/25 22:48:37 jeroen Exp $ */ +/* $Id: mbstring.c,v 1.32 2001/10/11 23:33:02 ssb Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -131,6 +131,7 @@ }; zend_module_entry mbstring_module_entry = { + STANDARD_MODULE_HEADER, "mbstring", mbstring_functions, PHP_MINIT(mbstring), @@ -138,6 +139,7 @@ PHP_RINIT(mbstring), PHP_RSHUTDOWN(mbstring), PHP_MINFO(mbstring), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.48 php4/ext/mcal/php_mcal.c:1.49 --- php4/ext/mcal/php_mcal.c:1.48 Tue Oct 9 15:19:18 2001 +++ php4/ext/mcal/php_mcal.c Thu Oct 11 19:33:04 2001 @@ -111,7 +111,16 @@ }; zend_module_entry php_mcal_module_entry = { - "mcal", mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "mcal", + mcal_functions, + PHP_MINIT(mcal), + NULL, + NULL, + NULL, + PHP_MINFO(mcal), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_MCAL Index: php4/ext/mcrypt/mcrypt.c diff -u php4/ext/mcrypt/mcrypt.c:1.65 php4/ext/mcrypt/mcrypt.c:1.66 --- php4/ext/mcrypt/mcrypt.c:1.65 Tue Sep 25 18:48:38 2001 +++ php4/ext/mcrypt/mcrypt.c Thu Oct 11 19:33:04 2001 @@ -91,11 +91,13 @@ static PHP_MSHUTDOWN_FUNCTION(mcrypt); zend_module_entry mcrypt_module_entry = { + STANDARD_MODULE_HEADER, "mcrypt", mcrypt_functions, PHP_MINIT(mcrypt), PHP_MSHUTDOWN(mcrypt), NULL, NULL, PHP_MINFO(mcrypt), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; Index: php4/ext/mhash/mhash.c diff -u php4/ext/mhash/mhash.c:1.34 php4/ext/mhash/mhash.c:1.35 --- php4/ext/mhash/mhash.c:1.34 Sun Sep 9 09:28:56 2001 +++ php4/ext/mhash/mhash.c Thu Oct 11 19:33:09 2001 @@ -46,11 +46,13 @@ static PHP_MINIT_FUNCTION(mhash); zend_module_entry mhash_module_entry = { + STANDARD_MODULE_HEADER, "mhash", mhash_functions, PHP_MINIT(mhash), NULL, NULL, NULL, NULL, + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.21 php4/ext/ming/ming.c:1.22 --- php4/ext/ming/ming.c:1.21 Tue Oct 9 01:30:20 2001 +++ php4/ext/ming/ming.c Thu Oct 11 19:33:10 2001 @@ -2978,6 +2978,7 @@ zend_module_entry ming_module_entry = { + STANDARD_MODULE_HEADER, "ming", ming_functions, PHP_MINIT(ming), /* module init function */ @@ -2985,6 +2986,7 @@ PHP_RINIT(ming), /* request init function */ NULL, /* request shutdown function */ PHP_MINFO(ming), /* module info function */ + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/mnogosearch/php_mnogo.c diff -u php4/ext/mnogosearch/php_mnogo.c:1.40 php4/ext/mnogosearch/php_mnogo.c:1.41 --- php4/ext/mnogosearch/php_mnogo.c:1.40 Wed Oct 10 13:39:03 2001 +++ php4/ext/mnogosearch/php_mnogo.c Thu Oct 11 19:33:11 2001 @@ -1,5 +1,5 @@ /* $Source: /usr/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */ -/* $Id: php_mnogo.c,v 1.40 2001/10/10 17:39:03 gluke Exp $ */ +/* $Id: php_mnogo.c,v 1.41 2001/10/11 23:33:11 ssb Exp $ */ /* +----------------------------------------------------------------------+ @@ -159,6 +159,7 @@ /* }}} */ zend_module_entry mnogosearch_module_entry = { + STANDARD_MODULE_HEADER, "mnogosearch", mnogosearch_functions, PHP_MINIT(mnogosearch), @@ -166,6 +167,7 @@ PHP_RINIT(mnogosearch), NULL, PHP_MINFO(mnogosearch), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/msession/msession.c diff -u php4/ext/msession/msession.c:1.6 php4/ext/msession/msession.c:1.7 --- php4/ext/msession/msession.c:1.6 Wed Oct 10 20:36:23 2001 +++ php4/ext/msession/msession.c Thu Oct 11 19:33:14 2001 @@ -99,6 +99,7 @@ }; zend_module_entry msession_module_entry = { + STANDARD_MODULE_HEADER, "msession", msession_functions, PHP_MINIT(msession), @@ -106,6 +107,7 @@ PHP_RINIT(msession), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(msession),/* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(msession), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.44 php4/ext/msql/php_msql.c:1.45 --- php4/ext/msql/php_msql.c:1.44 Tue Sep 25 18:48:39 2001 +++ php4/ext/msql/php_msql.c Thu Oct 11 19:33:15 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.44 2001/09/25 22:48:39 jeroen Exp $ */ +/* $Id: php_msql.c,v 1.45 2001/10/11 23:33:15 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -103,8 +103,9 @@ /* }}} */ zend_module_entry msql_module_entry = { + STANDARD_MODULE_HEADER, "msql", msql_functions, PHP_MINIT(msql), NULL, PHP_RINIT(msql), NULL, - PHP_MINFO(msql), STANDARD_MODULE_PROPERTIES + PHP_MINFO(msql), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.69 php4/ext/mssql/php_mssql.c:1.70 --- php4/ext/mssql/php_mssql.c:1.69 Tue Sep 25 23:43:34 2001 +++ php4/ext/mssql/php_mssql.c Thu Oct 11 19:33:16 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.69 2001/09/26 03:43:34 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.70 2001/10/11 23:33:16 ssb Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -82,6 +82,7 @@ zend_module_entry mssql_module_entry = { + STANDARD_MODULE_HEADER, "mssql", mssql_functions, PHP_MINIT(mssql), @@ -89,6 +90,7 @@ PHP_RINIT(mssql), PHP_RSHUTDOWN(mssql), PHP_MINFO(mssql), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/muscat/muscat.c diff -u php4/ext/muscat/muscat.c:1.9 php4/ext/muscat/muscat.c:1.10 --- php4/ext/muscat/muscat.c:1.9 Sat Oct 6 16:13:36 2001 +++ php4/ext/muscat/muscat.c Thu Oct 11 19:33:16 2001 @@ -61,6 +61,7 @@ }; zend_module_entry muscat_module_entry = { + STANDARD_MODULE_HEADER, "muscat", muscat_functions, PHP_MINIT(muscat), @@ -68,6 +69,7 @@ PHP_RINIT(muscat), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(muscat), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(muscat), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.102 php4/ext/mysql/php_mysql.c:1.103 --- php4/ext/mysql/php_mysql.c:1.102 Mon Oct 8 02:28:16 2001 +++ php4/ext/mysql/php_mysql.c Thu Oct 11 19:33:18 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.102 2001/10/08 06:28:16 derick Exp $ */ +/* $Id: php_mysql.c,v 1.103 2001/10/11 23:33:18 ssb Exp $ */ /* TODO: @@ -182,8 +182,16 @@ /* {{{ mysql_module_entry */ zend_module_entry mysql_module_entry = { - "mysql", mysql_functions, ZEND_MODULE_STARTUP_N(mysql), PHP_MSHUTDOWN(mysql), PHP_RINIT(mysql), PHP_RSHUTDOWN(mysql), - PHP_MINFO(mysql), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "mysql", + mysql_functions, + ZEND_MODULE_STARTUP_N(mysql), + PHP_MSHUTDOWN(mysql), + PHP_RINIT(mysql), + PHP_RSHUTDOWN(mysql), + PHP_MINFO(mysql), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/ncurses/ncurses.c diff -u php4/ext/ncurses/ncurses.c:1.9 php4/ext/ncurses/ncurses.c:1.10 --- php4/ext/ncurses/ncurses.c:1.9 Mon Sep 17 17:59:14 2001 +++ php4/ext/ncurses/ncurses.c Thu Oct 11 19:33:19 2001 @@ -46,6 +46,7 @@ /* {{{ ncurses_module_entry */ zend_module_entry ncurses_module_entry = { + STANDARD_MODULE_HEADER, "ncurses", ncurses_functions, PHP_MINIT(ncurses), @@ -53,6 +54,7 @@ PHP_RINIT(ncurses), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(ncurses), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(ncurses), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/notes/php_notes.c diff -u php4/ext/notes/php_notes.c:1.8 php4/ext/notes/php_notes.c:1.9 --- php4/ext/notes/php_notes.c:1.8 Sat Oct 6 16:13:36 2001 +++ php4/ext/notes/php_notes.c Thu Oct 11 19:33:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_notes.c,v 1.8 2001/10/06 20:13:36 derick Exp $ */ +/* $Id: php_notes.c,v 1.9 2001/10/11 23:33:21 ssb Exp $ */ #ifdef COMPILE_DL_NOTES #define HAVE_NOTES 1 @@ -97,6 +97,7 @@ }; zend_module_entry notes_module_entry = { + STANDARD_MODULE_HEADER, "notes", notes_functions, PHP_MINIT(notes), @@ -104,6 +105,7 @@ PHP_RINIT(notes), PHP_RSHUTDOWN(notes), PHP_MINFO(notes), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.161 php4/ext/oci8/oci8.c:1.162 --- php4/ext/oci8/oci8.c:1.161 Sat Oct 6 16:13:36 2001 +++ php4/ext/oci8/oci8.c Thu Oct 11 19:33:21 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.161 2001/10/06 20:13:36 derick Exp $ */ +/* $Id: oci8.c,v 1.162 2001/10/11 23:33:21 ssb Exp $ */ /* TODO list: * @@ -386,6 +386,7 @@ #endif zend_module_entry oci8_module_entry = { + STANDARD_MODULE_HEADER, "oci8", /* extension name */ php_oci_functions, /* extension function list */ PHP_MINIT(oci), /* extension-wide startup function */ @@ -393,6 +394,7 @@ PHP_RINIT(oci), /* per-request startup function */ PHP_RSHUTDOWN(oci), /* per-request shutdown function */ PHP_MINFO(oci), /* information function */ + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -620,7 +622,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.161 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.162 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.110 php4/ext/odbc/php_odbc.c:1.111 --- php4/ext/odbc/php_odbc.c:1.110 Tue Sep 25 17:58:08 2001 +++ php4/ext/odbc/php_odbc.c Thu Oct 11 19:33:24 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.110 2001/09/25 21:58:08 jeroen Exp $ */ +/* $Id: php_odbc.c,v 1.111 2001/10/11 23:33:24 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -135,6 +135,7 @@ /* {{{ odbc_module_entry */ zend_module_entry odbc_module_entry = { + STANDARD_MODULE_HEADER, "odbc", odbc_functions, PHP_MINIT(odbc), @@ -142,6 +143,7 @@ PHP_RINIT(odbc), PHP_RSHUTDOWN(odbc), PHP_MINFO(odbc), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.28 php4/ext/odbc/velocis.c:1.29 --- php4/ext/odbc/velocis.c:1.28 Tue Sep 25 17:58:09 2001 +++ php4/ext/odbc/velocis.c Thu Oct 11 19:33:30 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.28 2001/09/25 21:58:09 jeroen Exp $ */ +/* $Id: velocis.c,v 1.29 2001/10/11 23:33:30 ssb Exp $ */ /* * TODO: @@ -65,8 +65,10 @@ }; zend_module_entry velocis_module_entry = { + STANDARD_MODULE_HEADER, "velocis", velocis_functions, PHP_MINIT(velocis), PHP_MSHUTDOWN(velocis), - PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), STANDARD_MODULE_PROPERTIES + PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.35 php4/ext/openssl/openssl.c:1.36 --- php4/ext/openssl/openssl.c:1.35 Fri Oct 5 11:56:41 2001 +++ php4/ext/openssl/openssl.c Thu Oct 11 19:33:31 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.35 2001/10/05 15:56:41 dbeu Exp $ */ +/* $Id: openssl.c,v 1.36 2001/10/11 23:33:31 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -115,6 +115,7 @@ /* {{{ openssl_module_entry */ zend_module_entry openssl_module_entry = { + STANDARD_MODULE_HEADER, "openssl", openssl_functions, PHP_MINIT(openssl), @@ -122,6 +123,7 @@ NULL, NULL, PHP_MINFO(openssl), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.75 php4/ext/oracle/oracle.c:1.76 --- php4/ext/oracle/oracle.c:1.75 Tue Sep 25 18:48:41 2001 +++ php4/ext/oracle/oracle.c Thu Oct 11 19:33:35 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.75 2001/09/25 22:48:41 jeroen Exp $ */ +/* $Id: oracle.c,v 1.76 2001/10/11 23:33:35 ssb Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -146,6 +146,7 @@ /* {{{ oracle_module_entry */ zend_module_entry oracle_module_entry = { + STANDARD_MODULE_HEADER, "oracle", oracle_functions, PHP_MINIT(oracle), /* extension-wide startup function */ @@ -153,6 +154,7 @@ PHP_RINIT(oracle), /* per-request startup function */ PHP_RSHUTDOWN(oracle), /* per-request shutdown function */ PHP_MINFO(oracle), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/ovrimos/ovrimos.c diff -u php4/ext/ovrimos/ovrimos.c:1.15 php4/ext/ovrimos/ovrimos.c:1.16 --- php4/ext/ovrimos/ovrimos.c:1.15 Sat Oct 6 16:13:37 2001 +++ php4/ext/ovrimos/ovrimos.c Thu Oct 11 19:33:36 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ovrimos.c,v 1.15 2001/10/06 20:13:37 derick Exp $ */ +/* $Id: ovrimos.c,v 1.16 2001/10/11 23:33:36 ssb Exp $ */ #include <php.h> #include <php_globals.h> @@ -1299,13 +1299,15 @@ /* }}} */ zend_module_entry ovrimos_module_entry = { - "Ovrimos", + STANDARD_MODULE_HEADER, + "ovrimos", ovrimos_functions, NULL, NULL, NULL, NULL, PHP_MINFO(ovrimos), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/pcntl/pcntl.c diff -u php4/ext/pcntl/pcntl.c:1.13 php4/ext/pcntl/pcntl.c:1.14 --- php4/ext/pcntl/pcntl.c:1.13 Tue Oct 2 23:48:27 2001 +++ php4/ext/pcntl/pcntl.c Thu Oct 11 19:33:37 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcntl.c,v 1.13 2001/10/03 03:48:27 jason Exp $ */ +/* $Id: pcntl.c,v 1.14 2001/10/11 23:33:37 ssb Exp $ */ #define PCNTL_DEBUG 0 @@ -55,12 +55,15 @@ }; zend_module_entry pcntl_module_entry = { - "pcntl", pcntl_functions, + STANDARD_MODULE_HEADER, + "pcntl", + pcntl_functions, PHP_MINIT(pcntl), PHP_MSHUTDOWN(pcntl), NULL, NULL, PHP_MINFO(pcntl), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.109 php4/ext/pcre/php_pcre.c:1.110 --- php4/ext/pcre/php_pcre.c:1.109 Sun Sep 9 09:29:03 2001 +++ php4/ext/pcre/php_pcre.c Thu Oct 11 19:33:38 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.109 2001/09/09 13:29:03 derick Exp $ */ +/* $Id: php_pcre.c,v 1.110 2001/10/11 23:33:38 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1364,13 +1364,16 @@ }; zend_module_entry pcre_module_entry = { - "pcre", pcre_functions, - PHP_MINIT(pcre), - PHP_MSHUTDOWN(pcre), - PHP_RINIT(pcre), - NULL, - PHP_MINFO(pcre), - STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "pcre", + pcre_functions, + PHP_MINIT(pcre), + PHP_MSHUTDOWN(pcre), + PHP_RINIT(pcre), + NULL, + PHP_MINFO(pcre), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_PCRE Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.101 php4/ext/pdf/pdf.c:1.102 --- php4/ext/pdf/pdf.c:1.101 Mon Oct 8 12:12:11 2001 +++ php4/ext/pdf/pdf.c Thu Oct 11 19:33:39 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.101 2001/10/08 16:12:11 rjs Exp $ */ +/* $Id: pdf.c,v 1.102 2001/10/11 23:33:39 ssb Exp $ */ /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ @@ -238,6 +238,7 @@ /* {{{ pdf_module_entry */ zend_module_entry pdf_module_entry = { + STANDARD_MODULE_HEADER, "pdf", pdf_functions, PHP_MINIT(pdf), @@ -245,6 +246,7 @@ NULL, NULL, PHP_MINFO(pdf), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -345,7 +347,7 @@ #else php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); #endif - php_info_print_table_row(2, "Revision", "$Revision: 1.101 $" ); + php_info_print_table_row(2, "Revision", "$Revision: 1.102 $" ); php_info_print_table_end(); } Index: php4/ext/pfpro/pfpro.c diff -u php4/ext/pfpro/pfpro.c:1.21 php4/ext/pfpro/pfpro.c:1.22 --- php4/ext/pfpro/pfpro.c:1.21 Tue Sep 25 18:48:41 2001 +++ php4/ext/pfpro/pfpro.c Thu Oct 11 19:33:40 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pfpro.c,v 1.21 2001/09/25 22:48:41 jeroen Exp $ */ +/* $Id: pfpro.c,v 1.22 2001/10/11 23:33:40 ssb Exp $ */ /* {{{ includes */ @@ -57,6 +57,7 @@ /* {{{ Zend module entry */ zend_module_entry pfpro_module_entry = { + STANDARD_MODULE_HEADER, "pfpro", pfpro_functions, PHP_MINIT(pfpro), @@ -64,6 +65,7 @@ PHP_RINIT(pfpro), /* request start */ PHP_RSHUTDOWN(pfpro), /* request end */ PHP_MINFO(pfpro), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.129 php4/ext/pgsql/pgsql.c:1.130 --- php4/ext/pgsql/pgsql.c:1.129 Wed Sep 26 17:44:48 2001 +++ php4/ext/pgsql/pgsql.c Thu Oct 11 19:33:40 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.129 2001/09/26 21:44:48 zeev Exp $ */ +/* $Id: pgsql.c,v 1.130 2001/10/11 23:33:40 ssb Exp $ */ #include <stdlib.h> @@ -101,6 +101,7 @@ /* {{{ pgsql_module_entry */ zend_module_entry pgsql_module_entry = { + STANDARD_MODULE_HEADER, "pgsql", pgsql_functions, PHP_MINIT(pgsql), @@ -108,6 +109,7 @@ PHP_RINIT(pgsql), PHP_RSHUTDOWN(pgsql), PHP_MINFO(pgsql), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/posix/posix.c diff -u php4/ext/posix/posix.c:1.35 php4/ext/posix/posix.c:1.36 --- php4/ext/posix/posix.c:1.35 Tue Sep 25 17:58:16 2001 +++ php4/ext/posix/posix.c Thu Oct 11 19:33:41 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.35 2001/09/25 21:58:16 jeroen Exp $ */ +/* $Id: posix.c,v 1.36 2001/10/11 23:33:41 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -110,6 +110,7 @@ /* {{{ posix_module_entry */ zend_module_entry posix_module_entry = { + STANDARD_MODULE_HEADER, "posix", posix_functions, NULL, @@ -117,6 +118,7 @@ NULL, NULL, PHP_MINFO(posix), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -130,7 +132,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.35 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.36 $"); php_info_print_table_end(); } /* }}} */ Index: php4/ext/printer/printer.c diff -u php4/ext/printer/printer.c:1.20 php4/ext/printer/printer.c:1.21 --- php4/ext/printer/printer.c:1.20 Tue Sep 25 17:58:16 2001 +++ php4/ext/printer/printer.c Thu Oct 11 19:33:42 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: printer.c,v 1.20 2001/09/25 21:58:16 jeroen Exp $ */ +/* $Id: printer.c,v 1.21 2001/10/11 23:33:42 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -88,6 +88,7 @@ }; zend_module_entry printer_module_entry = { + STANDARD_MODULE_HEADER, "printer", printer_functions, PHP_MINIT(printer), @@ -95,6 +96,7 @@ NULL, NULL, PHP_MINFO(printer), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -109,7 +111,7 @@ php_info_print_table_row(2, "Printer Support", "enabled"); php_info_print_table_row(2, "Default printing device", PRINTERG(default_printer) ? PRINTERG(default_printer) : "<b>not detected</b>"); php_info_print_table_row(2, "Module state", "working"); - php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.20 2001/09/25 21:58:16 jeroen Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.21 2001/10/11 23:33:42 ssb Exp $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); } Index: php4/ext/pspell/pspell.c diff -u php4/ext/pspell/pspell.c:1.22 php4/ext/pspell/pspell.c:1.23 --- php4/ext/pspell/pspell.c:1.22 Tue Sep 25 17:58:17 2001 +++ php4/ext/pspell/pspell.c Thu Oct 11 19:33:42 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.22 2001/09/25 21:58:17 jeroen Exp $ */ +/* $Id: pspell.c,v 1.23 2001/10/11 23:33:42 ssb Exp $ */ #define IS_EXT_MODULE @@ -71,7 +71,8 @@ static int le_pspell, le_pspell_config; zend_module_entry pspell_module_entry = { - "pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_PSPELL Index: php4/ext/qtdom/qtdom.c diff -u php4/ext/qtdom/qtdom.c:1.13 php4/ext/qtdom/qtdom.c:1.14 --- php4/ext/qtdom/qtdom.c:1.13 Tue Sep 25 17:58:17 2001 +++ php4/ext/qtdom/qtdom.c Thu Oct 11 19:33:43 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: qtdom.c,v 1.13 2001/09/25 21:58:17 jeroen Exp $ */ +/* $Id: qtdom.c,v 1.14 2001/10/11 23:33:43 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -53,6 +53,7 @@ }; zend_module_entry qtdom_module_entry = { + STANDARD_MODULE_HEADER, "qtdom", qtdom_functions, PHP_MINIT(qtdom), @@ -60,6 +61,7 @@ NULL, NULL, PHP_MINFO(qtdom), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/readline/readline.c diff -u php4/ext/readline/readline.c:1.24 php4/ext/readline/readline.c:1.25 --- php4/ext/readline/readline.c:1.24 Tue Sep 25 17:58:17 2001 +++ php4/ext/readline/readline.c Thu Oct 11 19:33:43 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.24 2001/09/25 21:58:17 jeroen Exp $ */ +/* $Id: readline.c,v 1.25 2001/10/11 23:33:43 ssb Exp $ */ /* {{{ includes & prototypes */ @@ -69,6 +69,7 @@ }; zend_module_entry readline_module_entry = { + STANDARD_MODULE_HEADER, "readline", php_readline_functions, PHP_MINIT(readline), @@ -76,6 +77,7 @@ NULL, PHP_RSHUTDOWN(readline), NULL, + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/recode/recode.c diff -u php4/ext/recode/recode.c:1.18 php4/ext/recode/recode.c:1.19 --- php4/ext/recode/recode.c:1.18 Tue Sep 25 17:58:17 2001 +++ php4/ext/recode/recode.c Thu Oct 11 19:33:44 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.18 2001/09/25 21:58:17 jeroen Exp $ */ +/* $Id: recode.c,v 1.19 2001/10/11 23:33:44 ssb Exp $ */ /* {{{ includes & prototypes */ @@ -54,13 +54,15 @@ }; zend_module_entry recode_module_entry = { - "Recode", + STANDARD_MODULE_HEADER, + "recode", php_recode_functions, PHP_MINIT(recode), PHP_MSHUTDOWN(recode), NULL, NULL, PHP_MINFO(recode), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -95,7 +97,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.18 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.19 $"); php_info_print_table_end(); } Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.57 php4/ext/sablot/sablot.c:1.58 --- php4/ext/sablot/sablot.c:1.57 Thu Oct 4 16:14:17 2001 +++ php4/ext/sablot/sablot.c Thu Oct 11 19:33:44 2001 @@ -195,6 +195,7 @@ }; zend_module_entry sablot_module_entry = { + STANDARD_MODULE_HEADER, "sablot", sablot_functions, PHP_MINIT(sablot), @@ -202,6 +203,7 @@ NULL, PHP_RSHUTDOWN(sablot), PHP_MINFO(sablot), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/satellite/php_orbit.c diff -u php4/ext/satellite/php_orbit.c:1.9 php4/ext/satellite/php_orbit.c:1.10 --- php4/ext/satellite/php_orbit.c:1.9 Tue Sep 25 17:58:18 2001 +++ php4/ext/satellite/php_orbit.c Thu Oct 11 19:33:44 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: php_orbit.c,v 1.9 2001/09/25 21:58:18 jeroen Exp $ + * $Id: php_orbit.c,v 1.10 2001/10/11 23:33:44 ssb Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -81,6 +81,7 @@ * module entry */ zend_module_entry satellite_module_entry = { + STANDARD_MODULE_HEADER, "satellite", satellite_functions, PHP_MINIT(satellite), /* module startup */ @@ -88,6 +89,7 @@ NULL, /* request startup */ NULL, /* request shutdown */ PHP_MINFO(satellite), /* module info */ + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/session/mod_mm.c diff -u php4/ext/session/mod_mm.c:1.23 php4/ext/session/mod_mm.c:1.24 --- php4/ext/session/mod_mm.c:1.23 Sun Sep 9 09:29:09 2001 +++ php4/ext/session/mod_mm.c Thu Oct 11 19:33:45 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_mm.c,v 1.23 2001/09/09 13:29:09 derick Exp $ */ +/* $Id: mod_mm.c,v 1.24 2001/10/11 23:33:45 ssb Exp $ */ #include "php.h" @@ -394,11 +394,13 @@ } zend_module_entry php_session_mm_module = { + STANDARD_MODULE_HEADER, "session mm", NULL, PHP_MINIT(ps_mm), PHP_MSHUTDOWN(ps_mm), NULL, NULL, NULL, + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.253 php4/ext/session/session.c:1.254 --- php4/ext/session/session.c:1.253 Fri Sep 21 09:38:44 2001 +++ php4/ext/session/session.c Thu Oct 11 19:33:45 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.253 2001/09/21 13:38:44 sas Exp $ */ +/* $Id: session.c,v 1.254 2001/10/11 23:33:45 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -222,11 +222,13 @@ static zend_bool php_session_destroy(TSRMLS_D); zend_module_entry session_module_entry = { + STANDARD_MODULE_HEADER, "session", session_functions, PHP_MINIT(session), PHP_MSHUTDOWN(session), PHP_RINIT(session), PHP_RSHUTDOWN(session), PHP_MINFO(session), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/shmop/shmop.c diff -u php4/ext/shmop/shmop.c:1.18 php4/ext/shmop/shmop.c:1.19 --- php4/ext/shmop/shmop.c:1.18 Tue Sep 25 17:58:19 2001 +++ php4/ext/shmop/shmop.c Thu Oct 11 19:33:46 2001 @@ -16,7 +16,7 @@ | Ilia Alshanetsky (iliaa@home.com) | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.18 2001/09/25 21:58:19 jeroen Exp $ */ +/* $Id: shmop.c,v 1.19 2001/10/11 23:33:46 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -61,6 +61,7 @@ /* {{{ shmop_module_entry */ zend_module_entry shmop_module_entry = { + STANDARD_MODULE_HEADER, "shmop", shmop_functions, PHP_MINIT(shmop), @@ -68,6 +69,7 @@ NULL, NULL, PHP_MINFO(shmop), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/skeleton/skeleton.c diff -u php4/ext/skeleton/skeleton.c:1.28 php4/ext/skeleton/skeleton.c:1.29 --- php4/ext/skeleton/skeleton.c:1.28 Sat Oct 6 00:39:37 2001 +++ php4/ext/skeleton/skeleton.c Thu Oct 11 19:33:46 2001 @@ -30,6 +30,7 @@ /* {{{ extname_module_entry */ zend_module_entry extname_module_entry = { + STANDARD_MODULE_HEADER, "extname", extname_functions, PHP_MINIT(extname), @@ -37,6 +38,7 @@ PHP_RINIT(extname), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(extname), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(extname), + "0.1", /* Replace with version number for your extension */ STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.51 php4/ext/snmp/snmp.c:1.52 --- php4/ext/snmp/snmp.c:1.51 Tue Sep 25 18:48:42 2001 +++ php4/ext/snmp/snmp.c Thu Oct 11 19:33:46 2001 @@ -17,7 +17,7 @@ | Steven Lawrance <slawrance@technologist.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.51 2001/09/25 22:48:42 jeroen Exp $ */ +/* $Id: snmp.c,v 1.52 2001/10/11 23:33:46 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -96,6 +96,7 @@ /* {{{ snmp_module_entry */ zend_module_entry snmp_module_entry = { + STANDARD_MODULE_HEADER, "snmp", snmp_functions, PHP_MINIT(snmp), @@ -103,6 +104,7 @@ NULL, NULL, PHP_MINFO(snmp), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/snmp/winsnmp.c diff -u php4/ext/snmp/winsnmp.c:1.12 php4/ext/snmp/winsnmp.c:1.13 --- php4/ext/snmp/winsnmp.c:1.12 Tue Sep 25 18:48:42 2001 +++ php4/ext/snmp/winsnmp.c Thu Oct 11 19:33:47 2001 @@ -33,7 +33,16 @@ /* {{{ snmp_module_entry */ zend_module_entry snmp_module_entry = { - "SNMP",snmp_functions,NULL,NULL,NULL,NULL,NULL,0,0,0,NULL + STANDARD_MODULE_HEADER, + "SNMP", + snmp_functions, + NULL, + NULL, + NULL, + NULL, + NULL, + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.70 php4/ext/sockets/sockets.c:1.71 --- php4/ext/sockets/sockets.c:1.70 Fri Oct 5 03:12:27 2001 +++ php4/ext/sockets/sockets.c Thu Oct 11 19:33:47 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.70 2001/10/05 07:12:27 sterling Exp $ */ +/* $Id: sockets.c,v 1.71 2001/10/11 23:33:47 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -152,6 +152,7 @@ /* }}} */ zend_module_entry sockets_module_entry = { + STANDARD_MODULE_HEADER, "sockets", sockets_functions, PHP_MINIT(sockets), @@ -159,6 +160,7 @@ NULL, NULL, PHP_MINFO(sockets), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.407 php4/ext/standard/basic_functions.c:1.408 --- php4/ext/standard/basic_functions.c:1.407 Thu Oct 11 06:35:59 2001 +++ php4/ext/standard/basic_functions.c Thu Oct 11 19:33:48 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.407 2001/10/11 10:35:59 ssb Exp $ */ +/* $Id: basic_functions.c,v 1.408 2001/10/11 23:33:48 ssb Exp $ */ #include "php.h" #include "php_main.h" @@ -833,6 +833,7 @@ zend_module_entry basic_functions_module = { + STANDARD_MODULE_HEADER, "standard", /* extension name */ basic_functions, /* function list */ PHP_MINIT(basic), /* process startup */ @@ -840,6 +841,7 @@ PHP_RINIT(basic), /* request startup */ PHP_RSHUTDOWN(basic), /* request shutdown */ PHP_MINFO(basic), /* extension info */ + PHP_VERSION, /* extension version */ STANDARD_MODULE_PROPERTIES }; Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.158 php4/ext/standard/info.c:1.159 --- php4/ext/standard/info.c:1.158 Sat Oct 6 16:13:37 2001 +++ php4/ext/standard/info.c Thu Oct 11 19:33:49 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.158 2001/10/06 20:13:37 derick Exp $ */ +/* $Id: info.c,v 1.159 2001/10/11 23:33:49 ssb Exp $ */ #include "php.h" #include "php_ini.h" @@ -473,15 +473,26 @@ /* }}} */ -/* {{{ proto string phpversion(void) +/* {{{ proto string phpversion([string extension]) Return the current PHP version */ PHP_FUNCTION(phpversion) { - if (ZEND_NUM_ARGS() != 0) { - WRONG_PARAM_COUNT; - } + zval **arg; + int argc = ZEND_NUM_ARGS(); - RETURN_STRING(PHP_VERSION, 1); + if (argc == 0) { + RETURN_STRING(PHP_VERSION, 1); + } else if (argc == 1 && zend_get_parameters_ex(1, &arg) == SUCCESS) { + char *version; + convert_to_string_ex(arg); + version = zend_get_module_version(Z_STRVAL_PP(arg)); + if (version == NULL) { + RETURN_FALSE; + } + RETURN_STRING(version, 1); + } else { + WRONG_PARAM_COUNT; + } } /* }}} */ Index: php4/ext/swf/swf.c diff -u php4/ext/swf/swf.c:1.42 php4/ext/swf/swf.c:1.43 --- php4/ext/swf/swf.c:1.42 Tue Sep 25 17:58:26 2001 +++ php4/ext/swf/swf.c Thu Oct 11 19:33:49 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: swf.c,v 1.42 2001/09/25 21:58:26 jeroen Exp $ */ +/* $Id: swf.c,v 1.43 2001/10/11 23:33:49 ssb Exp $ */ #ifdef HAVE_CONFIG_H @@ -111,6 +111,7 @@ /* {{{ swf_module_entry */ zend_module_entry swf_module_entry = { + STANDARD_MODULE_HEADER, "swf", swf_functions, PHP_MINIT(swf), @@ -118,6 +119,7 @@ PHP_RINIT(swf), NULL, PHP_MINFO(swf), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.33 php4/ext/sybase/php_sybase_db.c:1.34 --- php4/ext/sybase/php_sybase_db.c:1.33 Wed Sep 26 04:51:51 2001 +++ php4/ext/sybase/php_sybase_db.c Thu Oct 11 19:33:50 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.33 2001/09/26 08:51:51 jeroen Exp $ */ +/* $Id: php_sybase_db.c,v 1.34 2001/10/11 23:33:50 ssb Exp $ */ #ifdef HAVE_CONFIG_H @@ -123,7 +123,8 @@ }; zend_module_entry sybase_module_entry = { - "sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_SYBASE Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.66 php4/ext/sybase_ct/php_sybase_ct.c:1.67 --- php4/ext/sybase_ct/php_sybase_ct.c:1.66 Wed Sep 26 04:35:44 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Thu Oct 11 19:33:51 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.66 2001/09/26 08:35:44 jeroen Exp $ */ +/* $Id: php_sybase_ct.c,v 1.67 2001/10/11 23:33:51 ssb Exp $ */ #ifdef HAVE_CONFIG_H @@ -80,7 +80,8 @@ }; zend_module_entry sybase_module_entry = { - "sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; ZEND_DECLARE_MODULE_GLOBALS(sybase) Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.35 php4/ext/sysvsem/sysvsem.c:1.36 --- php4/ext/sysvsem/sysvsem.c:1.35 Tue Sep 25 17:58:28 2001 +++ php4/ext/sysvsem/sysvsem.c Thu Oct 11 19:33:51 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.35 2001/09/25 21:58:28 jeroen Exp $ */ +/* $Id: sysvsem.c,v 1.36 2001/10/11 23:33:51 ssb Exp $ */ /* Latest update build anc tested on Linux 2.2.14 * @@ -70,7 +70,8 @@ /* {{{ sysvsem_module_entry */ zend_module_entry sysvsem_module_entry = { - "sysvsem", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "sysvsem", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.48 php4/ext/sysvshm/sysvshm.c:1.49 --- php4/ext/sysvshm/sysvshm.c:1.48 Tue Sep 25 17:58:28 2001 +++ php4/ext/sysvshm/sysvshm.c Thu Oct 11 19:33:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.48 2001/09/25 21:58:28 jeroen Exp $ */ +/* $Id: sysvshm.c,v 1.49 2001/10/11 23:33:52 ssb Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -54,10 +54,12 @@ /* {{{ sysvshm_module_entry */ zend_module_entry sysvshm_module_entry = { + STANDARD_MODULE_HEADER, "sysvshm", sysvshm_functions, PHP_MINIT(sysvshm), NULL, NULL, NULL, NULL, + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/vpopmail/php_vpopmail.c diff -u php4/ext/vpopmail/php_vpopmail.c:1.20 php4/ext/vpopmail/php_vpopmail.c:1.21 --- php4/ext/vpopmail/php_vpopmail.c:1.20 Sun Sep 9 09:29:22 2001 +++ php4/ext/vpopmail/php_vpopmail.c Thu Oct 11 19:33:52 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_vpopmail.c,v 1.20 2001/09/09 13:29:22 derick Exp $ */ +/* $Id: php_vpopmail.c,v 1.21 2001/10/11 23:33:52 ssb Exp $ */ /* TODO: move to config.m4 when support for old versions is ready or just * don't support rather old vpopmail. current version must bail out if @@ -91,6 +91,7 @@ }; zend_module_entry vpopmail_module_entry = { + STANDARD_MODULE_HEADER, "vpopmail", vpopmail_functions, PHP_MINIT(vpopmail), @@ -98,6 +99,7 @@ PHP_RINIT(vpopmail), PHP_RSHUTDOWN(vpopmail), PHP_MINFO(vpopmail), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.83 php4/ext/wddx/wddx.c:1.84 --- php4/ext/wddx/wddx.c:1.83 Thu Sep 27 15:43:06 2001 +++ php4/ext/wddx/wddx.c Thu Oct 11 19:33:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.83 2001/09/27 19:43:06 jeroen Exp $ */ +/* $Id: wddx.c,v 1.84 2001/10/11 23:33:52 ssb Exp $ */ #include "php.h" #include "php_wddx.h" @@ -105,6 +105,7 @@ /* {{{ wddx_module_entry */ zend_module_entry wddx_module_entry = { + STANDARD_MODULE_HEADER, "wddx", wddx_functions, PHP_MINIT(wddx), @@ -112,6 +113,7 @@ NULL, NULL, PHP_MINFO(wddx), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.97 php4/ext/xml/xml.c:1.98 --- php4/ext/xml/xml.c:1.97 Tue Sep 25 18:48:44 2001 +++ php4/ext/xml/xml.c Thu Oct 11 19:33:53 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.97 2001/09/25 22:48:44 jeroen Exp $ */ +/* $Id: xml.c,v 1.98 2001/10/11 23:33:53 ssb Exp $ */ #define IS_EXT_MODULE @@ -130,6 +130,7 @@ }; zend_module_entry xml_module_entry = { + STANDARD_MODULE_HEADER, "xml", /* extension name */ xml_functions, /* extension function list */ PHP_MINIT(xml), /* extension-wide startup function */ @@ -137,6 +138,7 @@ PHP_RINIT(xml), /* per-request startup function */ PHP_RSHUTDOWN(xml), /* per-request shutdown function */ PHP_MINFO(xml), /* information function */ + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/xmlrpc/xmlrpc-epi-php.c diff -u php4/ext/xmlrpc/xmlrpc-epi-php.c:1.5 php4/ext/xmlrpc/xmlrpc-epi-php.c:1.6 --- php4/ext/xmlrpc/xmlrpc-epi-php.c:1.5 Wed Sep 26 04:53:36 2001 +++ php4/ext/xmlrpc/xmlrpc-epi-php.c Thu Oct 11 19:33:54 2001 @@ -57,6 +57,8 @@ #include "php_xmlrpc.h" #include "xmlrpc.h" +#define PHP_EXT_VERSION "0.41" + /* You should tweak config.m4 so this symbol (or some else suitable) gets defined. */ @@ -88,6 +90,7 @@ }; zend_module_entry xmlrpc_module_entry = { + STANDARD_MODULE_HEADER, "xmlrpc", xmlrpc_functions, PHP_MINIT(xmlrpc), @@ -95,6 +98,7 @@ PHP_RINIT(xmlrpc), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(xmlrpc), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(xmlrpc), + PHP_EXT_VERSION, STANDARD_MODULE_PROPERTIES }; @@ -134,8 +138,6 @@ xmlrpc_server_data* server; char php_executed; } xmlrpc_callback_data; - -#define PHP_EXT_VERSION "0.41" // output options #define OUTPUT_TYPE_KEY "output_type" Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.24 php4/ext/xslt/sablot.c:1.25 --- php4/ext/xslt/sablot.c:1.24 Sat Sep 15 12:05:36 2001 +++ php4/ext/xslt/sablot.c Thu Oct 11 19:33:54 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.24 2001/09/15 16:05:36 sterling Exp $ */ +/* $Id: sablot.c,v 1.25 2001/10/11 23:33:54 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -95,6 +95,7 @@ /* {{{ xslt_module_entry */ zend_module_entry xslt_module_entry = { + STANDARD_MODULE_HEADER, "xslt", xslt_functions, PHP_MINIT(xslt), @@ -102,6 +103,7 @@ NULL, NULL, PHP_MINFO(xslt), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/yaz/php_yaz.c diff -u php4/ext/yaz/php_yaz.c:1.31 php4/ext/yaz/php_yaz.c:1.32 --- php4/ext/yaz/php_yaz.c:1.31 Thu Sep 27 16:01:15 2001 +++ php4/ext/yaz/php_yaz.c Thu Oct 11 19:33:55 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaz.c,v 1.31 2001/09/27 20:01:15 jeroen Exp $ */ +/* $Id: php_yaz.c,v 1.32 2001/10/11 23:33:55 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2678,6 +2678,7 @@ } zend_module_entry yaz_module_entry = { + STANDARD_MODULE_HEADER, "yaz", yaz_functions, PHP_MINIT(yaz), @@ -2685,6 +2686,7 @@ PHP_RINIT(yaz), PHP_RSHUTDOWN(yaz), PHP_MINFO(yaz), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/yp/yp.c diff -u php4/ext/yp/yp.c:1.29 php4/ext/yp/yp.c:1.30 --- php4/ext/yp/yp.c:1.29 Sun Sep 9 09:29:24 2001 +++ php4/ext/yp/yp.c Thu Oct 11 19:33:55 2001 @@ -16,7 +16,7 @@ | Fredrik Ohrn | +----------------------------------------------------------------------+ */ -/* $Id: yp.c,v 1.29 2001/09/09 13:29:24 derick Exp $ */ +/* $Id: yp.c,v 1.30 2001/10/11 23:33:55 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -56,6 +56,7 @@ }; zend_module_entry yp_module_entry = { + STANDARD_MODULE_HEADER, "yp", yp_functions, PHP_MINIT(yp), @@ -63,6 +64,7 @@ PHP_RINIT(yp), NULL, PHP_MINFO(yp), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/zip/zip.c diff -u php4/ext/zip/zip.c:1.21 php4/ext/zip/zip.c:1.22 --- php4/ext/zip/zip.c:1.21 Wed Sep 26 08:44:34 2001 +++ php4/ext/zip/zip.c Thu Oct 11 19:33:56 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zip.c,v 1.21 2001/09/26 12:44:34 derick Exp $ */ +/* $Id: zip.c,v 1.22 2001/10/11 23:33:56 ssb Exp $ */ #include "php.h" #include "php_ini.h" @@ -56,6 +56,7 @@ /* {{{ zip_module_entry */ zend_module_entry zip_module_entry = { + STANDARD_MODULE_HEADER, "zip", zip_functions, PHP_MINIT(zip), @@ -63,6 +64,7 @@ NULL, NULL, PHP_MINFO(zip), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.98 php4/ext/zlib/zlib.c:1.99 --- php4/ext/zlib/zlib.c:1.98 Tue Sep 25 18:48:44 2001 +++ php4/ext/zlib/zlib.c Thu Oct 11 19:33:56 2001 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.98 2001/09/25 22:48:44 jeroen Exp $ */ +/* $Id: zlib.c,v 1.99 2001/10/11 23:33:56 ssb Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -112,6 +112,7 @@ /* {{{ php_zlib_module_entry */ zend_module_entry php_zlib_module_entry = { + STANDARD_MODULE_HEADER, "zlib", php_zlib_functions, PHP_MINIT(zlib), @@ -119,6 +120,7 @@ PHP_RINIT(zlib), NULL, PHP_MINFO(zlib), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ Index: php4/README.EXTENSIONS +++ php4/README.EXTENSIONS Between PHP 4.0.6 and 4.1.0, the Zend module struct changed in a way that broke both source and binary compatibility. If you are maintaining a third party extension, here's how to update it: If this was your old module entry: zend_module_entry foo_module_entry = { "foo", /* extension name */ foo_functions, /* extension function list */ NULL, /* extension-wide startup function */ NULL, /* extension-wide shutdown function */ PHP_RINIT(foo), /* per-request startup function */ PHP_RSHUTDOWN(foo), /* per-request shutdown function */ PHP_MINFO(foo), /* information function */ STANDARD_MODULE_PROPERTIES }; Here's how it should look if you want your code to build with PHP 4.1.0 and up: zend_module_entry foo_module_entry = { #if ZEND_MODULE_API_NO >= 20010901 STANDARD_MODULE_HEADER, #endif "foo", /* extension name */ foo_functions, /* extension function list */ NULL, /* extension-wide startup function */ NULL, /* extension-wide shutdown function */ PHP_RINIT(foo), /* per-request startup function */ PHP_RSHUTDOWN(foo), /* per-request shutdown function */ PHP_MINFO(foo), /* information function */ #if ZEND_MODULE_API_NO >= 20010901 FOO_VERSION, /* extension version number (string) */ #endif STANDARD_MODULE_PROPERTIES }; If you don't care about source compatibility with earlier PHP releases than 4.1.0, you can drop the #if/#endif lines.