summaryrefslogtreecommitdiff
path: root/ext/imap/php_imap.c
diff options
context:
space:
mode:
authorChuck Hagenbuch <chagenbu@php.net>2001-05-03 19:32:49 +0000
committerChuck Hagenbuch <chagenbu@php.net>2001-05-03 19:32:49 +0000
commitd0af2440e6b95e72509551c6d6cf26acc7485c53 (patch)
tree2bda5d30f5c62d64c5dd0b002da5f715468fbdee /ext/imap/php_imap.c
parent5c0791fcacfd043f8362aff1400d4e3629b43fda (diff)
downloadphp-git-d0af2440e6b95e72509551c6d6cf26acc7485c53.tar.gz
removing references to IMSP module, which will probably never be ported to
php4 (lack of a publically available library implementing it).
Diffstat (limited to 'ext/imap/php_imap.c')
-rw-r--r--ext/imap/php_imap.c27
1 files changed, 4 insertions, 23 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index d81de05344..015d136f35 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -177,12 +177,6 @@ static int le_pimap;
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 @@ void mm_login(NETMBX *mb, char *user, char *pwd, long trial)
{
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)