INN commit: trunk/frontends (pullnews.in)

INN Commit rra at isc.org
Wed Aug 10 18:55:15 UTC 2011


    Date: Wednesday, August 10, 2011 @ 11:55:15
  Author: iulius
Revision: 9331

pullnews:  no longer modify invalid empty header fields

pullnews MUST NOT modify header lines by default.  Remove the part
of the code that was removing empty header lines. 

According to RFC 5537:

3.6.  Duties of a Relaying Agent

   Relaying agents MUST NOT alter, delete, or rearrange any part of an
   article except for the Path and Xref header fields.  They MUST NOT
   modify the body of articles in any way.  If an article is not
   acceptable as is, the article MUST be rejected rather than modified.


Also, fix the first lines of the script to no longer say that
pullnews can be used without INN.  (We use shlock.)

Modified:
  trunk/frontends/pullnews.in

-------------+
 pullnews.in |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

Modified: pullnews.in
===================================================================
--- pullnews.in	2011-08-09 17:24:23 UTC (rev 9330)
+++ pullnews.in	2011-08-10 18:55:15 UTC (rev 9331)
@@ -1,6 +1,5 @@
 #! /usr/bin/perl -w
-# use lib '@LIBPERLDIR@'; use INN::Config;
-# If running inside INN, uncomment the above and point to INN::Config.
+# fixscript will replace this line with code to load INN::Config
 #
 # Author:       James Brister <brister at vix.com> -- berkeley-unix --
 # Start Date:   Sat, 10 Oct 1998 21:40:11 +0200
@@ -727,17 +726,6 @@
                     $xref = 1;
                 }
 
-                # Catch some of the more common problems with articles.
-                if ($article->[$idx] =~ m!^\s+\n$! and $curr_hdr ne 'subject') {
-                    print STDERR "Fixing bad header line[$idx]-1: $article->[$idx-1]" if $idx > 0;
-                    print STDERR "Fixing bad header line[$idx]::: $article->[$idx]";
-                    print STDERR "Fixing bad header line[$idx]+1: $article->[$idx+1]";
-                    # Do not use $line_len here because $article->[$idx] has been modified
-                    # since the length was computed.
-                    $tx_len -= length($article->[$idx]) - 1;
-                    $article->[$idx] = "\n";
-                }
-
                 $headers = 0 if $article->[$idx] eq "\n";
             }
             if (@hdr_to_match and (not $match_all_hdrs or @hdr_to_match != scalar(keys %m_found_hdrs))) {




More information about the inn-committers mailing list