From d516e577be1e911bb86777377174862358951123 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 22 Dec 2016 15:42:30 +0000 Subject: [PATCH] Bug 12904: (QA follow-up) Don't send 301 status Signed-off-by: Nick Clemens Signed-off-by: Olli-Antti Kivilahti Signed-off-by: Kyle M Hall --- debian/templates/apache-shared-intranet.conf | 4 ++-- debian/templates/apache-shared-opac.conf | 4 ++-- etc/koha-httpd.conf | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/templates/apache-shared-intranet.conf b/debian/templates/apache-shared-intranet.conf index 429a8ab781..0fb4fdbfa4 100644 --- a/debian/templates/apache-shared-intranet.conf +++ b/debian/templates/apache-shared-intranet.conf @@ -17,8 +17,8 @@ RewriteRule (.+) $1?%1%2 [N,R,NE] RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT] RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT] RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] -RewriteRule ^(.*)_(.*).js$ $1.js [R=301,N,L] -RewriteRule ^(.*)_(.*).css$ $1.css [R=301,N,L] +RewriteRule ^(.*)_(.*).js$ $1.js [N,L] +RewriteRule ^(.*)_(.*).css$ $1.css [N,L] Alias "/api" "/usr/share/koha/api" diff --git a/debian/templates/apache-shared-opac.conf b/debian/templates/apache-shared-opac.conf index ca2f7c3f86..e63ab1c26c 100644 --- a/debian/templates/apache-shared-opac.conf +++ b/debian/templates/apache-shared-opac.conf @@ -17,8 +17,8 @@ RewriteRule (.+) $1?%1%2 [N,R,NE] RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT] RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT] RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] -RewriteRule ^(.*)_(.*).js$ $1.js [R=301,N,L] -RewriteRule ^(.*)_(.*).css$ $1.css [R=301,N,L] +RewriteRule ^(.*)_(.*).js$ $1.js [N,L] +RewriteRule ^(.*)_(.*).css$ $1.css [N,L] = 2.4> AliasMatch "^/sitemap(.*)" "/var/lib/koha/${instance}/sitemap/sitemap$1" diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf index 4f1eb741a5..bfebace84d 100644 --- a/etc/koha-httpd.conf +++ b/etc/koha-httpd.conf @@ -111,8 +111,8 @@ RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT] RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT] RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] - RewriteRule ^(.*)_(.*).js$ $1.js [R=301,N,L] - RewriteRule ^(.*)_(.*).css$ $1.css [R=301,N,L] + RewriteRule ^(.*)_(.*).js$ $1.js [N,L] + RewriteRule ^(.*)_(.*).css$ $1.css [N,L] # REST API configuration Alias "/api" "__API_CGI_DIR__" @@ -230,8 +230,8 @@ RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT] RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT] RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] - RewriteRule ^(.*)_(.*).js$ $1.js [R=301,N,L] - RewriteRule ^(.*)_(.*).css$ $1.css [R=301,N,L] + RewriteRule ^(.*)_(.*).js$ $1.js [N,L] + RewriteRule ^(.*)_(.*).css$ $1.css [N,L] # REST API configuration Alias "/api" "__API_CGI_DIR__" -- 2.11.0