jani Tue May 5 01:22:44 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap config.m4 php_imap.c php_imap.h
Log:
MFH: fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.7.2.2&r2=1.69.4.7.2.3&diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.7.2.2
php-src/ext/imap/config.m4:1.69.4.7.2.3
--- php-src/ext/imap/config.m4:1.69.4.7.2.2 Thu Oct 16 16:21:06 2008
+++ php-src/ext/imap/config.m4 Tue May 5 01:22:44 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.69.4.7.2.2 2008/10/16 16:21:06 dmitry Exp $
+dnl $Id: config.m4,v 1.69.4.7.2.3 2009/05/05 01:22:44 jani Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
@@ -228,13 +228,10 @@
AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, [ ])
], [], $TST_LIBS)
- AC_MSG_CHECKING(whether build with IMAP works)
- PHP_IMAP_TEST_BUILD(mail_newbody, [
- AC_MSG_RESULT(yes)
- ], [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([build test failed. Please check the config.log for
details.])
- ], $TST_LIBS)
+ dnl Check if utf8_to_mutf7 exists
+ PHP_IMAP_TEST_BUILD(utf8_to_mutf7, [
+ AC_DEFINE(HAVE_IMAP_MUTF7, 1, [ ])
+ ], [], $TST_LIBS)
AC_MSG_CHECKING(whether rfc822_output_address_list function present)
PHP_TEST_BUILD(foobar, [
@@ -271,4 +268,11 @@
char foobar () {f = rfc822_output_address_list;}
])
+ AC_MSG_CHECKING(whether build with IMAP works)
+ PHP_IMAP_TEST_BUILD(mail_newbody, [
+ AC_MSG_RESULT(yes)
+ ], [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([build test failed. Please check the config.log for
details.])
+ ], $TST_LIBS)
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.46&r2=1.208.2.7.2.26.2.47&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.26.2.46
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.47
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.46 Tue May 5 01:21:10 2009
+++ php-src/ext/imap/php_imap.c Tue May 5 01:22:44 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <z...@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.46 2009/05/05 01:21:10 jani Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.47 2009/05/05 01:22:44 jani Exp $ */
#define IMAP41
@@ -351,6 +351,7 @@
ZEND_ARG_INFO(0, buf)
ZEND_END_ARG_INFO()
+#ifdef HAVE_IMAP_MUTF7
ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf8_to_mutf7, 0, 0, 1)
ZEND_ARG_INFO(0, in)
ZEND_END_ARG_INFO()
@@ -358,6 +359,7 @@
ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mutf7_to_utf8, 0, 0, 1)
ZEND_ARG_INFO(0, in)
ZEND_END_ARG_INFO()
+#endif
ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setflag_full, 0, 0, 3)
ZEND_ARG_INFO(0, stream_id)
@@ -517,8 +519,10 @@
PHP_FE(imap_search,
arginfo_imap_search)
PHP_FE(imap_utf7_decode,
arginfo_imap_utf7_decode)
PHP_FE(imap_utf7_encode,
arginfo_imap_utf7_encode)
+#ifdef HAVE_IMAP_MUTF7
PHP_FE(imap_utf8_to_mutf7,
arginfo_imap_utf8_to_mutf7)
PHP_FE(imap_mutf7_to_utf8,
arginfo_imap_mutf7_to_utf8)
+#endif
PHP_FE(imap_mime_header_decode,
arginfo_imap_mime_header_decode)
PHP_FE(imap_thread,
arginfo_imap_thread)
PHP_FE(imap_timeout,
arginfo_imap_timeout)
@@ -2342,7 +2346,7 @@
IMAPG(gets_stream) = writer;
mail_parameters(NIL, SET_GETS, (void *) php_mail_gets);
mail_fetchbody_full(imap_ptr->imap_stream, msgno, section, NULL, flags);
- mail_parameters(NIL, SET_GETS, (void *) NIL);
+ mail_parameters(NIL, SET_GETS, (void *) NULL);
IMAPG(gets_stream) = NULL;
if (close_stream) {
@@ -2895,6 +2899,7 @@
#undef B64
#undef UNB64
+#ifdef HAVE_IMAP_MUTF7
static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode)
{
char *in;
@@ -2935,6 +2940,7 @@
{
php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
+#endif
/* {{{ proto bool imap_setflag_full(resource stream_id, string sequence,
string flag [, int options])
Sets flags on messages */
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.h?r1=1.32.2.2.2.1.2.4&r2=1.32.2.2.2.1.2.5&diff_format=u
Index: php-src/ext/imap/php_imap.h
diff -u php-src/ext/imap/php_imap.h:1.32.2.2.2.1.2.4
php-src/ext/imap/php_imap.h:1.32.2.2.2.1.2.5
--- php-src/ext/imap/php_imap.h:1.32.2.2.2.1.2.4 Sat May 2 17:59:46 2009
+++ php-src/ext/imap/php_imap.h Tue May 5 01:22:44 2009
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.h,v 1.32.2.2.2.1.2.4 2009/05/02 17:59:46 pajoye Exp $ */
+/* $Id: php_imap.h,v 1.32.2.2.2.1.2.5 2009/05/05 01:22:44 jani Exp $ */
#ifndef PHP_IMAP_H
#define PHP_IMAP_H
@@ -165,8 +165,10 @@
PHP_FUNCTION(imap_utf8);
PHP_FUNCTION(imap_utf7_decode);
PHP_FUNCTION(imap_utf7_encode);
+#ifdef HAVE_IMAP_MUTF7
PHP_FUNCTION(imap_utf8_to_mutf7);
PHP_FUNCTION(imap_mutf7_to_utf8);
+#endif
PHP_FUNCTION(imap_mime_header_decode);
PHP_FUNCTION(imap_thread);
PHP_FUNCTION(imap_timeout);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
