Permalink
Browse files

* zend_module_entry change: apino, debug and zts are moved first,

  see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)
  • Loading branch information...
1 parent 4051420 commit 689252082c2660e2b6fddc674047922d8b2c7845 Stig Bakken committed Oct 11, 2001
Showing with 392 additions and 72 deletions.
  1. +39 −0 README.EXTENSIONS
  2. +2 −1 ext/aspell/aspell.c
  3. +3 −1 ext/bcmath/bcmath.c
  4. +2 −0 ext/calendar/calendar.c
  5. +4 −2 ext/ccvs/ccvs.c
  6. +18 −1 ext/com/COM.c
  7. +10 −1 ext/cpdf/cpdf.c
  8. +2 −0 ext/crack/crack.c
  9. +2 −0 ext/ctype/ctype.c
  10. +2 −0 ext/curl/curl.c
  11. +2 −0 ext/cybercash/cybercash.c
  12. +2 −0 ext/cybermut/cybermut.c
  13. +2 −0 ext/cyrus/cyrus.c
  14. +10 −1 ext/db/db.c
  15. +6 −2 ext/dba/dba.c
  16. +2 −1 ext/dbase/dbase.c
  17. +2 −0 ext/dbplus/dbplus.c
  18. +2 −0 ext/dbx/dbx.c
  19. +2 −0 ext/domxml/php_domxml.c
  20. +2 −1 ext/dotnet/dotnet.cpp
  21. +2 −0 ext/exif/exif.c
  22. +10 −8 ext/fbsql/php_fbsql.c
  23. +2 −0 ext/fdf/fdf.c
  24. +2 −1 ext/filepro/filepro.c
  25. +2 −0 ext/fribidi/fribidi.c
  26. +10 −0 ext/ftp/php_ftp.c
  27. +10 −1 ext/gd/gd.c
  28. +2 −0 ext/gettext/gettext.c
  29. +2 −0 ext/gmp/gmp.c
  30. +2 −1 ext/hyperwave/hw.c
  31. +10 −1 ext/icap/php_icap.c
  32. +2 −0 ext/iconv/iconv.c
  33. +4 −1 ext/imap/php_imap.c
  34. +2 −0 ext/informix/ifx.ec
  35. +3 −1 ext/ingres_ii/ii.c
  36. +2 −0 ext/interbase/interbase.c
  37. +10 −8 ext/java/java.c
  38. +2 −0 ext/ldap/ldap.c
  39. +2 −0 ext/mailparse/mailparse.c
  40. +2 −0 ext/mbstring/mbstring.c
  41. +10 −1 ext/mcal/php_mcal.c
  42. +2 −0 ext/mcrypt/mcrypt.c
  43. +2 −0 ext/mhash/mhash.c
  44. +2 −0 ext/ming/ming.c
  45. +2 −0 ext/mnogosearch/php_mnogo.c
  46. +2 −0 ext/msession/msession.c
  47. +2 −1 ext/msql/php_msql.c
  48. +2 −0 ext/mssql/php_mssql.c
  49. +2 −0 ext/muscat/muscat.c
  50. +10 −2 ext/mysql/php_mysql.c
  51. +2 −0 ext/ncurses/ncurses.c
  52. +2 −0 ext/notes/php_notes.c
  53. +2 −0 ext/oci8/oci8.c
  54. +2 −0 ext/odbc/php_odbc.c
  55. +3 −1 ext/odbc/velocis.c
  56. +2 −0 ext/openssl/openssl.c
  57. +2 −0 ext/oracle/oracle.c
  58. +3 −1 ext/ovrimos/ovrimos.c
  59. +4 −1 ext/pcntl/pcntl.c
  60. +10 −7 ext/pcre/php_pcre.c
  61. +2 −0 ext/pdf/pdf.c
  62. +2 −0 ext/pfpro/pfpro.c
  63. +2 −0 ext/pgsql/pgsql.c
  64. +2 −0 ext/posix/posix.c
  65. +2 −1 ext/pspell/pspell.c
  66. +2 −0 ext/qtdom/qtdom.c
  67. +2 −0 ext/readline/readline.c
  68. +3 −1 ext/recode/recode.c
  69. +18 −1 ext/rpc/com/com_wrapper.c
  70. +2 −1 ext/rpc/dotnet/dotnet.cpp
  71. +10 −8 ext/rpc/java/java.c
  72. +4 −2 ext/rpc/xmlrpc/xmlrpc-epi-php.c
  73. +2 −0 ext/sablot/sablot.c
  74. +2 −0 ext/satellite/php_orbit.c
  75. +2 −0 ext/session/mod_mm.c
  76. +2 −0 ext/session/session.c
  77. +2 −0 ext/shmop/shmop.c
  78. +2 −0 ext/skeleton/skeleton.c
  79. +2 −0 ext/snmp/snmp.c
  80. +10 −1 ext/snmp/winsnmp.c
  81. +2 −0 ext/sockets/sockets.c
  82. +2 −0 ext/standard/basic_functions.c
  83. +16 −5 ext/standard/info.c
  84. +2 −0 ext/swf/swf.c
  85. +2 −1 ext/sybase/php_sybase_db.c
  86. +2 −1 ext/sybase_ct/php_sybase_ct.c
  87. +2 −1 ext/sysvsem/sysvsem.c
  88. +2 −0 ext/sysvshm/sysvshm.c
  89. +2 −0 ext/vpopmail/php_vpopmail.c
  90. +2 −0 ext/wddx/wddx.c
  91. +2 −0 ext/xml/xml.c
  92. +4 −2 ext/xmlrpc/xmlrpc-epi-php.c
  93. +2 −0 ext/xslt/sablot.c
  94. +2 −0 ext/yaz/php_yaz.c
  95. +2 −0 ext/yp/yp.c
  96. +2 −0 ext/zip/zip.c
  97. +2 −0 ext/zlib/zlib.c
View
@@ -0,0 +1,39 @@
+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.
View
@@ -51,7 +51,8 @@ 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
+ 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
View
@@ -44,13 +44,15 @@ function_entry bcmath_functions[] = {
};
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
};
View
@@ -57,13 +57,15 @@ function_entry calendar_functions[] = {
zend_module_entry calendar_module_entry = {
+ STANDARD_MODULE_HEADER,
"calendar",
calendar_functions,
PHP_MINIT(calendar),
NULL,
NULL,
NULL,
PHP_MINFO(calendar),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES,
};
View
@@ -97,15 +97,17 @@ static char const cvsid[] = "$Id$";
/* 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) */
View
@@ -1810,7 +1810,16 @@ PHP_MSHUTDOWN_FUNCTION(COM)
/* 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 @@ PHPAPI int php_COM_get_le_comval()
}
#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
View
@@ -155,7 +155,16 @@ function_entry cpdf_functions[] = {
};
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
View
@@ -43,13 +43,15 @@ function_entry crack_functions[] = {
};
zend_module_entry crack_module_entry = {
+ STANDARD_MODULE_HEADER,
"crack",
crack_functions,
ZEND_MODULE_STARTUP_N(crack),
ZEND_MODULE_SHUTDOWN_N(crack),
ZEND_MODULE_ACTIVATE_N(crack),
ZEND_MODULE_DEACTIVATE_N(crack),
ZEND_MODULE_INFO_N(crack),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
View
@@ -62,13 +62,15 @@ function_entry ctype_functions[] = {
/* {{{ ctype_mpodule_entry
*/
zend_module_entry ctype_module_entry = {
+ STANDARD_MODULE_HEADER,
"ctype",
ctype_functions,
NULL,
NULL,
NULL,
NULL,
PHP_MINFO(ctype),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
View
@@ -69,13 +69,15 @@ function_entry curl_functions[] = {
/* {{{ curl_module_entry
*/
zend_module_entry curl_module_entry = {
+ STANDARD_MODULE_HEADER,
"curl",
curl_functions,
PHP_MINIT(curl),
PHP_MSHUTDOWN(curl),
NULL,
NULL,
PHP_MINFO(curl),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -45,13 +45,15 @@ function_entry cybercash_functions[] = {
/* {{{ cybercash_module_entry
*/
zend_module_entry cybercash_module_entry = {
+ STANDARD_MODULE_HEADER,
"cybercash",
cybercash_functions,
NULL,
NULL,
NULL,
NULL,
PHP_MINFO(cybercash),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES,
};
/* }}} */
View
@@ -48,13 +48,15 @@ function_entry cybermut_functions[] = {
/* {{{ cybermut_module_entry
*/
zend_module_entry cybermut_module_entry = {
+ STANDARD_MODULE_HEADER,
"cybermut",
cybermut_functions,
PHP_MINIT(cybermut),
PHP_MSHUTDOWN(cybermut),
NULL,
NULL,
PHP_MINFO(cybermut),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
View
@@ -48,13 +48,15 @@ function_entry cyrus_functions[] = {
};
zend_module_entry cyrus_module_entry = {
+ STANDARD_MODULE_HEADER,
"cyrus",
cyrus_functions,
PHP_MINIT(cyrus),
NULL,
NULL,
NULL,
PHP_MINFO(cyrus),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
View
@@ -1234,7 +1234,16 @@ function_entry dbm_functions[] = {
/* }}} */
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
View
@@ -60,11 +60,15 @@ static PHP_MSHUTDOWN_FUNCTION(dba);
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
};
View
@@ -787,7 +787,8 @@ 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
+ STANDARD_MODULE_HEADER,
+ "dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
};
View
@@ -118,13 +118,15 @@ function_entry dbplus_functions[] = {
/* {{{ module entry */
zend_module_entry dbplus_module_entry = {
+ STANDARD_MODULE_HEADER,
"dbplus",
dbplus_functions,
PHP_MINIT(dbplus),
PHP_MSHUTDOWN(dbplus),
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
};
View
@@ -148,13 +148,15 @@ function_entry dbx_functions[] = {
};
zend_module_entry dbx_module_entry = {
+ STANDARD_MODULE_HEADER,
"dbx",
dbx_functions,
ZEND_MINIT(dbx),
ZEND_MSHUTDOWN(dbx),
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
};
View
@@ -267,13 +267,15 @@ static zend_function_entry php_domxmlns_class_functions[] = {
};
zend_module_entry domxml_module_entry = {
+ STANDARD_MODULE_HEADER,
"domxml",
domxml_functions,
PHP_MINIT(domxml),
NULL,
PHP_RINIT(domxml),
NULL,
PHP_MINFO(domxml),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
View
@@ -226,7 +226,8 @@ PHP_MSHUTDOWN_FUNCTION(DOTNET)
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()
View
@@ -131,11 +131,13 @@ PHP_MINFO_FUNCTION(exif);
/* {{{ 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
};
/* }}} */
View
@@ -231,14 +231,16 @@ function_entry fbsql_functions[] = {
/* }}} */
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)
Oops, something went wrong.

0 comments on commit 6892520

Please sign in to comment.