apache.conf: Fix the redirects for the old search scripts

Hopefully nobody uses those anymore since they were broken for
quite a long time.

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 8594aecc7c41d1429c629055fada41c060631b89..b0b33e3fbb5c309ce35df5a65ca4bb53a3c220fa 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -116,8 +116,9 @@
    RewriteRule ^/changelog:(.+)$       /changelogs/${changelog-url:$1} [R,L,NE]
    RewriteRule ^/src:([^/]+)$          /search?searchon=sourcenames&keywords=$1 [R,L,NE]
    RewriteRule ^/file:(.+)$            /search?searchon=contents&keywords=$1 [R,L,NE]
-   RewriteCond %{REQUEST_URI} !^/search$ [OR]
-   RewriteCond %{QUERY_STRING} ^$
+   RewriteCond %{QUERY_STRING} ^$ [OR]
+   RewriteCond %{REQUEST_URI} !^/search$
+   RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
    RewriteRule ^/([^/]+)$              /search?keywords=$1 [R,L,NE]
 
    RewriteCond %{QUERY_STRING} =""