1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
*** pop_dropcopy.c.orig Thu Jul 2 07:56:52 1998
--- pop_dropcopy.c Thu Jul 2 07:58:24 1998
***************
*** 471,478 ****
*cp++ = '\n';
*cp = '\0';
! mp->length += strlen("X-UIDL: ") + strlen(mp->uidl_str) + 1;
! p->drop_size += strlen("X-UIDL: ") + strlen(mp->uidl_str)+1;
/* New UIDs do not dirty the mailspool if NO_STATUS is set. They
are just recalculated each time the popper is run or LMOS is
--- 471,480 ----
*cp++ = '\n';
*cp = '\0';
! i = strlen("X-UIDL: ") + (DIG_SIZE * 2) + 2;
! mp->length += i;
! p->drop_size += i;
! mp->lines++;
/* New UIDs do not dirty the mailspool if NO_STATUS is set. They
are just recalculated each time the popper is run or LMOS is
***************
*** 483,491 ****
#endif
}
! } else if (CONTENT_LENGTH && !strncmp(buffer, "Content-Length:", 15)) {
! cont_len = atoi(buffer + 15);
! MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
continue; /* not part of the message size */
} else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
!strncasecmp("Date:", buffer, 5) ||
--- 485,495 ----
#endif
}
! } else if (!strncasecmp(buffer, "Content-Length:", 15)) {
! if (CONTENT_LENGTH) {
! cont_len = atoi(buffer + 15);
! MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
! }
continue; /* not part of the message size */
} else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
!strncasecmp("Date:", buffer, 5) ||
***************
*** 504,511 ****
if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) {
uidl_found++;
mp->uidl_str = (char *)strdup(cp);
! mp->length += nchar + 1;
! p->drop_size += nchar + 1;
}
}
continue; /* Do not include this value in the message size */
--- 508,517 ----
if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) {
uidl_found++;
mp->uidl_str = (char *)strdup(cp);
! len += strlen("X-UIDL: ") + 1;
! mp->length += len;
! p->drop_size += len;
! mp->lines++;
}
}
continue; /* Do not include this value in the message size */
***************
*** 717,724 ****
*cp++ = '\n';
*cp = '\0';
! mp->length += strlen("X-UIDL: ") + strlen(mp->uidl_str) + 1;
! p->drop_size += strlen("X-UIDL: ") + strlen(mp->uidl_str)+1;
/* New UIDs do not dirty the mailspool if NO_STATUS is set. They
are just recalculated each time the popper is run or LMOS is
--- 723,732 ----
*cp++ = '\n';
*cp = '\0';
! i = strlen("X-UIDL: ") + (DIG_SIZE * 2) + 2;
! mp->length += i;
! p->drop_size += i;
! mp->lines++;
/* New UIDs do not dirty the mailspool if NO_STATUS is set. They
are just recalculated each time the popper is run or LMOS is
***************
*** 729,739 ****
#endif
}
! } else if (CONTENT_LENGTH && !strncmp(buffer, "Content-Length:", 15)) {
! cont_len = atoi(buffer + 15);
! MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
continue; /* Not included in message size */
-
} else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
!strncasecmp("Date:", buffer, 5) ||
!strncasecmp("Message-Id:",buffer, 11) ||
--- 737,748 ----
#endif
}
! } else if (!strncasecmp(buffer, "Content-Length:", 15)) {
! if (CONTENT_LENGTH) {
! cont_len = atoi(buffer + 15);
! MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
! }
continue; /* Not included in message size */
} else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
!strncasecmp("Date:", buffer, 5) ||
!strncasecmp("Message-Id:",buffer, 11) ||
***************
*** 753,760 ****
if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) {
uidl_found++;
mp->uidl_str = (char *)strdup(cp);
! mp->length += nchar + 1;
! p->drop_size += nchar + 1;
}
}
continue; /* Do not include this value in the message size */
--- 762,771 ----
if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) {
uidl_found++;
mp->uidl_str = (char *)strdup(cp);
! len += strlen("X-UIDL: ") + 1;
! mp->length += len;
! p->drop_size += len;
! mp->lines++;
}
}
continue; /* Do not include this value in the message size */
|
