web/request.py
branchstable
changeset 8869 a46197b1696f
parent 8732 0d9c8f5eb285
child 8889 be91151107f6
--- a/web/request.py	Mon Apr 08 16:13:03 2013 +0200
+++ b/web/request.py	Mon Apr 08 16:19:29 2013 +0200
@@ -100,11 +100,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)