From 532347d6adf1da64259f1af91860d5fa27bac9f1 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 4 Jul 2010 12:06:29 +0200
Subject: [PATCH] phased out shared data middleware in flask for send_file

---
 flask/app.py     | 32 +++++++++++++++++++++-----------
 flask/helpers.py |  3 ++-
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/flask/app.py b/flask/app.py
index 062d4289..7230950c 100644
--- a/flask/app.py
+++ b/flask/app.py
@@ -9,17 +9,19 @@
     :license: BSD, see LICENSE for more details.
 """
 
+import os
+import posixpath
 from threading import Lock
 from datetime import timedelta, datetime
 from itertools import chain
 
 from jinja2 import Environment, PackageLoader, FileSystemLoader
-from werkzeug import ImmutableDict, SharedDataMiddleware, create_environ
+from werkzeug import ImmutableDict, create_environ
 from werkzeug.routing import Map, Rule
-from werkzeug.exceptions import HTTPException, InternalServerError
+from werkzeug.exceptions import HTTPException, InternalServerError, NotFound
 
 from flask.helpers import _PackageBoundObject, url_for, get_flashed_messages, \
-    _tojson_filter, get_pkg_resources
+    _tojson_filter, get_pkg_resources, send_file
 from flask.wrappers import Request, Response
 from flask.config import ConfigAttribute, Config
 from flask.ctx import _default_template_ctx_processor, _RequestContext
@@ -258,14 +260,8 @@ class Flask(_PackageBoundObject):
 
         if self.static_path is not None:
             self.add_url_rule(self.static_path + '/<filename>',
-                              build_only=True, endpoint='static')
-            if get_pkg_resources() is not None:
-                target = (self.import_name, 'static')
-            else:
-                target = os.path.join(self.root_path, 'static')
-            self.wsgi_app = SharedDataMiddleware(self.wsgi_app, {
-                self.static_path: target
-            })
+                              endpoint='static',
+                              view_func=self.send_static_file)
 
         #: The Jinja2 environment.  It is created from the
         #: :attr:`jinja_options` and the loader that is returned
@@ -383,6 +379,20 @@ class Flask(_PackageBoundObject):
         options.setdefault('use_debugger', self.debug)
         return run_simple(host, port, self, **options)
 
+    def send_static_file(self, filename):
+        """Function used internally to send static files from the static
+        folder to the browser.
+
+        .. versionadded:: 0.5
+        """
+        filename = posixpath.normpath(filename)
+        if filename.startswith('../'):
+            raise NotFound()
+        filename = os.path.join(self.root_path, 'static', filename)
+        if not os.path.isfile(filename):
+            raise NotFound()
+        return send_file(filename, conditional=True)
+
     def test_client(self):
         """Creates a test client for this application.  For information
         about unit testing head over to :ref:`testing`.
diff --git a/flask/helpers.py b/flask/helpers.py
index a34e055e..ce206eea 100644
--- a/flask/helpers.py
+++ b/flask/helpers.py
@@ -250,7 +250,8 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
         file = filename_or_fp
         filename = getattr(file, 'name', None)
     if filename is not None:
-        filename = os.path.join(current_app.root_path, filename)
+        if not os.path.isabs(filename):
+            filename = os.path.join(current_app.root_path, filename)
     if mimetype is None and (filename or attachment_filename):
         mimetype = mimetypes.guess_type(filename or attachment_filename)[0]
     if mimetype is None: