Fixed bug #38941 (imap extension does not compile against new version of

the imap library).

diff --git a/NEWS b/NEWS
index 541bafa14d21fff779bc3973d9fcd0bf54b3f773..651ba325406d62d603296fde5fb1fd188f2aaf59 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
 - Fixed mess with CGI/CLI -d option (now it works with cgi; constants are
   working exactly like in php.ini; with FastCGI -d affects all requests).
   (Dmitry)
+- Fixed bug #38941 (imap extension does not compile against new version of
+  the imap library). (Ilia)
 - Fixed bug #38844 (curl_easy_strerror() is defined only since cURL 7.12.0).
   (Tony)
 - Fixed bug #38623 (leaks in a tricky code with switch() and exceptions).

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index e2782e3265bfad8975c78523d18fc751bad80c22..bd23b223987f6c8ee5de280f24da7f6b87ee0797 100644 (file)
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -114,6 +114,11 @@ if test "$PHP_IMAP" != "no"; then
     AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
       AC_DEFINE(HAVE_IMAP2004,1,[ ])
     ])
+    
+    dnl Check for new version of the utf8_mime2text() function
+    AC_EGREP_HEADER(mail_append_set, $IMAP_INC_DIR/mail.h, [
+      AC_DEFINE(HAVE_NEW_MIME2TEXT,1,[ ])
+    ])
 
     dnl Check for c-client version 2001
     old_CPPFLAGS=$CPPFLAGS

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index a4e7b7ae0f5f0995441607ca3e5bfe26e89b0dbd..05cf6c2b7450d0dcca3ee7a3659306be59e1de9e 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -75,7 +75,11 @@ static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DA
 void rfc822_date(char *date);
 char *cpystr(const char *str);
 char *cpytxt(SIZEDTEXT *dst, char *text, unsigned long size);
+#ifndef HAVE_NEW_MIME2TEXT
 long utf8_mime2text(SIZEDTEXT *src, SIZEDTEXT *dst);
+#else
+long utf8_mime2text (SIZEDTEXT *src, SIZEDTEXT *dst, long flags);
+#endif
 unsigned long find_rightmost_bit(unsigned long *valptr);
 void fs_give(void **block);
 void *fs_get(size_t size);