cvs: php4 /ext/imap php_imap.c

chagenbu Thu May 3 12:32:49 2001 EDT Modified files: /php4/ext/imap php_imap.c Log: removing references to IMSP module, which will probably never be ported to php4 (lack of a publically available library implementing it). Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.71 php4/ext/imap/php_imap.c:1.72 --- php4/ext/imap/php_imap.c:1.71 Thu May 3 12:18:48 2001 +++ php4/ext/imap/php_imap.c Thu May 3 12:32:49 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.71 2001/05/03 19:18:48 chagenbu Exp $ */ +/* $Id: php_imap.c,v 1.72 2001/05/03 19:32:49 chagenbu Exp $ */ #define IMAP41 @@ -177,12 +177,6 @@ static int le_pimapchain; #endif -#if HAVE_IMSP -/* This makes IMSP non thread safe */ -extern char imsp_user[80]; -extern char imsp_password[80]; -#endif - void mail_close_it(zend_rsrc_list_entry *rsrc) { @@ -4292,25 +4286,12 @@ { IMAPLS_FETCH(); -#if HAVE_IMSP - if (*mb->service && strcmp(mb->service, "imsp") == 0) { - if (*mb->user) { - strlcpy(user, mb->user, MAILTMPLEN); - } else { - strlcpy(user, imsp_user, MAILTMPLEN); - } - strlcpy (pwd, imsp_password, MAILTMPLEN); + if (*mb->user) { + strlcpy (user,mb->user, MAILTMPLEN); } else { -#endif - if (*mb->user) { - strlcpy (user,mb->user, MAILTMPLEN); - } else { - strlcpy (user, IMAPG(imap_user), MAILTMPLEN); - } - strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN); -#if HAVE_IMSP + strlcpy (user, IMAPG(imap_user), MAILTMPLEN); } -#endif + strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN); } void mm_critical(MAILSTREAM *stream)