equal
deleted
inserted
replaced
98 self.https = https |
98 self.https = https |
99 #: User interface property (vary with https) (see :ref:`uiprops`) |
99 #: User interface property (vary with https) (see :ref:`uiprops`) |
100 self.uiprops = None |
100 self.uiprops = None |
101 #: url for serving datadir (vary with https) (see :ref:`resources`) |
101 #: url for serving datadir (vary with https) (see :ref:`resources`) |
102 self.datadir_url = None |
102 self.datadir_url = None |
103 if https: |
103 if https and vreg.config.https_uiprops is not None: |
104 self.uiprops = vreg.config.https_uiprops |
104 self.uiprops = vreg.config.https_uiprops |
|
105 else: |
|
106 self.uiprops = vreg.config.uiprops |
|
107 if https and vreg.config.https_datadir_url is not None: |
105 self.datadir_url = vreg.config.https_datadir_url |
108 self.datadir_url = vreg.config.https_datadir_url |
106 else: |
109 else: |
107 self.uiprops = vreg.config.uiprops |
|
108 self.datadir_url = vreg.config.datadir_url |
110 self.datadir_url = vreg.config.datadir_url |
109 #: raw html headers that can be added from any view |
111 #: raw html headers that can be added from any view |
110 self.html_headers = HTMLHead(self) |
112 self.html_headers = HTMLHead(self) |
111 #: received headers |
113 #: received headers |
112 self._headers_in = Headers() |
114 self._headers_in = Headers() |