merge changes from mainline

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 16d6ecc22d777b1f1207574891fffd4b647b89ab..fc88d5e70be42522683d91cfd17a5993c87d5d12 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -3,6 +3,13 @@
 package debbugs;
 
 use strict;
+
+if (defined $ENV{REMOTE_ADDR} and $ENV{REMOTE_ADDR} =~ m/^(72\.17\.168\.57|60\.238\.143\.248|61\.224\.27\.141|146\.82\.138\.7|61\.214\.28\.119|84\.189\.46\.3|82\.124\.165\.25|220\.181\.26\.108|220\.95\.221\.\d+|82\.120\.77\.220|80\.68\.89\.71|66\.227\.249\.188|194\.46\.224\.153|66\.246\.72\.81|60\.42\.181\.163)$/) {
+    print "Content-Type: text/html\n\nGo away.";
+    sleep(5);
+    exit 0;
+}
+
 use POSIX qw(strftime tzset);
 use MIME::Parser;
 use MIME::Decoder;

diff --git a/scripts/process.in b/scripts/process.in
index d857f8d29eb757ad527b976c256b8ca9fe1b2bcb..d7c6f9990be3074a63b31b3ebbb2787476b70dfa 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -869,7 +869,10 @@ $gMaintainer
 (administrator, $gProject $gBugs database)
 END
     } elsif ($codeletter ne 'U' and
-             $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/) {
+             $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/ and
+            # Workaround for gcc mail loops; bugzilla should do Precedence:
+            # instead. Deliberately not in CVS. - cjwatson
+            not exists $header{'x-bugzilla-reason'}) {
         &htmllog("Acknowledgement","sent",$replyto,
                  ($veryquiet ? "Extra info received and filed, but not forwarded." :
                   $codeletter eq 'M' ? "Extra info received and forwarded to maintainer." :