From 3ad8446706afa6754de74577bd5334c235192d7c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 15 Jun 2016 06:08:56 -0400
Subject: [PATCH] Fixed Issue 3944: Rewrite HTTP to HTTPS does not work without SEO Redirect
---
server/conf/vhost.conf.master | 1 -
server/plugins-available/apache2_plugin.inc.php | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 66b4608..62ef151 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -396,7 +396,6 @@
<tmpl_if name="rewrite_enabled">
RewriteEngine on
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
- RewriteEngine on
RewriteCond %{REQUEST_URI} ^/\.well-known/acme-challenge/
RewriteRule ^ - [END]
</tmpl_if>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 6763399..021078d 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1494,7 +1494,7 @@
if (count($rewrite_wildcard_rules) > 0) $rewrite_rules = array_merge($rewrite_rules, $rewrite_wildcard_rules); // Append wildcard rules to the end of rules
- if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0 || count($alias_seo_redirects) > 0) {
+ if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0 || count($alias_seo_redirects) > 0 || $data['new']['rewrite_to_https'] == 'y') {
$tpl->setVar('rewrite_enabled', 1);
} else {
$tpl->setVar('rewrite_enabled', 0);
--
Gitblit v1.9.1