iliaa Sun Sep 24 18:06:38 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/imap php_imap.c config.m4
/php-src NEWS
Log:
Fixed bug #38941 (imap extension does not compile against new version of
the imap library).
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.5&r2=1.208.2.7.2.6&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.5
php-src/ext/imap/php_imap.c:1.208.2.7.2.6
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.5 Tue Sep 5 11:24:49 2006
+++ php-src/ext/imap/php_imap.c Sun Sep 24 18:06:37 2006
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.5 2006/09/05 11:24:49 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.6 2006/09/24 18:06:37 iliaa Exp $ */
#define IMAP41
@@ -75,7 +75,11 @@
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);
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69&r2=1.69.4.1&diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69 php-src/ext/imap/config.m4:1.69.4.1
--- php-src/ext/imap/config.m4:1.69 Sun May 29 23:16:41 2005
+++ php-src/ext/imap/config.m4 Sun Sep 24 18:06:37 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.69 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config.m4,v 1.69.4.1 2006/09/24 18:06:37 iliaa Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
@@ -114,6 +114,11 @@
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
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.261&r2=1.2027.2.547.2.262&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.261 php-src/NEWS:1.2027.2.547.2.262
--- php-src/NEWS:1.2027.2.547.2.261 Wed Sep 20 13:42:50 2006
+++ php-src/NEWS Sun Sep 24 18:06:37 2006
@@ -6,6 +6,8 @@
- 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).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
