You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/11/11 18:12:29 UTC
incubator-freemarker-site git commit: Redirecting HTTP to HTTPS
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/asf-site 6737e759e -> e0930204b
Redirecting HTTP to HTTPS
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/e0930204
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/e0930204
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/e0930204
Branch: refs/heads/asf-site
Commit: e0930204b8d4eac820dde1a905c5d6920d186568
Parents: 6737e75
Author: ddekany <dd...@apache.org>
Authored: Sat Nov 11 19:12:19 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Nov 11 19:12:19 2017 +0100
----------------------------------------------------------------------
.htaccess | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e0930204/.htaccess
----------------------------------------------------------------------
diff --git a/.htaccess b/.htaccess
index 7bb94e8..239998d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -12,5 +12,6 @@ RewriteBase /
# Redirect to the canonical domain:
RewriteCond %{HTTP_HOST} ^(www\.)?freemarker\.org$ [NC,OR]
-RewriteCond %{HTTP_HOST} ^freemarker\.incubator\. [NC]
-RewriteRule ^(.*)$ http://freemarker.apache.org/$1 [R=301,L]
+RewriteCond %{HTTP_HOST} ^freemarker\.incubator\. [NC,OR]
+RewriteCond %{HTTPS} ^off$ [NC]
+RewriteRule ^(.*)$ https://freemarker.apache.org/$1 [R=301,L]