The following commit has been merged in the debian-master branch:
commit b689b79b3a6d8cf48f1207286efeeb28b168cd01
Merge: cc64e538174791c4999696bb47fd1bdc585384f0
9f59a972d18eab0966908bbdcd8a4a5e14c899d4
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sat Jun 7 01:50:56 2008 +0200
Merge branch 'master' into debian-master
Conflicts:
conf/apache.conf.sed.in
diff --combined conf/apache.conf.sed.in
index 953e507,2067d86..7327825
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -72,8 -72,6 +72,8 @@@
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
+ CBandUser pdo
+
Alias /cgi-bin/ %TOPDIR%/cgi-bin/
PerlModule ModPerl::Registry
@@@ -113,13 -111,17 +113,17 @@@
RewriteRule ^/[^/]+\.css - [L]
RewriteRule ^/[^/]+\.js - [L]
RewriteRule ^/favicon.ico$ - [L]
+ RewriteRule ^/robots.txt$ - [L]
-# RewriteRule ^/$ http://www.debian.org/distrib/packages
- RewriteRule ^/$ /index.html [L]
+ RewriteRule ^/$ http://www.debian.org/distrib/packages
+# RewriteRule ^/$ /index.html [L]
- RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
- RewriteRule ^/changelog:(.+)$
http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
- RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
- RewriteRule ^/file:(.+)$
http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+ RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
+ RewriteRule ^/changelog:(.+)$
http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
+ RewriteRule ^/src:([^/]+)$
http://%SITE%/search?searchon=sourcenames&keywords=$1 [R,L,NE]
+ RewriteRule ^/file:(.+)$
http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+ RewriteCond %{REQUEST_URI} !^/search$ [OR]
+ RewriteCond %{QUERY_STRING} ^$
+ RewriteRule ^/([^/]+)$ http://%SITE%/search?keywords=$1
[R,L,NE]
RewriteCond %{QUERY_STRING} =""
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
