| 0d4475ec |
1 | diff -ur -x 'Makefile*' dovecot-1.0.rc15-o/src/master/mail-process.c dovecot-1.0.rc15/src/master/mail-process.c |
| 2 | --- dovecot-1.0.rc15-o/src/master/mail-process.c 2006-10-17 04:50:31.000000000 -0600 |
| 3 | +++ dovecot-1.0.rc15/src/master/mail-process.c 2007-01-31 17:16:52.000000000 -0700 |
| 4 | @@ -243,6 +243,8 @@ |
| 5 | env_put("POP3_NO_FLAG_UPDATES=1"); |
| 6 | if (set->pop3_reuse_xuidl) |
| 7 | env_put("POP3_REUSE_XUIDL=1"); |
| 8 | + if (set->pop3_ignore_deleted) |
| 9 | + env_put("POP3_IGNORE_DELETED=1"); |
| 10 | if (set->pop3_enable_last) |
| 11 | env_put("POP3_ENABLE_LAST=1"); |
| 12 | if (set->pop3_lock_session) |
| 13 | diff -ur -x 'Makefile*' dovecot-1.0.rc15-o/src/master/master-settings.c dovecot-1.0.rc15/src/master/master-settings.c |
| 14 | --- dovecot-1.0.rc15-o/src/master/master-settings.c 2006-11-12 10:56:07.000000000 -0700 |
| 15 | +++ dovecot-1.0.rc15/src/master/master-settings.c 2007-01-31 17:16:52.000000000 -0700 |
| 16 | @@ -154,6 +154,7 @@ |
| 17 | DEF(SET_BOOL, pop3_enable_last), |
| 18 | DEF(SET_BOOL, pop3_reuse_xuidl), |
| 19 | DEF(SET_BOOL, pop3_lock_session), |
| 20 | + DEF(SET_BOOL, pop3_ignore_deleted), |
| 21 | DEF(SET_STR, pop3_uidl_format), |
| 22 | DEF(SET_STR, pop3_client_workarounds), |
| 23 | DEF(SET_STR, pop3_logout_format), |
| 24 | @@ -366,6 +367,7 @@ |
| 25 | MEMBER(pop3_enable_last) FALSE, |
| 26 | MEMBER(pop3_reuse_xuidl) FALSE, |
| 27 | MEMBER(pop3_lock_session) FALSE, |
| 28 | + MEMBER(pop3_ignore_deleted) FALSE, |
| 29 | MEMBER(pop3_uidl_format) "", |
| 30 | MEMBER(pop3_client_workarounds) "", |
| 31 | MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s", |
| 32 | diff -ur -x 'Makefile*' dovecot-1.0.rc15-o/src/master/master-settings.h dovecot-1.0.rc15/src/master/master-settings.h |
| 33 | --- dovecot-1.0.rc15-o/src/master/master-settings.h 2006-10-17 04:48:45.000000000 -0600 |
| 34 | +++ dovecot-1.0.rc15/src/master/master-settings.h 2007-01-31 17:16:52.000000000 -0700 |
| 35 | @@ -113,6 +113,7 @@ |
| 36 | bool pop3_enable_last; |
| 37 | bool pop3_reuse_xuidl; |
| 38 | bool pop3_lock_session; |
| 39 | + bool pop3_ignore_deleted; |
| 40 | const char *pop3_uidl_format; |
| 41 | const char *pop3_client_workarounds; |
| 42 | const char *pop3_logout_format; |
| 43 | diff -ur -x 'Makefile*' dovecot-1.0.rc15-o/src/pop3/client.c dovecot-1.0.rc15/src/pop3/client.c |
| 3594e07c |
44 | --- dovecot-1.0.rc15-o/src/pop3/client.c 2006-08-10 16:26:41.000000000 -0600 |
| 0d4475ec |
45 | +++ dovecot-1.0.rc15/src/pop3/client.c 2007-01-31 17:16:52.000000000 -0700 |
| 3594e07c |
46 | @@ -64,7 +64,8 @@ |
| 47 | message_sizes_buf = buffer_create_dynamic(default_pool, 512); |
| 48 | |
| 49 | memset(&search_arg, 0, sizeof(search_arg)); |
| 50 | - search_arg.type = SEARCH_ALL; |
| 51 | + search_arg.type = SEARCH_DELETED; |
| 52 | + search_arg.not = 1; |
| 53 | |
| 54 | for (i = 0; i < 2; i++) { |
| 55 | if (sync_mailbox(client->mailbox, &status) < 0) { |
| 0d4475ec |
56 | diff -ur -x 'Makefile*' dovecot-1.0.rc15-o/src/pop3/main.c dovecot-1.0.rc15/src/pop3/main.c |
| 57 | --- dovecot-1.0.rc15-o/src/pop3/main.c 2006-08-10 12:38:04.000000000 -0600 |
| 58 | +++ dovecot-1.0.rc15/src/pop3/main.c 2007-01-31 17:16:52.000000000 -0700 |
| 59 | @@ -46,6 +46,7 @@ |
| 60 | bool no_flag_updates = FALSE; |
| 61 | bool reuse_xuidl = FALSE; |
| 62 | bool lock_session = FALSE; |
| 63 | +bool ignore_deleted_messages = FALSE; |
| 64 | const char *uidl_format, *logout_format; |
| 65 | enum uidl_keys uidl_keymask; |
| 66 | |
| 67 | @@ -218,6 +219,7 @@ |
| 68 | no_flag_updates = getenv("POP3_NO_FLAG_UPDATES") != NULL; |
| 69 | reuse_xuidl = getenv("POP3_REUSE_XUIDL") != NULL; |
| 70 | lock_session = getenv("POP3_LOCK_SESSION") != NULL; |
| 71 | + ignore_deleted_messages = getenv("POP3_IGNORE_DELETED") != NULL; |
| 72 | |
| 73 | uidl_format = getenv("POP3_UIDL_FORMAT"); |
| 74 | if (uidl_format == NULL || *uidl_format == '\0') |
projects / packages / dovecot.git / blame