- Change API version and make the error messages more meaningful.

diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index 7d8fc5f499414bdedc7eb35823c47dd1348eb3b5..c735af26f82a83e6b8d2b04157c8156ad7a0b09a 100644 (file)
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -65,17 +65,18 @@ int zend_load_extension(char *path)
        }
 
        if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
-               fprintf(stderr, "%s requires Zend version %s or later\n"
-                                       "Current version %s, API version %d\n",
+               fprintf(stderr, "%s requires Zend Engine API version %d\n"
+                                       "The installed Zend Engine API version is %d\n",
                                        new_extension->name,
-                                       extension_version_info->required_zend_version,
-                                       ZEND_VERSION,
+                                       extension_version_info->required_api_no,
                                        ZEND_EXTENSION_API_NO);
                DL_UNLOAD(handle);
                return FAILURE;
        } else if (extension_version_info->zend_extension_api_no < ZEND_EXTENSION_API_NO) {
                /* we may be able to allow for downwards compatability in some harmless cases. */
-               fprintf(stderr, "%s is outdated (API version %d, current version %d)\n"
+               fprintf(stderr, "%s designed to be used with the Zend Engine API %d is outdated\n"
+                                       "It requires a more recent version of the Zend Engine\n"
+                                       "The installed Zend Engine API version is %d\n"
                                        "Contact %s at %s for a later version of this module.\n",
                                        new_extension->name,
                                        extension_version_info->zend_extension_api_no,

diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 51d47f13793d6bd27561268bc0dd445c839427ac..a1abdadb8b917418f4cb7bb93348f02d02bea0fc 100644 (file)
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -23,7 +23,7 @@
 
 #include "zend_compile.h"
 
-#define ZEND_EXTENSION_API_NO          20000531
+#define ZEND_EXTENSION_API_NO          20000622
 
 typedef struct _zend_extension_version_info {
        int zend_extension_api_no;
@@ -85,7 +85,7 @@ ZEND_API void zend_extension_dispatch_message(int message, void *arg);
 
 
 #define ZEND_EXTENSION()       \
-       ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.90", ZTS_V, ZEND_DEBUG }
+       ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, ZEND_VERSION, ZTS_V, ZEND_DEBUG }
 
 #define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1