summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2015-02-08 02:37:35 +0000
committerMatthew Hodgson <matthew@matrix.org>2015-02-08 02:37:35 +0000
commitecb0f7806305b3433d8c2a5a5bb413226f2e90f8 (patch)
tree9e124a837e51fc1cd4fb3aad64be81353407922b
parentoops (diff)
downloadsynapse-ecb0f7806305b3433d8c2a5a5bb413226f2e90f8.tar.xz
glob *s should probably be non-greedy
-rw-r--r--synapse/push/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 7a41c5ece3..07b5f0187c 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -132,7 +132,7 @@ class Pusher(object):
     @staticmethod
     def _glob_to_regexp(glob):
         r = re.escape(glob)
-        r = re.sub(r'\\\*', r'.*', r)
+        r = re.sub(r'\\\*', r'.*?', r)
         r = re.sub(r'\\\?', r'.', r)
 
         # handle [abc], [a-z] and [!a-z] style ranges.