equal
deleted
inserted
replaced
785 style = self.config("web", "style", "") |
785 style = self.config("web", "style", "") |
786 if req.form.has_key('style'): |
786 if req.form.has_key('style'): |
787 style = req.form['style'][0] |
787 style = req.form['style'][0] |
788 mapfile = style_map(self.templatepath, style) |
788 mapfile = style_map(self.templatepath, style) |
789 |
789 |
790 if req.env.get('HTTPS'): |
790 proto = req.env.get('wsgi.url_scheme') |
|
791 if proto == 'https': |
791 proto = 'https' |
792 proto = 'https' |
792 default_port = "443" |
793 default_port = "443" |
793 else: |
794 else: |
794 proto = 'http' |
795 proto = 'http' |
795 default_port = "80" |
796 default_port = "80" |
1068 |
1069 |
1069 # require ssl by default, auth info cannot be sniffed and |
1070 # require ssl by default, auth info cannot be sniffed and |
1070 # replayed |
1071 # replayed |
1071 ssl_req = self.configbool('web', 'push_ssl', True) |
1072 ssl_req = self.configbool('web', 'push_ssl', True) |
1072 if ssl_req: |
1073 if ssl_req: |
1073 if not req.env.get('HTTPS'): |
1074 if req.env.get('wsgi.url_scheme') != 'https': |
1074 bail(_('ssl required\n')) |
1075 bail(_('ssl required\n')) |
1075 return |
1076 return |
1076 proto = 'https' |
1077 proto = 'https' |
1077 else: |
1078 else: |
1078 proto = 'http' |
1079 proto = 'http' |