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

the imap library).

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).

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

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);