| 1 | From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 |
| 2 | Received: from CALLER (helo=test.ex) |
| 3 | by myhost.test.ex with local-esmtp (Exim x.yz) |
| 4 | (envelope-from <CALLER@myhost.test.ex>) |
| 5 | id 10HmaY-0005vi-00 |
| 6 | for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 |
| 7 | Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> |
| 8 | From: CALLER_NAME <CALLER@myhost.test.ex> |
| 9 | Date: Tue, 2 Mar 1999 09:44:33 +0000 |
| 10 | X-Router-SSint: was preserved |
| 11 | |
| 12 | A message without any headers. |
| 13 | |
| 14 | From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 |
| 15 | Received: from CALLER (helo=test.ex) |
| 16 | by myhost.test.ex with local-esmtp (Exim x.yz) |
| 17 | (envelope-from <CALLER@myhost.test.ex>) |
| 18 | id 10HmaZ-0005vi-00 |
| 19 | for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 |
| 20 | From: Test person <tp@cam.ac.uk> |
| 21 | To: Me <userx@test.ex> |
| 22 | Subject: A real test message |
| 23 | Date: Tue, 2 Mar 1999 09:44:33 +0000 |
| 24 | Message-ID: <41C2F849.3060203@projectile.test.ex> |
| 25 | Sender: CALLER_NAME <CALLER@myhost.test.ex> |
| 26 | X-Router-SSint: was preserved |
| 27 | |
| 28 | OK, this should look like a genuine message. |
| 29 | |
| 30 | From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 |
| 31 | Received: from CALLER (helo=test.ex) |
| 32 | by myhost.test.ex with local-esmtp (Exim x.yz) |
| 33 | (envelope-from <CALLER@myhost.test.ex>) |
| 34 | id 10HmbA-0005vi-00 |
| 35 | for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 |
| 36 | From: 99Junk99@somewhere.com |
| 37 | To: |
| 38 | Subject: MAKE MONEY FAST!!!! |
| 39 | Message-id: abcde |
| 40 | Sender: CALLER_NAME <CALLER@myhost.test.ex> |
| 41 | Date: Tue, 2 Mar 1999 09:44:33 +0000 |
| 42 | X-Router-SSint: was preserved |
| 43 | |
| 44 | This should be enough to trip the threshold. |
| 45 | |
| 46 | From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 |
| 47 | Received: from CALLER (helo=test.ex) |
| 48 | by myhost.test.ex with local-esmtp (Exim x.yz) |
| 49 | (envelope-from <CALLER@myhost.test.ex>) |
| 50 | id 10HmbB-0005vi-00 |
| 51 | for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 |
| 52 | From: Test person <tp@cam.ac.uk> |
| 53 | To: Me <userx@test.ex> |
| 54 | Subject: A real test message |
| 55 | Date: Tue, 2 Mar 1999 09:44:33 +0000 |
| 56 | Message-ID: <41C2F849.3060203@projectile.test.ex> |
| 57 | FakeReject: test fakereject |
| 58 | Sender: CALLER_NAME <CALLER@myhost.test.ex> |
| 59 | X-Regex: Regex matched |
| 60 | X-Router-SSint: was preserved |
| 61 | |
| 62 | OK, this should look like a genuine message, but |
| 63 | it will trip on THIS REGEX. |
| 64 | |
| 65 | From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 |
| 66 | Received: from CALLER (helo=test.ex) |
| 67 | by myhost.test.ex with local-esmtp (Exim x.yz) |
| 68 | (envelope-from <CALLER@myhost.test.ex>) |
| 69 | id 10HmbC-0005vi-00 |
| 70 | for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 |
| 71 | Date: Tue, 2 Mar 1999 09:44:33 +0000 |
| 72 | From: J Caesar <jcaesar@test.ex> |
| 73 | To: a-list00@exim.org |
| 74 | Message-ID: <20041217133501.GA3058@test.ex> |
| 75 | Mime-Version: 1.0 |
| 76 | Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" |
| 77 | Content-Disposition: inline |
| 78 | Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for |
| 79 | the "volume" charts |
| 80 | X-BeenThere: a-list00@exim.org |
| 81 | X-Mailman-Version: 2.1.5 |
| 82 | Precedence: list |
| 83 | Sender: CALLER_NAME <CALLER@myhost.test.ex> |
| 84 | X-0-content-type: multipart/mixed |
| 85 | X-0-filename: |
| 86 | X-0-charset: |
| 87 | X-0-boundary: T4sUOijqQbZv57TR |
| 88 | X-0-content-disposition: inline |
| 89 | X-0-content-transfer-encoding: |
| 90 | X-0-content-id: |
| 91 | X-0-content-description: |
| 92 | X-0-is-multipart: 1 |
| 93 | X-0-is-coverletter: 1 |
| 94 | X-0-is-rfc822: 0 |
| 95 | X-0-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00000 |
| 96 | X-0-content-size: 2 |
| 97 | X-1-content-type: text/plain |
| 98 | X-1-filename: |
| 99 | X-1-charset: US-ASCII |
| 100 | X-1-boundary: |
| 101 | X-1-content-disposition: inline |
| 102 | X-1-content-transfer-encoding: quoted-printable |
| 103 | X-1-content-id: |
| 104 | X-1-content-description: |
| 105 | X-1-is-multipart: 0 |
| 106 | X-1-is-coverletter: 1 |
| 107 | X-1-is-rfc822: 0 |
| 108 | X-1-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00001 |
| 109 | X-1-content-size: 1 |
| 110 | X-mime-regex: matched |
| 111 | X-2-content-type: text/plain |
| 112 | X-2-filename: |
| 113 | X-2-charset: us-ascii |
| 114 | X-2-boundary: |
| 115 | X-2-content-disposition: inline |
| 116 | X-2-content-transfer-encoding: |
| 117 | X-2-content-id: |
| 118 | X-2-content-description: |
| 119 | X-2-is-multipart: 0 |
| 120 | X-2-is-coverletter: 0 |
| 121 | X-2-is-rfc822: 0 |
| 122 | X-2-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00002 |
| 123 | X-2-content-size: 1 |
| 124 | X-3-content-type: text/plain |
| 125 | X-3-filename: working-patch |
| 126 | X-3-charset: us-ascii |
| 127 | X-3-boundary: |
| 128 | X-3-content-disposition: attachment |
| 129 | X-3-content-transfer-encoding: |
| 130 | X-3-content-id: |
| 131 | X-3-content-description: |
| 132 | X-3-is-multipart: 0 |
| 133 | X-3-is-coverletter: 0 |
| 134 | X-3-is-rfc822: 0 |
| 135 | X-3-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00003 |
| 136 | X-3-content-size: 1 |
| 137 | X-4-content-type: text/plain |
| 138 | X-4-filename: |
| 139 | X-4-charset: us-ascii |
| 140 | X-4-boundary: |
| 141 | X-4-content-disposition: inline |
| 142 | X-4-content-transfer-encoding: 7bit |
| 143 | X-4-content-id: |
| 144 | X-4-content-description: |
| 145 | X-4-is-multipart: 0 |
| 146 | X-4-is-coverletter: 0 |
| 147 | X-4-is-rfc822: 0 |
| 148 | X-4-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00004 |
| 149 | X-4-content-size: 1 |
| 150 | X-Router-SSint: was preserved |
| 151 | |
| 152 | --T4sUOijqQbZv57TR |
| 153 | Content-Type: text/plain; charset=US-ASCII |
| 154 | Content-Transfer-Encoding: quoted-printable |
| 155 | Content-Disposition: inline |
| 156 | |
| 157 | Test quoted-printable =3D |
| 158 | Space at end of line=40 |
| 159 | Continued line = |
| 160 | with this text. |
| 161 | |
| 162 | --T4sUOijqQbZv57TR |
| 163 | Content-Type: text/plain; charset=us-ascii |
| 164 | Content-Disposition: inline |
| 165 | |
| 166 | There was a part of the patch missing, complete one is attached. |
| 167 | sorry for wasting your time |
| 168 | |
| 169 | --T4sUOijqQbZv57TR |
| 170 | Content-Type: text/plain; charset=us-ascii |
| 171 | Content-Disposition: attachment; filename=working-patch |
| 172 | |
| 173 | --- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 |
| 174 | +++ eximstats 2004-12-17 13:47:37.763185260 +0100 |
| 175 | @@ -1107,11 +1107,11 @@ |
| 176 | if (scalar @chartdatanames < $ntopchart) |
| 177 | { |
| 178 | push(@chartdatanames, $key); |
| 179 | - push(@chartdatavals, $$m_count{$key}); |
| 180 | + push(@chartdatavals, $$m_data{$key}); |
| 181 | } |
| 182 | else |
| 183 | { |
| 184 | - $chartotherval += $$m_count{$key}; |
| 185 | + $chartotherval += $$m_data{$key}; |
| 186 | } |
| 187 | } |
| 188 | push(@chartdatanames, "Other"); |
| 189 | |
| 190 | --T4sUOijqQbZv57TR |
| 191 | Content-Type: text/plain; charset="us-ascii" |
| 192 | MIME-Version: 1.0 |
| 193 | Content-Transfer-Encoding: 7bit |
| 194 | Content-Disposition: inline |
| 195 | |
| 196 | -- |
| 197 | |
| 198 | --T4sUOijqQbZv57TR-- |
| 199 | |
| 200 | From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 |
| 201 | Received: from CALLER by myhost.test.ex with local (Exim x.yz) |
| 202 | (envelope-from <CALLER@myhost.test.ex>) |
| 203 | id 10HmbD-0005vi-00 |
| 204 | for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 |
| 205 | Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> |
| 206 | From: CALLER_NAME <CALLER@myhost.test.ex> |
| 207 | Date: Tue, 2 Mar 1999 09:44:33 +0000 |
| 208 | X-Router-SSint: was preserved |
| 209 | |
| 210 | A message without any headers. |
| 211 | |
| 212 | From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 |
| 213 | Received: from CALLER by myhost.test.ex with local (Exim x.yz) |
| 214 | (envelope-from <CALLER@myhost.test.ex>) |
| 215 | id 10HmbE-0005vi-00 |
| 216 | for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 |
| 217 | Date: Tue, 2 Mar 1999 09:44:33 +0000 |
| 218 | From: J Caesar <jcaesar@test.ex> |
| 219 | To: a-list00@exim.org |
| 220 | Message-ID: <20041217133501.GA3058@test.ex> |
| 221 | Mime-Version: 1.0 |
| 222 | Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" |
| 223 | Content-Disposition: inline |
| 224 | Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for |
| 225 | the "volume" charts |
| 226 | X-BeenThere: a-list00@exim.org |
| 227 | X-Mailman-Version: 2.1.5 |
| 228 | Precedence: list |
| 229 | Sender: CALLER_NAME <CALLER@myhost.test.ex> |
| 230 | X-0-content-type: multipart/mixed |
| 231 | X-0-filename: |
| 232 | X-0-charset: |
| 233 | X-0-boundary: T4sUOijqQbZv57TR |
| 234 | X-0-content-disposition: inline |
| 235 | X-0-content-transfer-encoding: |
| 236 | X-0-content-id: |
| 237 | X-0-content-description: |
| 238 | X-0-is-multipart: 1 |
| 239 | X-0-is-coverletter: 1 |
| 240 | X-0-is-rfc822: 0 |
| 241 | X-0-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00000 |
| 242 | X-0-content-size: 1 |
| 243 | X-1-content-type: text/plain |
| 244 | X-1-filename: |
| 245 | X-1-charset: us-ascii |
| 246 | X-1-boundary: |
| 247 | X-1-content-disposition: inline |
| 248 | X-1-content-transfer-encoding: |
| 249 | X-1-content-id: |
| 250 | X-1-content-description: |
| 251 | X-1-is-multipart: 0 |
| 252 | X-1-is-coverletter: 1 |
| 253 | X-1-is-rfc822: 0 |
| 254 | X-1-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00001 |
| 255 | X-1-content-size: 1 |
| 256 | X-2-content-type: text/plain |
| 257 | X-2-filename: working-patch |
| 258 | X-2-charset: us-ascii |
| 259 | X-2-boundary: |
| 260 | X-2-content-disposition: attachment |
| 261 | X-2-content-transfer-encoding: |
| 262 | X-2-content-id: |
| 263 | X-2-content-description: |
| 264 | X-2-is-multipart: 0 |
| 265 | X-2-is-coverletter: 0 |
| 266 | X-2-is-rfc822: 0 |
| 267 | X-2-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00002 |
| 268 | X-2-content-size: 1 |
| 269 | X-3-content-type: text/plain |
| 270 | X-3-filename: |
| 271 | X-3-charset: us-ascii |
| 272 | X-3-boundary: |
| 273 | X-3-content-disposition: inline |
| 274 | X-3-content-transfer-encoding: 7bit |
| 275 | X-3-content-id: |
| 276 | X-3-content-description: |
| 277 | X-3-is-multipart: 0 |
| 278 | X-3-is-coverletter: 0 |
| 279 | X-3-is-rfc822: 0 |
| 280 | X-3-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00003 |
| 281 | X-3-content-size: 1 |
| 282 | X-Router-SSint: was preserved |
| 283 | |
| 284 | --T4sUOijqQbZv57TR |
| 285 | Content-Type: text/plain; charset=us-ascii |
| 286 | Content-Disposition: inline |
| 287 | |
| 288 | There was a part of the patch missing, complete one is attached. |
| 289 | sorry for wasting your time |
| 290 | |
| 291 | --T4sUOijqQbZv57TR |
| 292 | Content-Type: text/plain; charset=us-ascii |
| 293 | Content-Disposition: attachment; filename=working-patch |
| 294 | |
| 295 | --- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 |
| 296 | +++ eximstats 2004-12-17 13:47:37.763185260 +0100 |
| 297 | @@ -1107,11 +1107,11 @@ |
| 298 | if (scalar @chartdatanames < $ntopchart) |
| 299 | { |
| 300 | push(@chartdatanames, $key); |
| 301 | - push(@chartdatavals, $$m_count{$key}); |
| 302 | + push(@chartdatavals, $$m_data{$key}); |
| 303 | } |
| 304 | else |
| 305 | { |
| 306 | - $chartotherval += $$m_count{$key}; |
| 307 | + $chartotherval += $$m_data{$key}; |
| 308 | } |
| 309 | } |
| 310 | push(@chartdatanames, "Other"); |
| 311 | |
| 312 | --T4sUOijqQbZv57TR |
| 313 | Content-Type: text/plain; charset="us-ascii" |
| 314 | MIME-Version: 1.0 |
| 315 | Content-Transfer-Encoding: 7bit |
| 316 | Content-Disposition: inline |
| 317 | |
| 318 | -- |
| 319 | |
| 320 | --T4sUOijqQbZv57TR-- |
| 321 | |
| 322 | From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 |
| 323 | Received: from CALLER (helo=test.ex) |
| 324 | by myhost.test.ex with local-esmtp (Exim x.yz) |
| 325 | (envelope-from <CALLER@myhost.test.ex>) |
| 326 | id 10HmbF-0005vi-00 |
| 327 | for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 |
| 328 | From: Test person <tp@cam.ac.uk> |
| 329 | To: Me <userx@test.ex> |
| 330 | Subject: A real test message |
| 331 | Date: Tue, 2 Mar 1999 09:44:33 +0000 |
| 332 | Message-ID: <41C2F849.3060203@projectile.test.ex> |
| 333 | FakeDefer: test fakedefer |
| 334 | Sender: CALLER_NAME <CALLER@myhost.test.ex> |
| 335 | X-Regex: Regex matched |
| 336 | X-Router-SSint: was preserved |
| 337 | |
| 338 | OK, this should look like a genuine message, but |
| 339 | it will trip on THIS REGEX. |
| 340 | |