Making sure StaticFileHandlers get first, if not, a catch all handler would break...

diff --git a/tornado/web.py b/tornado/web.py
index 47dc34486dfff35179a39b3b0ba9733bedb6c882..fd3bd5dd0fcf6fa7db95d7a80b4704c7138ac923 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -909,12 +909,12 @@ class Application(object):
             handlers = list(handlers or [])
             static_url_prefix = settings.get("static_url_prefix",
                                              "/static/")
-            handlers.extend([
+            handlers = [
                 (re.escape(static_url_prefix) + r"(.*)", StaticFileHandler,
                  dict(path=path)),
                 (r"/(favicon\.ico)", StaticFileHandler, dict(path=path)),
                 (r"/(robots\.txt)", StaticFileHandler, dict(path=path)),
-            ])
+            ] + handlers
         if handlers: self.add_handlers(".*$", handlers)
 
         # Automatically reload modified modules