From 31c491ae46f9f327f430f6189a2138b39925c557 Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Wed, 4 May 2016 21:34:15 -0400
Subject: [PATCH] Revert "Apply workaround to SSL config for mod_gnutls"

Debian bug #514005 is resolved in mod_gnutls 0.7.4-1.

This reverts commit cdda77b3b4c815b80603d1a69d793b5156c5672e.
---
 data/etc/apache2/sites-available/plinth-ssl.conf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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