[dovecot-cvs] dovecot/src/master mail-process.c, 1.54, 1.55 master-settings.c, 1.57, 1.58 master-settings.h, 1.37, 1.38

[cras at dovecot.org]

Update of /home/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv6888/src/master

Modified Files:
	mail-process.c master-settings.c master-settings.h 
Log Message:
Split client_workarounds to imap_ and pop3_ ones. Added outlook-no-nuls POP3
workaround.



Index: mail-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- mail-process.c	9 Jul 2004 19:59:02 -0000	1.54
+++ mail-process.c	10 Jul 2004 17:24:08 -0000	1.55
@@ -191,14 +191,16 @@
 				set->mailbox_check_interval));
 	env_put(t_strdup_printf("MAILBOX_IDLE_CHECK_INTERVAL=%u",
 				set->mailbox_idle_check_interval));
-	env_put(t_strconcat("CLIENT_WORKAROUNDS=",
-			    set->client_workarounds, NULL));
 	env_put(t_strdup_printf("MAIL_MAX_KEYWORD_LENGTH=%u",
 				set->mail_max_keyword_length));
 	env_put(t_strdup_printf("IMAP_MAX_LINE_LENGTH=%u",
 				set->imap_max_line_length));
 	env_put(t_strconcat("IMAP_CAPABILITY=",
 			    set->imap_capability, NULL));
+	env_put(t_strconcat("IMAP_CLIENT_WORKAROUNDS=",
+			    set->imap_client_workarounds, NULL));
+	env_put(t_strconcat("POP3_CLIENT_WORKAROUNDS=",
+			    set->pop3_client_workarounds, NULL));
 
 	if (set->mail_save_crlf)
 		env_put("MAIL_SAVE_CRLF=1");

Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- master-settings.c	9 Jul 2004 19:59:02 -0000	1.57
+++ master-settings.c	10 Jul 2004 17:24:09 -0000	1.58
@@ -88,7 +88,6 @@
 	DEF(SET_STR, default_mail_env),
 	DEF(SET_STR, mail_cache_fields),
 	DEF(SET_STR, mail_never_cache_fields),
-	DEF(SET_STR, client_workarounds),
 	DEF(SET_INT, mailbox_check_interval),
 	DEF(SET_INT, mailbox_idle_check_interval),
 	DEF(SET_BOOL, mail_full_filesystem_access),
@@ -117,9 +116,11 @@
 	/* imap */
 	DEF(SET_INT, imap_max_line_length),
 	DEF(SET_STR, imap_capability),
+	DEF(SET_STR, imap_client_workarounds),
 
 	/* pop3 */
 	DEF(SET_BOOL, pop3_mails_keep_recent),
+	DEF(SET_STR, pop3_client_workarounds),
 
 	{ 0, NULL, 0 }
 };
@@ -242,7 +243,6 @@
 	MEMBER(default_mail_env) NULL,
 	MEMBER(mail_cache_fields) "MessagePart",
 	MEMBER(mail_never_cache_fields) NULL,
-	MEMBER(client_workarounds) NULL,
 	MEMBER(mailbox_check_interval) 0,
 	MEMBER(mailbox_idle_check_interval) 30,
 	MEMBER(mail_full_filesystem_access) FALSE,
@@ -275,9 +275,11 @@
 	/* imap */
 	MEMBER(imap_max_line_length) 65536,
 	MEMBER(imap_capability) NULL,
+	MEMBER(imap_client_workarounds) NULL,
 
 	/* pop3 */
 	MEMBER(pop3_mails_keep_recent) FALSE,
+	MEMBER(pop3_client_workarounds) NULL,
 
 	/* .. */
 	MEMBER(login_uid) 0,

Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- master-settings.h	9 Jul 2004 19:59:02 -0000	1.37
+++ master-settings.h	10 Jul 2004 17:24:09 -0000	1.38
@@ -59,7 +59,6 @@
 	const char *default_mail_env;
 	const char *mail_cache_fields;
 	const char *mail_never_cache_fields;
-	const char *client_workarounds;
 	unsigned int mailbox_check_interval;
 	unsigned int mailbox_idle_check_interval;
 	int mail_full_filesystem_access;
@@ -88,9 +87,11 @@
 	/* imap */
 	unsigned int imap_max_line_length;
 	const char *imap_capability;
+	const char *imap_client_workarounds;
 
 	/* pop3 */
         int pop3_mails_keep_recent;
+	const char *pop3_client_workarounds;
 
 	/* .. */
 	uid_t login_uid;