--- a/web/request.py Wed Apr 10 16:46:18 2013 +0200
+++ b/web/request.py Mon Apr 15 13:18:01 2013 +0200
@@ -101,11 +101,13 @@
self.uiprops = None
#: url for serving datadir (vary with https) (see :ref:`resources`)
self.datadir_url = None
- if https:
+ if https and vreg.config.https_uiprops is not None:
self.uiprops = vreg.config.https_uiprops
+ else:
+ self.uiprops = vreg.config.uiprops
+ if https and vreg.config.https_datadir_url is not None:
self.datadir_url = vreg.config.https_datadir_url
else:
- self.uiprops = vreg.config.uiprops
self.datadir_url = vreg.config.datadir_url
#: raw html headers that can be added from any view
self.html_headers = HTMLHead(self)