diff --git a/doc/hook-perl b/doc/hook-perl index 965b4b2..ca8ae79 100644 --- a/doc/hook-perl +++ b/doc/hook-perl @@ -88,7 +88,18 @@ The innd Perl Filter Supersedes, Bytes, Also-Control, References, Keywords, X-Trace, NNTP-Posting-Host, Followup-To, Organization, Content-Type, Content-Base, Content-Disposition, X-Newsreader, X-Mailer, - X-Cancelled-By, X-Canceled-By, Cancel-Key + X-Cancelled-By, X-Canceled-By, Cancel-Key, User-Agent, + X-Newsposter, X-Original-Message-ID, Xref, Cancel-Lock, + Content-Transfer-Encoding, Face, Injection-Info, List-ID, + MIME-Version, Originator, X-Auth, X-Complaints-To, X-Face, + X-HTTP-UserAgent, X-HTTP-Via, X-Modbot, X-Modtrace, X-No-Archive, + X-Original-Trace, X-Originating-IP, X-PGP-Key, X-PGP-Sig, + X-Poster-Trace, X-Postfilter, X-Proxy-User, X-Submissions-To, + X-Usenet-Provider, In-Reply-To, Injection-Date, NNTP-Posting-Date + + Note that all headers are as they arrived, not modified by your inn + (especially, Xref if present is that of remote site that sent you the + article, NOT yours). (so, for example, the Newsgroups header of the article is accessible inside the Perl filter as $hdr{Newsgroups}). In addition, diff --git a/doc/hook-python b/doc/hook-python index 5f624d1..cf4e037 100644 --- a/doc/hook-python +++ b/doc/hook-python @@ -74,7 +74,13 @@ WRITING AN INND FILTER X-Trace, NNTP-Posting-Host, Followup-To, Organization, Content-Type, Content-Base, Content-Disposition, X-Newsreader, X-Mailer, X-Newsposter, X-Cancelled-By, X-Canceled-By, Cancel-Key, - __LINES__, __BODY__ + User-Agent, X-Newsposter, X-Original-Message-ID, Xref, Cancel-Lock, + Content-Transfer-Encoding, Face, Injection-Info, List-ID, MIME-Version, + Originator, X-Auth, X-Complaints-To, X-Face, X-HTTP-UserAgent, + X-HTTP-Via, X-Modbot, X-Modtrace, X-No-Archive, X-Original-Trace, + X-Originating-IP, X-PGP-Key, X-PGP-Sig, X-Poster-Trace, X-Postfilter, + X-Proxy-User, X-Submissions-To, X-Usenet-Provider, In-Reply-To, + Injection-Date, NNTP-Posting-Date, __LINES__, __BODY__ All the above values will be buffer objects holding the contents of the same named article headers, except for the special __BODY__ and diff --git a/doc/pod/hook-perl.pod b/doc/pod/hook-perl.pod index 799b6e9..4b11375 100644 --- a/doc/pod/hook-perl.pod +++ b/doc/pod/hook-perl.pod @@ -88,7 +88,18 @@ standard headers are: Supersedes, Bytes, Also-Control, References, Keywords, X-Trace, NNTP-Posting-Host, Followup-To, Organization, Content-Type, Content-Base, Content-Disposition, X-Newsreader, X-Mailer, - X-Cancelled-By, X-Canceled-By, Cancel-Key + X-Cancelled-By, X-Canceled-By, Cancel-Key, User-Agent, + X-Newsposter, X-Original-Message-ID, Xref, Cancel-Lock, + Content-Transfer-Encoding, Face, Injection-Info, List-ID, + MIME-Version, Originator, X-Auth, X-Complaints-To, X-Face, + X-HTTP-UserAgent, X-HTTP-Via, X-Modbot, X-Modtrace, X-No-Archive, + X-Original-Trace, X-Originating-IP, X-PGP-Key, X-PGP-Sig, + X-Poster-Trace, X-Postfilter, X-Proxy-User, X-Submissions-To, + X-Usenet-Provider, In-Reply-To, Injection-Date, NNTP-Posting-Date + + +Note that all headers are as they arrived, not modified by your inn (especially, +Xref if present is that of remote site that sent you the article, NOT yours). (so, for example, the Newsgroups header of the article is accessible inside the Perl filter as C<$hdr{Newsgroups}>). In addition, diff --git a/doc/pod/hook-python.pod b/doc/pod/hook-python.pod index 6b79465..a0fadde 100644 --- a/doc/pod/hook-python.pod +++ b/doc/pod/hook-python.pod @@ -78,7 +78,13 @@ defined: X-Trace, NNTP-Posting-Host, Followup-To, Organization, Content-Type, Content-Base, Content-Disposition, X-Newsreader, X-Mailer, X-Newsposter, X-Cancelled-By, X-Canceled-By, Cancel-Key, - __LINES__, __BODY__ + User-Agent, X-Newsposter, X-Original-Message-ID, Xref, Cancel-Lock, + Content-Transfer-Encoding, Face, Injection-Info, List-ID, MIME-Version, + Originator, X-Auth, X-Complaints-To, X-Face, X-HTTP-UserAgent, + X-HTTP-Via, X-Modbot, X-Modtrace, X-No-Archive, X-Original-Trace, + X-Originating-IP, X-PGP-Key, X-PGP-Sig, X-Poster-Trace, X-Postfilter, + X-Proxy-User, X-Submissions-To, X-Usenet-Provider, In-Reply-To, + Injection-Date, NNTP-Posting-Date, __LINES__, __BODY__ All the above values will be buffer objects holding the contents of the same named article headers, except for the special __BODY__ and __LINES__ diff --git a/innd/innd.c b/innd/innd.c index ff7e3b4..1e5ec76 100644 --- a/innd/innd.c +++ b/innd/innd.c @@ -138,10 +138,64 @@ const ARTHEADER ARTheaders[] = { /* #define HDR__CANCELKEY 36 */ ARTHEADERINIT("User-Agent", HTstd), /* #define HDR__USER_AGENT 37 */ - ARTHEADERINIT("X-Original-Message-ID", HTstd) + ARTHEADERINIT("X-Original-Message-ID", HTstd), /* #define HDR__X_ORIGINAL_MESSAGE_ID 38 */ + ARTHEADERINIT("Cancel-Lock", HTstd), +/* #define HDR__CANCEL_LOCK 39 */ + ARTHEADERINIT("Content-Transfer-Encoding", HTstd), +/* #define HDR__CONTENT_TRANSFER_ENCODING 40 */ + ARTHEADERINIT("Face", HTstd), +/* #define HDR__FACE 41 */ + ARTHEADERINIT("Injection-Info", HTstd), +/* #define HDR__INJECTION_INFO 42 */ + ARTHEADERINIT("List-ID", HTstd), +/* #define HDR__LIST_ID 43 */ + ARTHEADERINIT("MIME-Version", HTstd), +/* #define HDR__MIME_VERSION 44 */ + ARTHEADERINIT("Originator", HTstd), +/* #define HDR__ORIGINATOR 45 */ + ARTHEADERINIT("X-Auth", HTstd), +/* #define HDR__X_AUTH 46 */ + ARTHEADERINIT("X-Complaints-To", HTstd), +/* #define HDR__X_COMPLAINTS_TO 47 */ + ARTHEADERINIT("X-Face", HTstd), +/* #define HDR__X_FACE 48 */ + ARTHEADERINIT("X-HTTP-UserAgent", HTstd), +/* #define HDR__X_HTTP_USERAGENT 49 */ + ARTHEADERINIT("X-HTTP-Via", HTstd), +/* #define HDR__X_HTTP_VIA 50 */ + ARTHEADERINIT("X-Modbot", HTstd), +/* #define HDR__X_MODBOT 51 */ + ARTHEADERINIT("X-Modtrace", HTstd), +/* #define HDR__X_MODTRACE 52 */ + ARTHEADERINIT("X-No-Archive", HTstd), +/* #define HDR__X_NO_ARCHIVE 53 */ + ARTHEADERINIT("X-Original-Trace", HTstd), +/* #define HDR__X_ORIGINAL_TRACE 54 */ + ARTHEADERINIT("X-Originating-IP", HTstd), +/* #define HDR__X_ORIGINATING_IP 55 */ + ARTHEADERINIT("X-PGP-Key", HTstd), +/* #define HDR__X_PGP_KEY 56 */ + ARTHEADERINIT("X-PGP-Sig", HTstd), +/* #define HDR__X_PGP_SIG 57 */ + ARTHEADERINIT("X-Poster-Trace", HTstd), +/* #define HDR__X_POSTER_TRACE 58 */ + ARTHEADERINIT("X-Postfilter", HTstd), +/* #define HDR__X_POSTFILTER 59 */ + ARTHEADERINIT("X-Proxy-User", HTstd), +/* #define HDR__X_PROXY_USER 60 */ + ARTHEADERINIT("X-Submissions-To", HTstd), +/* #define HDR__X_SUBMISSIONS_TO 61 */ + ARTHEADERINIT("X-Usenet-Provider", HTstd), +/* #define HDR__X_USENET_PROVIDER 62 */ + ARTHEADERINIT("In-Reply-To", HTstd), +/* #define HDR__IN_REPLY_TO 63 */ + ARTHEADERINIT("Injection-Date", HTstd), +/* #define HDR__INJECTION_DATE 64 */ + ARTHEADERINIT("NNTP-Posting-Date", HTstd) +/* #define HDR__NNTP_POSTING_DATE 65 */ }; -/* #define MAX_ARTHEADER 39 */ +/* #define MAX_ARTHEADER 66 */ /* diff --git a/innd/innd.h b/innd/innd.h index 79a3d80..5074e5d 100644 --- a/innd/innd.h +++ b/innd/innd.h @@ -177,9 +177,36 @@ typedef struct _HDRCONTENT { #define HDR__XCANCELEDBY 35 #define HDR__CANCELKEY 36 #define HDR__USER_AGENT 37 -#define HDR__X_ORIGINAL_MESSAGE_ID 38 - -#define MAX_ARTHEADER 39 +#define HDR__X_ORIGINAL_MESSAGE_ID 38 +#define HDR__CANCEL_LOCK 39 +#define HDR__CONTENT_TRANSFER_ENCODING 40 +#define HDR__FACE 41 +#define HDR__INJECTION_INFO 42 +#define HDR__LIST_ID 43 +#define HDR__MIME_VERSION 44 +#define HDR__ORIGINATOR 45 +#define HDR__X_AUTH 46 +#define HDR__X_COMPLAINTS_TO 47 +#define HDR__X_FACE 48 +#define HDR__X_HTTP_USERAGENT 49 +#define HDR__X_HTTP_VIA 50 +#define HDR__X_MODBOT 51 +#define HDR__X_MODTRACE 52 +#define HDR__X_NO_ARCHIVE 53 +#define HDR__X_ORIGINAL_TRACE 54 +#define HDR__X_ORIGINATING_IP 55 +#define HDR__X_PGP_KEY 56 +#define HDR__X_PGP_SIG 57 +#define HDR__X_POSTER_TRACE 58 +#define HDR__X_POSTFILTER 59 +#define HDR__X_PROXY_USER 60 +#define HDR__X_SUBMISSIONS_TO 61 +#define HDR__X_USENET_PROVIDER 62 +#define HDR__IN_REPLY_TO 63 +#define HDR__INJECTION_DATE 64 +#define HDR__NNTP_POSTING_DATE 65 + +#define MAX_ARTHEADER 66 /* ** Miscellaneous data we want to keep on an article. All the fields