cvs: php-src(PHP_5_2) /ext/imap php_imap.c
| From: | Antony Dovgal | Date: | Thu, 05 Oct 2006 14:25:42 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40930@lists.php.net to get a copy of this message | ||
tony2001 Thu Oct 5 14:25:42 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/imap php_imap.c
Log:
fix build with new version of c-client
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.6&r2=1.208.2.7.2.7&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.6 php-src/ext/imap/php_imap.c:1.208.2.7.2.7
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.6 Sun Sep 24 18:06:37 2006
+++ php-src/ext/imap/php_imap.c Thu Oct 5 14:25:41 2006
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.6 2006/09/24 18:06:37 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.7 2006/10/05 14:25:41 tony2001 Exp $ */
#define IMAP41
@@ -2181,7 +2181,12 @@
dest.size = 0;
cpytxt(&src, Z_STRVAL_PP(str), Z_STRLEN_PP(str));
+
+#ifndef HAVE_NEW_MIME2TEXT
utf8_mime2text(&src, &dest);
+#else
+ utf8_mime2text(&src, &dest, U8T_CANONICAL);
+#endif
RETVAL_STRINGL(dest.data, dest.size, 1);
if (dest.data) {
free(dest.data);