diff options
38 files changed, 47 insertions, 45 deletions
diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c index 0721628b4d..74d8a73df1 100644 --- a/ext/aspell/aspell.c +++ b/ext/aspell/aspell.c @@ -42,7 +42,7 @@ function_entry aspell_functions[] = { 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 + "aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/cybercash/cybercash.c b/ext/cybercash/cybercash.c index bc49c5aa3a..17970417a0 100644 --- a/ext/cybercash/cybercash.c +++ b/ext/cybercash/cybercash.c @@ -44,7 +44,7 @@ function_entry cybercash_functions[] = { }; zend_module_entry cybercash_module_entry = { - "CyberCash", + "cybercash", cybercash_functions, NULL,NULL, NULL,NULL, diff --git a/ext/dav/dav.c b/ext/dav/dav.c index f82385968a..89a6c27ca8 100644 --- a/ext/dav/dav.c +++ b/ext/dav/dav.c @@ -88,7 +88,7 @@ function_entry phpdav_functions[] = { }; zend_module_entry phpdav_module_entry = { - "DAV", /* extension name */ + "dav", /* extension name */ phpdav_functions, /* extension function list */ PHP_MINIT(phpdav), /* extension-wide startup function */ PHP_MSHUTDOWN(phpdav), /* extension-wide shutdown function */ diff --git a/ext/db/db.c b/ext/db/db.c index 0373c3b27b..ea6b9e194f 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -1133,7 +1133,7 @@ function_entry dbm_functions[] = { }; zend_module_entry dbm_module_entry = { - "DBM", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES + "db", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL diff --git a/ext/dba/dba.c b/ext/dba/dba.c index c59b0a3a70..6e40c9c8e9 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -63,12 +63,12 @@ static PHP_MSHUTDOWN_FUNCTION(dba); static PHP_MINFO_FUNCTION(dba); zend_module_entry dba_module_entry = { - "DataBase API", dba_functions, - PHP_MINIT(dba), - PHP_MSHUTDOWN(dba), - NULL, NULL, - PHP_MINFO(dba), - STANDARD_MODULE_PROPERTIES + "dba", dba_functions, + PHP_MINIT(dba), + PHP_MSHUTDOWN(dba), + NULL, NULL, + PHP_MINFO(dba), + STANDARD_MODULE_PROPERTIES }; typedef struct dba_handler { diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c index a2c7836ca3..c7222fdc9c 100644 --- a/ext/dbase/dbase.c +++ b/ext/dbase/dbase.c @@ -726,7 +726,7 @@ function_entry dbase_functions[] = { }; zend_module_entry dbase_module_entry = { - "DBase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + "dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/domxml/domxml.c b/ext/domxml/domxml.c index 70e12ebaa5..87e9adf9ec 100644 --- a/ext/domxml/domxml.c +++ b/ext/domxml/domxml.c @@ -98,7 +98,7 @@ void domxmltestnode_class_startup(); #endif zend_module_entry php_domxml_module_entry = { - "DOM", php_domxml_functions, PHP_MINIT(domxml), NULL, NULL, NULL, PHP_MINFO(domxml), STANDARD_MODULE_PROPERTIES + "domxml", php_domxml_functions, PHP_MINIT(domxml), NULL, NULL, NULL, PHP_MINFO(domxml), STANDARD_MODULE_PROPERTIES }; void _free_node(xmlNode *tmp) { diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c index 1b025d256c..e8d2dfc7cf 100644 --- a/ext/filepro/filepro.c +++ b/ext/filepro/filepro.c @@ -132,7 +132,7 @@ function_entry filepro_functions[] = { }; zend_module_entry filepro_module_entry = { - "FilePro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + "filepro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index a4f843ffb8..70859376e3 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -68,7 +68,7 @@ function_entry php_ftp_functions[] = { }; zend_module_entry php_ftp_module_entry = { - "FTP Functions", + "ftp", php_ftp_functions, PHP_MINIT(ftp), NULL, diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index c08d1fd607..af03df7ab0 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -116,7 +116,7 @@ function_entry hw_functions[] = { }; zend_module_entry hw_module_entry = { - "HyperWave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), 0, 0, 0, NULL + "hyperwave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), 0, 0, 0, NULL }; #ifdef ZTS diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c index 518b7dfe94..74d86a4be0 100644 --- a/ext/icap/php_icap.c +++ b/ext/icap/php_icap.c @@ -95,7 +95,7 @@ function_entry icap_functions[] = { zend_module_entry php_icap_module_entry = { - CALVER, icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL + "icap", icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL }; @@ -940,5 +940,3 @@ void cc_vdlog(const char *fmt,va_list ap) * c-basic-offset: 4 * End: */ - - diff --git a/ext/imap/imap.c b/ext/imap/imap.c index 38a0edb8b1..539405695d 100644 --- a/ext/imap/imap.c +++ b/ext/imap/imap.c @@ -195,7 +195,7 @@ function_entry imap_functions[] = { zend_module_entry imap_module_entry = { - IMAPVER, imap_functions, PHP_MINIT(imap), NULL, PHP_RINIT(imap), PHP_RSHUTDOWN(imap),PHP_MINFO(imap), STANDARD_MODULE_PROPERTIES + "imap", imap_functions, PHP_MINIT(imap), NULL, PHP_RINIT(imap), PHP_RSHUTDOWN(imap),PHP_MINFO(imap), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index b023846338..5be769ccea 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -48,7 +48,7 @@ function_entry ibase_functions[] = { zend_module_entry ibase_module_entry = { - "InterBase", + "interbase", ibase_functions, PHP_MINIT(ibase), NULL, diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 55ebad97ff..d9ebd79f6a 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -98,7 +98,7 @@ function_entry ldap_functions[] = { zend_module_entry ldap_module_entry = { - "LDAP", ldap_functions, PHP_MINIT(ldap), PHP_MSHUTDOWN(ldap), NULL, NULL, + "ldap", ldap_functions, PHP_MINIT(ldap), PHP_MSHUTDOWN(ldap), NULL, NULL, PHP_MINFO(ldap), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c index 7329f10221..d266e8ed50 100644 --- a/ext/mcal/php_mcal.c +++ b/ext/mcal/php_mcal.c @@ -121,7 +121,7 @@ function_entry mcal_functions[] = { }; zend_module_entry php_mcal_module_entry = { - "Modular Calendar Access Library", mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), STANDARD_MODULE_PROPERTIES + "mcal", mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index 396a385649..8d8326ba98 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -101,7 +101,7 @@ function_entry msql_functions[] = { zend_module_entry msql_module_entry = { - "mSQL", msql_functions, PHP_MINIT(msql), NULL, PHP_RINIT(msql), NULL, + "msql", msql_functions, PHP_MINIT(msql), NULL, PHP_RINIT(msql), NULL, PHP_MINFO(msql), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index a0fea89765..eefe1133c8 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -63,7 +63,7 @@ function_entry mssql_functions[] = { }; zend_module_entry mssql_module_entry = { - "Microsoft SQL Server", + "mssql", mssql_functions, PHP_MINIT(mssql), PHP_MSHUTDOWN(mssql), diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index d04730f8d9..e9af97760e 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -146,7 +146,7 @@ function_entry mysql_functions[] = { }; zend_module_entry mysql_module_entry = { - "MySQL", mysql_functions, PHP_MINIT(mysql), PHP_MSHUTDOWN(mysql), PHP_RINIT(mysql), NULL, + "mysql", mysql_functions, PHP_MINIT(mysql), PHP_MSHUTDOWN(mysql), PHP_RINIT(mysql), NULL, PHP_MINFO(mysql), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 071ec418d3..fb0287e23b 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -277,7 +277,7 @@ static zend_function_entry php_oci_lob_class_functions[] = { }; zend_module_entry oci8_module_entry = { - "Oracle-OCI8", /* extension name */ + "oci8", /* extension name */ php_oci_functions, /* extension function list */ PHP_MINIT(oci), /* extension-wide startup function */ PHP_MSHUTDOWN(oci), /* extension-wide shutdown function */ diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 9dfd749870..366b7309c2 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -26,12 +26,16 @@ #include "php.h" #include "php_globals.h" + #include "ext/standard/info.h" + #include "ext/standard/php_string.h" #include "ext/standard/php_standard.h" + #include "php_odbc.h" #include "php_globals.h" + #if HAVE_UODBC #include <fcntl.h> @@ -112,7 +116,7 @@ function_entry odbc_functions[] = { }; zend_module_entry odbc_module_entry = { - "ODBC", + "odbc", odbc_functions, PHP_MINIT(odbc), PHP_MSHUTDOWN(odbc), diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c index 5bc7a1b528..faf53bc624 100644 --- a/ext/odbc/velocis.c +++ b/ext/odbc/velocis.c @@ -60,7 +60,7 @@ function_entry velocis_functions[] = { }; zend_module_entry velocis_module_entry = { - "Velocis", velocis_functions, PHP_MINIT(velocis), PHP_MSHUTDOWN(velocis), + "velocis", velocis_functions, PHP_MINIT(velocis), PHP_MSHUTDOWN(velocis), PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c index 68f0a5c3b6..b9993f7565 100644 --- a/ext/oracle/oracle.c +++ b/ext/oracle/oracle.c @@ -137,7 +137,7 @@ function_entry oracle_functions[] = { }; zend_module_entry oracle_module_entry = { - "Oracle", + "oracle", oracle_functions, PHP_MINIT(oracle), /* extension-wide startup function */ PHP_MSHUTDOWN(oracle), /* extension-wide shutdown function */ diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 55cc0da7e5..feb19cd12c 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1200,7 +1200,7 @@ function_entry pcre_functions[] = { }; zend_module_entry pcre_module_entry = { - "PCRE", pcre_functions, + "pcre", pcre_functions, PHP_MINIT(pcre), PHP_MSHUTDOWN(pcre), PHP_RINIT(pcre), diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 7c9f741bf1..7deb024a7d 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -76,7 +76,7 @@ function_entry pgsql_functions[] = { }; zend_module_entry pgsql_module_entry = { - "PostgreSQL", pgsql_functions, PHP_MINIT(pgsql), PHP_MSHUTDOWN(pgsql), PHP_RINIT(pgsql), NULL, NULL, STANDARD_MODULE_PROPERTIES + "pgsql", pgsql_functions, PHP_MINIT(pgsql), PHP_MSHUTDOWN(pgsql), PHP_RINIT(pgsql), NULL, NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 1dd6f7eae9..5d8e2c38c1 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -118,7 +118,7 @@ function_entry posix_functions[] = { static PHP_MINFO_FUNCTION(posix); zend_module_entry posix_module_entry = { - "Posix", + "posix", posix_functions, NULL, NULL, diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 350b6c289b..1d64bdc110 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -59,7 +59,7 @@ static zend_function_entry php_readline_functions[] = { }; zend_module_entry readline_module_entry = { - "PHP-Readline", + "readline", php_readline_functions, PHP_MINIT(readline), NULL, diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c index 29ced46fd3..8d64ffcbc3 100644 --- a/ext/rpc/com/COM.c +++ b/ext/rpc/com/COM.c @@ -73,7 +73,7 @@ static PHP_MINFO_FUNCTION(COM) zend_module_entry COM_module_entry = { - "Win32 COM", COM_functions, PHP_MINIT(COM), PHP_MSHUTDOWN(COM), NULL, NULL, PHP_MINFO(COM), STANDARD_MODULE_PROPERTIES + "com", COM_functions, PHP_MINIT(COM), PHP_MSHUTDOWN(COM), NULL, NULL, PHP_MINFO(COM), STANDARD_MODULE_PROPERTIES }; void php_register_COM_class(); diff --git a/ext/session/session.c b/ext/session/session.c index f69f9ae2aa..ceb5a7b28b 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -109,7 +109,7 @@ static void php_rinit_session_globals(PSLS_D); static void php_rshutdown_session_globals(PSLS_D); zend_module_entry session_module_entry = { - "Session Management", + "session", session_functions, PHP_MINIT(session), PHP_MSHUTDOWN(session), PHP_RINIT(session), PHP_RSHUTDOWN(session), diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 799a7208ca..1a075c70a2 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -85,7 +85,7 @@ function_entry snmp_functions[] = { }; zend_module_entry snmp_module_entry = { - "SNMP",snmp_functions,PHP_MINIT(snmp),NULL,NULL,NULL,PHP_MINFO(snmp),STANDARD_MODULE_PROPERTIES + "snmp",snmp_functions,PHP_MINIT(snmp),NULL,NULL,NULL,PHP_MINFO(snmp),STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7c43c1a22e..895a6cbf32 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -353,7 +353,7 @@ PHP_INI_END() zend_module_entry basic_functions_module = { - "Basic Functions", /* extension name */ + "standard", /* extension name */ basic_functions, /* function list */ PHP_MINIT(basic), /* process startup */ PHP_MSHUTDOWN(basic), /* process shutdown */ diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c index f70ae251d6..c90212b2d5 100644 --- a/ext/sybase/sybase.c +++ b/ext/sybase/sybase.c @@ -79,7 +79,7 @@ function_entry sybase_functions[] = { }; zend_module_entry sybase_module_entry = { - "Sybase SQL", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES + "sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index eef76907b0..08cd465dab 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -69,7 +69,7 @@ function_entry sybase_functions[] = { }; zend_module_entry sybase_module_entry = { - "Sybase SQL - CT", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES + "sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index 20618b5be1..2a1442bc02 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -57,7 +57,7 @@ function_entry sysvsem_functions[] = { }; zend_module_entry sysvsem_module_entry = { - "System V semaphores", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + "sysvsem", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index f3371de259..f5c6cad21c 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -42,7 +42,7 @@ function_entry sysvshm_functions[] = { }; zend_module_entry sysvshm_module_entry = { - "System V Shared-Memory", sysvshm_functions, + "sysvshm", sysvshm_functions, PHP_MINIT(sysvshm), NULL, NULL, NULL, NULL, diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 0f75b69021..e0d48c3c0d 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -109,7 +109,7 @@ function_entry wddx_functions[] = { }; zend_module_entry wddx_module_entry = { - "WDDX", wddx_functions, php_minit_wddx, NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + "wddx", wddx_functions, php_minit_wddx, NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 5c274acf49..4579f8476c 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -123,7 +123,7 @@ function_entry xml_functions[] = { }; zend_module_entry xml_module_entry = { - "XML", /* extension name */ + "xml", /* extension name */ xml_functions, /* extension function list */ PHP_MINIT(xml), /* extension-wide startup function */ PHP_MSHUTDOWN(xml), /* extension-wide shutdown function */ diff --git a/ext/yp/yp.c b/ext/yp/yp.c index c1e747f80f..40fbf44a68 100644 --- a/ext/yp/yp.c +++ b/ext/yp/yp.c @@ -36,7 +36,7 @@ function_entry yp_functions[] = { }; zend_module_entry yp_module_entry = { - "YP", + "yp", yp_functions, NULL, NULL, diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index 85c9a5c5f0..4ca8a2de3e 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -116,7 +116,7 @@ static PHP_MSHUTDOWN_FUNCTION(apache) zend_module_entry apache_module_entry = { - "Apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES + "apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES }; /* {{{ proto string apache_note(string note_name [, string note_value]) |