cvs: /php4/ext/standard dl.c
| From: | Andi Gutmans | Date: | Mon, 13 Mar 2000 06:00:36 +0000 |
| Subject: | cvs: /php4/ext/standard dl.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-12018@lists.php.net to get a copy of this message | ||
andi Sun Mar 12 22:00:36 2000 EDT
Modified files:
/php4/ext/standard dl.c
Log:
- Also check module API number
Index: php4/ext/standard/dl.c
diff -u php4/ext/standard/dl.c:1.29 php4/ext/standard/dl.c:1.30
--- php4/ext/standard/dl.c:1.29 Sat Mar 11 08:23:30 2000
+++ php4/ext/standard/dl.c Sun Mar 12 22:00:36 2000
@@ -132,14 +132,15 @@
RETURN_FALSE;
}
module_entry = get_module();
- if ((module_entry->zend_debug != ZEND_DEBUG) || (module_entry->zts != USING_ZTS)) {
+ if ((module_entry->zend_debug != ZEND_DEBUG) || (module_entry->zts != USING_ZTS)
+ || (module_entry->zend_api != ZEND_MODULE_API_NO)) {
php_error(E_CORE_WARNING,
"%s: Unable to initialize module\n"
- "Module compiled with debug=%d, thread-safety=%d\n"
- "PHP compiled with debug=%d, thread-safety=%d\n"
+ "Module compiled with debug=%d, thread-safety=%d module API=%d\n"
+ "PHP compiled with debug=%d, thread-safety=%d module API=%d\n"
"These options need to match\n",
- module_entry->name, module_entry->zend_debug, module_entry->zts,
- ZEND_DEBUG, USING_ZTS);
+ module_entry->name, module_entry->zend_debug, module_entry->zts,
module_entry->zend_api,
+ ZEND_DEBUG, USING_ZTS, ZEND_MODULE_API_NO);
DL_UNLOAD(handle);
RETURN_FALSE;
}