diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1997-10-08 06:46:50 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1997-10-08 06:46:50 +0000 |
| commit | 65bf87e492583bf35727f34bcac4bed199efe702 (patch) | |
| tree | 4db4ac57665910364489edc7598ef41a974674db /mail | |
| parent | Upgrade to use tcl7.6/tk4.2. Tried tcl8.0/tk8.0, but gave runtime error. (diff) | |
Return-path patch improvement: skip Return-path comes from headers
if we already generate our own.
Previous variant produce two and more Return-Path'es
Notes
Notes:
svn path=/head/; revision=8175
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/popper/files/patch-ad | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/mail/popper/files/patch-ad b/mail/popper/files/patch-ad index 9b5c12381d94..65055ce13f06 100644 --- a/mail/popper/files/patch-ad +++ b/mail/popper/files/patch-ad @@ -7,14 +7,14 @@ WARNING: Do not merge these patches in with other patch files. -- Paul Traina 17-Feb-1997 -With old variant of this patch message size was counted incorrectly -and "rpath" variable can be referenced without initialization, -fixed now. +With old variant of this patch message size was counted incorrectly, +"rpath" variable can be referenced without initialization, second +Return-Path not skipped, fixed now. -- Andrey Chernov 8-Oct-1997 *** pop_dropcopy.c.orig Fri Jul 25 21:42:07 1997 ---- pop_dropcopy.c Wed Oct 8 00:07:19 1997 +--- pop_dropcopy.c Wed Oct 8 10:36:34 1997 *************** *** 151,156 **** --- 151,187 ---- @@ -90,8 +90,19 @@ fixed now. if(p->debug) pop_log(p,POP_DEBUG, "Msg %d being added to list", mp->number); *************** +*** 463,468 **** +--- 501,508 ---- + mp->retr_flag = TRUE; + mp->orig_retr_state = TRUE; + } ++ } else if (rpath && (strncasecmp(buffer,"Return-Path:",12) == 0)) { ++ continue; + } + } else { + content_nchar += nchar; +*************** *** 502,507 **** ---- 540,546 ---- +--- 542,548 ---- int content_length, content_nchar, cont_len; MD5_CTX mdContext; unsigned char digest[16]; @@ -101,7 +112,7 @@ fixed now. *************** *** 574,579 **** ---- 613,621 ---- +--- 615,623 ---- (p->mmdf_separator ? !strcmp(p->mmdf_separator, buffer) : isfromline(buffer))) { @@ -113,7 +124,7 @@ fixed now. continue; *************** *** 619,624 **** ---- 661,669 ---- +--- 663,671 ---- mp->retr_flag = FALSE; mp->orig_retr_state = FALSE; mp->uidl_str = "\n"; @@ -123,6 +134,17 @@ fixed now. #ifdef DEBUG if(p->debug) +*************** +*** 701,706 **** +--- 748,755 ---- + mp->retr_flag = TRUE; + mp->orig_retr_state = TRUE; + } ++ } else if (rpath && (strncasecmp(buffer,"Return-Path:",12) == 0)) { ++ continue; + } + } else { + content_nchar += nchar; --- pop_send.c Mon Feb 17 13:14:25 1997 +++ pop_send.c Mon Feb 17 13:15:28 1997 @@ -84,6 +84,9 @@ |