- sync 5.3

- add 2007d and 2007e

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 259a566680d2c378d717ac8f4773617ee52a1ba0..add1c179efe7d250b47ad1aca857e8375e373456 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1077,7 +1077,11 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 /* }}} */
 
 #if !defined(CCLIENTVERSION)
-#if HAVE_IMAP2007b
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007e"
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007d"
+#if HAVE_IMAP2007d
 #define CCLIENTVERSION "2007b"
 #elif HAVE_IMAP2007a
 #define CCLIENTVERSION "2007a"
@@ -1100,6 +1104,25 @@ PHP_MINFO_FUNCTION(imap)
 {
        php_info_print_table_start();
        php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION);
+#if HAVE_IMAP2007e
+       php_info_print_table_row(2, "IMAP c-Client Version", "2007e");
+#if HAVE_IMAP2007d
+       php_info_print_table_row(2, "IMAP c-Client Version", "2007d");
+#if HAVE_IMAP2007b
+       php_info_print_table_row(2, "IMAP c-Client Version", "2007b");
+#elif HAVE_IMAP2007a
+       php_info_print_table_row(2, "IMAP c-Client Version", "2007a");
+#elif HAVE_IMAP2004
+       php_info_print_table_row(2, "IMAP c-Client Version", "2004");
+#elif HAVE_IMAP2001
+       php_info_print_table_row(2, "IMAP c-Client Version", "2001");
+#elif HAVE_IMAP2000
+       php_info_print_table_row(2, "IMAP c-Client Version", "2000");
+#elif defined(IMAP41)
+       php_info_print_table_row(2, "IMAP c-Client Version", "4.1");
+#else
+       php_info_print_table_row(2, "IMAP c-Client Version", "4.0");
+#endif
 #if HAVE_IMAP_SSL
        php_info_print_table_row(2, "SSL Support", "enabled");
 #endif