From cb29d162555f96546c8ddd0f371005ed0cedb447 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 3 Feb 2015 15:49:11 +0100 Subject: Fix drop broken and unneeded explicit http-clone support. --- apache2/conf.available/local-cgit.conf | 4 ---- apache2/conf.d/local-cgit.conf | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/apache2/conf.available/local-cgit.conf b/apache2/conf.available/local-cgit.conf index 5ccb726..100720c 100644 --- a/apache2/conf.available/local-cgit.conf +++ b/apache2/conf.available/local-cgit.conf @@ -23,9 +23,5 @@ RewriteEngine on RewriteRule ^/(cgit-css/)?(cgit\.(css|png)|favicon\.ico|robots.txt)$ /usr/share/cgit/$2 [last] -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule "^(.*)/(.*)/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack)$" /usr/lib/git-core/git-http-backend/$1.git/$2 [NS,L,QSA] - RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^(/.*)?$ /usr/lib/cgit/cgit.cgi$1 [T=application/x-httpd-cgi,L,NS] diff --git a/apache2/conf.d/local-cgit.conf b/apache2/conf.d/local-cgit.conf index ee291e2..e3cd43c 100644 --- a/apache2/conf.d/local-cgit.conf +++ b/apache2/conf.d/local-cgit.conf @@ -12,7 +12,7 @@ AddDefaultCharset UTF-8 AllowOverride None Order allow,deny allow from all -< + @@ -20,15 +20,11 @@ AddDefaultCharset UTF-8 AllowOverride None Order allow,deny allow from all -< + RewriteEngine on RewriteRule ^/(cgit-css/)?(cgit\.(css|png)|favicon\.ico|robots.txt)$ /usr/share/cgit/$2 [last] -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule "^(.*)/(.*)/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack)$" /usr/lib/git-core/git-http-backend/$1.git/$2 [NS,L,QSA] - RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^(/.*)?$ /usr/lib/cgit/cgit.cgi$1 [T=application/x-httpd-cgi,L,NS] -- cgit v1.2.3