summaryrefslogtreecommitdiff
path: root/odoo/http.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-08-07 19:08:07 +0200
committerChristophe Simonis <chs@odoo.com>2018-08-07 19:08:07 +0200
commitefe2dcd7ae6573bf6830918d58f5b89739d67301 (patch)
treeaec1110b92af4cd8b9153d8b08d63c6878c3efe2 /odoo/http.py
parentd7e2c767ce51ddf112babc5507105da4dc127279 (diff)
parentced9156a97ea502050b4e827ef2237fa2cd9410f (diff)
[MERGE] forward port branch 11.0 up to ced9156a97e
Diffstat (limited to 'odoo/http.py')
-rw-r--r--odoo/http.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/odoo/http.py b/odoo/http.py
index 09999066941..03f41977bbc 100644
--- a/odoo/http.py
+++ b/odoo/http.py
@@ -1494,6 +1494,7 @@ def db_filter(dbs, httprequest=None):
if d == "www" and r:
d = r.partition('.')[0]
if odoo.tools.config['dbfilter']:
+ d, h = re.escape(d), re.escape(h)
r = odoo.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
dbs = [i for i in dbs if re.match(r, i)]
elif odoo.tools.config['db_name']: