Ticket #15199: 15199-staticfiles-handler.patch

django/contrib/staticfiles/handlers.py

@@ -40 +40 @@
 
         * the host is provided as part of the base_url
         * the request's path isn't under the media path (or equal)
+        * the request's path is under MEDIA_URL
         """
-        return (self.base_url[2] != path and
-            path.startswith(self.base_url[2]) and not self.base_url[1])
+        return (self.base_url[2] != path
+                and path.startswith(self.base_url[2])
+                and not self.base_url[1]
+                and not path.startswith(settings.MEDIA_URL))
 
     def file_path(self, url):
         """