make the htsts headers optional and stored in .ini file.

also don't use it with DEBUG

development.ini

@@ -66,7 +66,10 b' index_dir = %(here)s/data/index'
 app_instance_uuid = rc-develop
 cut_off_limit = 256000
 vcs_full_cache = True
+# force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
+# use Strict-Transport-Security headers
+use_htsts = false
 commit_parse_limit = 25
 # number of items displayed in lightweight dashboard before paginating
 dashboard_items = 100

production.ini

@@ -66,7 +66,10 b' index_dir = %(here)s/data/index'
 app_instance_uuid = rc-production
 cut_off_limit = 256000
 vcs_full_cache = True
+# force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
+# use Strict-Transport-Security headers
+use_htsts = false
 commit_parse_limit = 50
 # number of items displayed in lightweight dashboard before paginating
 dashboard_items = 100

rhodecode/config/deployment.ini_tmpl

@@ -66,7 +66,10 b' index_dir = %(here)s/data/index'
 app_instance_uuid = ${app_instance_uuid}
 cut_off_limit = 256000
 vcs_full_cache = True
+# force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
+# use Strict-Transport-Security headers
+use_htsts = false
 commit_parse_limit = 50
 # number of items displayed in lightweight dashboard before paginating
 dashboard_items = 100

rhodecode/lib/middleware/https_fixup.py

@@ -35,12 +35,17 b' class HttpsFixup(object):'
 
     def __call__(self, environ, start_response):
         self.__fixup(environ)
-        req = Request(environ)
+        debug = str2bool(self.config.get('debug'))
+        if str2bool(self.config.get('use_htsts')) and not debug:
+            req = Request(environ, self.application)
         resp = req.get_response(self.application)
         if environ['wsgi.url_scheme'] == 'https':
-            resp.headers['Strict-Transport-Security'] = 'max-age=8640000; includeSubDomains'
+                resp.headers['Strict-Transport-Security'] = \
+                    'max-age=8640000; includeSubDomains'
         return resp(environ, start_response)
 
+        return self.application(environ, start_response)
+
     def __fixup(self, environ):
         """
         Function to fixup the environ as needed. In order to use this