From 3ce41982d7ff5837f7ae448258aa68465b1fd883 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Sun, 11 Aug 2019 17:31:09 +0800 Subject: [PATCH] Redirect unsetlang to the correct location The substitution was using the wrong match group. Fixes: commit eef0d1229a8d2627ffc8663eda9bd2d68a0ef09c --- modules/roles/templates/apache-www.debian.org.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb index 45eab881b..2253aa7d2 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -142,7 +142,7 @@ RewriteCond %{REQUEST_METHOD} ^POST$ RewriteRule /intro/cn/setlang/([a-z]{2}(?:-[a-z]{2})?)/(.*) /$2 [last,redirect,cookie=lang:$1:%{HTTP_HOST}:40320:/:secure:] RewriteCond %{REQUEST_METHOD} ^POST$ - RewriteRule /intro/cn/unsetlang/(.*) /$2 [last,redirect,cookie=lang:invalid:%{HTTP_HOST}:-1:/:secure:] + RewriteRule /intro/cn/unsetlang/(.*) /$1 [last,redirect,cookie=lang:invalid:%{HTTP_HOST}:-1:/:secure:] SetEnvIf Cookie "lang=(.+)" prefer-language=$1 Header append Vary cookie -- 2.20.1