Show More
@@ -845,15 +845,11 b' class hgweb(object):' | |||||
845 |
|
845 | |||
846 | user = req.env.get('REMOTE_USER') |
|
846 | user = req.env.get('REMOTE_USER') | |
847 |
|
847 | |||
848 |
deny = self.repo.ui.config('web', 'deny_' + op |
|
848 | deny = self.repo.ui.configlist('web', 'deny_' + op) | |
849 | deny = deny.replace(',', ' ').split() |
|
|||
850 |
|
||||
851 | if deny and (not user or deny == ['*'] or user in deny): |
|
849 | if deny and (not user or deny == ['*'] or user in deny): | |
852 | return False |
|
850 | return False | |
853 |
|
851 | |||
854 |
allow = self.repo.ui.config('web', 'allow_' + op |
|
852 | allow = self.repo.ui.configlist('web', 'allow_' + op) | |
855 | allow = allow.replace(',', ' ').split() |
|
|||
856 |
|
||||
857 | return (allow and (allow == ['*'] or user in allow)) or default |
|
853 | return (allow and (allow == ['*'] or user in allow)) or default | |
858 |
|
854 | |||
859 | def do_unbundle(self, req): |
|
855 | def do_unbundle(self, req): |
@@ -120,9 +120,8 b' class httprepository(remoterepository):' | |||||
120 |
|
120 | |||
121 | # see if we should use a proxy for this url |
|
121 | # see if we should use a proxy for this url | |
122 | no_list = [ "localhost", "127.0.0.1" ] |
|
122 | no_list = [ "localhost", "127.0.0.1" ] | |
123 |
no_list.extend([p. |
|
123 | no_list.extend([p.lower() for | |
124 |
p in ui.config("http_proxy", "no" |
|
124 | p in ui.configlist("http_proxy", "no")]) | |
125 | if p.strip()]) |
|
|||
126 | no_list.extend([p.strip().lower() for |
|
125 | no_list.extend([p.strip().lower() for | |
127 | p in os.getenv("no_proxy", '').split(',') |
|
126 | p in os.getenv("no_proxy", '').split(',') | |
128 | if p.strip()]) |
|
127 | if p.strip()]) |
General Comments 0
You need to be logged in to leave comments.
Login now