fix #581: Mounted applications are shadowed by other routes.

This is a workaround, not really a fix. I'm working on a better solution.

2 files changed, 15 insertions, 2 deletions

diff --git a/bottle.py b/bottle.py
index b263ee3..74fefac 100644
--- a/bottle.py
+++ b/bottle.py
@@ -411,7 +411,10 @@ class Router(object):
         verb = environ['REQUEST_METHOD'].upper()
         path = environ['PATH_INFO'] or '/'
         target = None
-        methods = [verb, 'GET', 'ANY'] if verb == 'HEAD' else [verb, 'ANY']
+        if verb == 'HEAD':
+            methods = ['PROXY', verb, 'GET', 'ANY']
+        else:
+            methods = ['PROXY', verb, 'ANY']
 
         for method in methods:
             if method in self.static and path in self.static[method]:
@@ -682,7 +685,7 @@ class Bottle(object):
                 request.path_shift(-path_depth)
 
         options.setdefault('skip', True)
-        options.setdefault('method', 'ANY')
+        options.setdefault('method', 'PROXY')
         options.setdefault('mountpoint', {'prefix': prefix, 'target': app})
         options['callback'] = mountpoint_wrapper
 
diff --git a/test/test_mount.py b/test/test_mount.py
index cf0684b..0065f20 100644
--- a/test/test_mount.py
+++ b/test/test_mount.py
@@ -11,6 +11,16 @@ class TestAppMounting(ServerTestBase):
         def test(test='foo'):
             return test
 
+
+    def test_mount_order_bug581(self):
+        self.app.mount('/test/', self.subapp)
+
+        # This should not match
+        self.app.route('/<test:path>', callback=lambda test: test)
+
+        self.assertStatus(200, '/test/')
+        self.assertBody('foo', '/test/')
+
     def test_mount(self):
         self.app.mount('/test/', self.subapp)
         self.assertStatus(404, '/')