From cdda77b3b4c815b80603d1a69d793b5156c5672e Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Tue, 8 Sep 2015 18:51:57 -0400
Subject: [PATCH] Apply workaround to SSL config for mod_gnutls

HTTPS environmental variable is not set properly by mod_gnutls.
---
 data/etc/apache2/sites-available/plinth-ssl.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/etc/apache2/sites-available/plinth-ssl.conf b/data/etc/apache2/sites-available/plinth-ssl.conf
index a7831936c..93ad6b06f 100644
--- a/data/etc/apache2/sites-available/plinth-ssl.conf
+++ b/data/etc/apache2/sites-available/plinth-ssl.conf
@@ -6,10 +6,11 @@
 ##
 ## Requires the following Apache modules to be enabled:
 ##   mod_rewrite
-##   mod_ssl
+##   mod_gnutls
 ##
 <Location /plinth>
     RewriteEngine on
-    ReWriteCond %{HTTPS} !=on
+    # FIXME: Workaround for mod_gnutls (Debian Bug #514005)
+    RewriteCond %{SERVER_PORT} !^443$
     RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </Location>