Merge pull request #1854 from Anvil/fix-middleware-order

aiohttp/web.py: fixing middleware resolution order accross multiple applications
aio-libs · May 12, 2017 · 29be8ac · 29be8ac
2 parents 9df6430 + a9b8cf7
commit 29be8ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -33,6 +33,8 @@ Changes
 
 - Do not unquote `+` in match_info values #1816
 
+- Fix sub-application middlewares resolution order #1853
+
 
 2.0.7 (2017-04-12)
 ------------------

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -1,4 +1,4 @@
-
+Contributors
 ------------
 A. Jesse Jiryu Davis
 Adam Mills
@@ -42,7 +42,7 @@ Chris AtLee
 Chris Laws
 Chris Moore
 Christopher Schmitt
-Contributors
+Damien Nadé
 Daniel García
 Daniel Nelson
 Danny Song
@@ -175,4 +175,4 @@ Yuriy Shatrov
 Yury Selivanov
 Yusuke Tsutsumi
 Марк Коренберг
-Семён Марьясин
+Семён Марьясин
diff --git a/aiohttp/web.py b/aiohttp/web.py
@@ -288,7 +288,7 @@ def _handle(self, request):
 
         if resp is None:
             handler = match_info.handler
-            for app in match_info.apps:
+            for app in match_info.apps[::-1]:
                 for factory in app._middlewares:
                     handler = yield from factory(app, handler)