[project @ 2005-10-19 02:04:16 by don]

* Fix example rewrite rules to allow for #1234 and foo+bar@baz.com
  (closes: #321925)

diff --git a/debian/changelog b/debian/changelog
index ad86ab5c252b46991def265e1e5ac58ba8fe0ad9..2d1b63669c75e79953f9132eb08cdbd2797a6589 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -94,6 +94,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Allow X-debbugs-* to be set in pseudo headers. (closes: #179340)
     - Obey X-Debbugs-No-Ack in control@ messages. (closes: #201825)
     - Allow forwarded: to be set at submit@ time. (closes: #128320)
+    - Fix example rewrite rules to allow for #1234 and foo+bar@baz.com
+    (closes: #321925)
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
 

diff --git a/examples/apache.conf b/examples/apache.conf
index 4f9f04c050bdbf86666fe80ae5f844eb207cc28e..00ec1c8df439624be489ef76e44a48670393bd3e 100644 (file)
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -16,12 +16,12 @@
     RewriteRule ^/$ http://www.debian.org/Bugs/
     RewriteRule ^/(robots\.txt|release-critical|apt-listbugs\.html)$ - [L]
     # The following two redirect to up-to-date pages
-    RewriteRule ^/([[:digit:]][[:digit:]][[:digit:]]+)$ /cgi-bin/bugreport.cgi?bug=$1 [L,R]
-    RewriteRule ^/[Ff][Rr][Oo][Mm]:([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?submitter=$1 [L,R]
+    RewriteRule ^/[[:space:]]*#?([[:digit:]][[:digit:]][[:digit:]]+)$ /cgi-bin/bugreport.cgi?bug=$1 [L,R]
+    RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
+    RewriteRule ^/[Ff][Rr][Oo][Mm]:([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?submitter=$1 [L,R,NE]
     # Commented out, 'cuz aj says it will crash master. (old master)
     # RewriteRule ^/[Ss][Ee][Vv][Ee][Rr][Ii][Tt][Yy]:([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?severity=$1 [L,R]
-    RewriteRule ^/([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?maint=$1 [L,R]
-    RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
+    RewriteRule ^/([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?maint=$1 [L,R,NE]
     RewriteRule ^/mbox:([[:digit:]][[:digit:]][[:digit:]]+)$ /cgi-bin/bugreport.cgi?mbox=yes&bug=$1 [L,R,NE]
     RewriteRule ^/src:([^/]+)$ /cgi-bin/pkgreport.cgi?src=$1 [L,R,NE]
     RewriteRule ^/severity:([^/]+)$ /cgi-bin/pkgreport.cgi?severity=$1 [L,R,NE]