changeset 34585:f28c85e29afc

configitems: register the 'web.push_ssl' config
author Boris Feld <boris.feld@octobus.net>
date Wed, 11 Oct 2017 03:29:09 +0200
parents bf2389b1f15e
children c364f3f73634
files mercurial/configitems.py mercurial/hgweb/common.py
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/configitems.py	Wed Oct 11 03:18:04 2017 +0200
+++ b/mercurial/configitems.py	Wed Oct 11 03:29:09 2017 +0200
@@ -736,6 +736,9 @@
 coreconfigitem('web', 'prefix',
     default='',
 )
+coreconfigitem('web', 'push_ssl',
+    default=True,
+)
 coreconfigitem('web', 'refreshinterval',
     default=20,
 )
--- a/mercurial/hgweb/common.py	Wed Oct 11 03:18:04 2017 +0200
+++ b/mercurial/hgweb/common.py	Wed Oct 11 03:29:09 2017 +0200
@@ -69,7 +69,7 @@
     # require ssl by default for pushing, auth info cannot be sniffed
     # and replayed
     scheme = req.env.get('wsgi.url_scheme')
-    if hgweb.configbool('web', 'push_ssl', True) and scheme != 'https':
+    if hgweb.configbool('web', 'push_ssl') and scheme != 'https':
         raise ErrorResponse(HTTP_FORBIDDEN, 'ssl required')
 
     deny = hgweb.configlist('web', 'deny_push')