Subversion Repositories sa-exim

Compare Revisions

Ignore whitespace Rev 90 → Rev 91

/trunk/debian/changelog
5,9 → 5,10
(Probably closes: #879687; it's a bit unclear what the bug is about).
* api-limitation.patch: Do expansion of $primary_hostname on every call;
for some reason, it were getting overwritten between calls despite
using the permanent memory pool in accordance with Exim documentation
(Closes: #926952). Also start using body_linecount again since it's
now part of the API.
using the permanent memory pool in accordance with Exim documentation.
Also start using body_linecount again since it's now part of the API,
but don't update it when it's zero, indicating that the spool file is
in wire format.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 05 May 2019 23:52:33 +0200
 
/trunk/debian/patches/api-limitations.patch
30,8 → 30,22
/* New values we read from spamassassin */
char *xspamstatus=NULL;
char *xspamflag=NULL;
@@ -1241,6 +1242,7 @@ restart:
@@ -1229,18 +1230,20 @@ restart:
}
}
+
if (SAEximDebug > 1)
{
log_write(0, LOG_MAIN, "SA: Debug2: body_linecount before SA: %d", body_linecount);
}
/* update global variable $body_linecount to reflect the new body size*/
- body_linecount = (line - 1);
+ if (body_linecount > 0) body_linecount = (line - 1); // Not updating if zero, indicating spool_wireformat
if (SAEximDebug > 1)
{
log_write(0, LOG_MAIN, "SA: Debug2: body_linecount after SA: %d", body_linecount);
}
+
38,7 → 52,7
}
fclose((FILE *)readfh);
@@ -1331,6 +1333,9 @@ restart:
@@ -1331,6 +1334,9 @@ restart:
if (dorej && doteergrube)
{
48,7 → 62,7
/* By default, we'll only save temp bounces by message ID so
* that when the same message is submitted several times, we
* overwrite the same file on disk and not create a brand new
@@ -1353,20 +1358,8 @@ restart:
@@ -1353,20 +1359,8 @@ restart:
for (i=0;i<SAteergrubetime/10;i++)
{