Mailing List Archive

Author: jm
Date: Tue Apr 26 11:11:14 2005
New Revision: 164852

URL: http://svn.apache.org/viewcvs?rev=164852&view=rev
Log:
remove non-functional X-header code; instead, just ignore any protocol headers in the spamd response that we do not understand, in a HTTP-compatible style, since this is what it was supposed to be doing in the first place anyway

Modified:
spamassassin/trunk/spamc/libspamc.c
spamassassin/trunk/spamd/PROTOCOL

Modified: spamassassin/trunk/spamc/libspamc.c
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamc/libspamc.c?rev=164852&r1=164851&r2=164852&view=diff
==============================================================================
--- spamassassin/trunk/spamc/libspamc.c (original)
+++ spamassassin/trunk/spamc/libspamc.c Tue Apr 26 11:11:14 2005
@@ -831,13 +831,9 @@
}
return EX_OK;
}
- else if (strcmp(buf, "X-") == 0) {
- /* skip X-headers that may be locally defined */
- return EX_OK;
- }

- libspamc_log(flags, LOG_ERR, "spamd responded with bad header '%s'", buf);
- return EX_PROTOCOL;
+ /* skip any other headers that may be locally defined */
+ return EX_OK;
}

int message_filter(struct transport *tp, const char *username,

Modified: spamassassin/trunk/spamd/PROTOCOL
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamd/PROTOCOL?rev=164852&r1=164851&r2=164852&view=diff
==============================================================================
--- spamassassin/trunk/spamd/PROTOCOL (original)
+++ spamassassin/trunk/spamd/PROTOCOL Tue Apr 26 11:11:14 2005
@@ -71,6 +71,10 @@
SPAMD/1.1 0 EX_OK
Spam: False ; 2 / 5

+There may be additional headers following the "Spam:" header, which
+are as yet undefined. Clients should ignore these, and keep looking for
+headers which they do support, or the "\r\n\r\n" end-of-headers marker.
+

SYMBOLS command returns the same as CHECK, followed by a line listing all the
rule names, separated by commas. Note that some versions of the protocol