From: Pierre Joye <pajoye@php.net>
Date: Sat, 25 Apr 2009 15:06:03 +0000 (+0000)
Subject: - sync 5.3
X-Git-Tag: php-5.4.0alpha1~191^2~3855
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f012ff613e82bb7c64b467bca04476341e4a5dba;p=php

- sync 5.3
- add 2007d and 2007e
---

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 259a566680..add1c179ef 100644
--- 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