summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2008-08-04 20:54:20 +0000
committerJani Taskinen <jani@php.net>2008-08-04 20:54:20 +0000
commit09eebe78d8190ca5655cb5a12c5c734729b8dbae (patch)
tree852ada93d5f71a4de1c09759fb09975b82ff6ebf
parent59b98545e885a4833d915fe0dce28be9f05de46d (diff)
downloadphp-git-09eebe78d8190ca5655cb5a12c5c734729b8dbae.tar.gz
MFH: proper version check
-rw-r--r--ext/imap/php_imap.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 387fd2f0b9..59660dbddc 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -717,23 +717,26 @@ PHP_RSHUTDOWN_FUNCTION(imap)
}
/* }}} */
-
-/* {{{ PHP_MINFO_FUNCTION
- */
-PHP_MINFO_FUNCTION(imap)
-{
- php_info_print_table_start();
+#if !defined(CCLIENTVERSION)
#if HAVE_IMAP2004
- php_info_print_table_row(2, "IMAP c-Client Version", "2004");
+#define CCLIENTVERSION "2004"
#elif HAVE_IMAP2001
- php_info_print_table_row(2, "IMAP c-Client Version", "2001");
+#define CCLIENTVERSION "2001"
#elif HAVE_IMAP2000
- php_info_print_table_row(2, "IMAP c-Client Version", "2000");
+#define CCLIENTVERSION "2000"
#elif defined(IMAP41)
- php_info_print_table_row(2, "IMAP c-Client Version", "4.1");
+#define CCLIENTVERSION "4.1"
#else
- php_info_print_table_row(2, "IMAP c-Client Version", "4.0");
+#define CCLIENTVERSION "4.0"
+#endif
#endif
+
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(imap)
+{
+ php_info_print_table_start();
+ php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION);
#if HAVE_IMAP_SSL
php_info_print_table_row(2, "SSL Support", "enabled");
#endif