Added tests for file-related conditional requests. Added support for If-None-Match to DataApp. Added parsing support for multi-value headers.

1 files changed, 15 insertions, 1 deletions

diff --git a/paste/fileapp.py b/paste/fileapp.py
index d14cf26..2a8ef35 100644
--- a/paste/fileapp.py
+++ b/paste/fileapp.py
@@ -87,7 +87,8 @@ class DataApp(object):
 
     def __call__(self, environ, start_response):
         headers = self.headers[:]
-        ETAG.update(headers, self.last_modified)
+        current_etag = str(self.last_modified)
+        ETAG.update(headers, current_etag)
         if self.expires is not None:
             EXPIRES.update(headers, delta=self.expires)
 
@@ -102,6 +103,19 @@ class DataApp(object):
         except HTTPBadRequest, exce:
             return exce.wsgi_application(environ, start_response)
 
+        try:
+            client_etags = IF_NONE_MATCH.parse(environ)
+            if client_etags:
+                for etag in client_etags:
+                    if etag == current_etag or etag == '*':
+                        # horribly inefficient, n^2 performance, yuck!
+                        for head in list_headers(entity=True):
+                            head.delete(headers)
+                        start_response('304 Not Modified', headers)
+                        return ['']
+        except HTTPBadRequest, exce:
+            return exce.wsgi_application(environ, start_response)
+
         (lower,upper) = (0, self.content_length - 1)
         range = RANGE.parse(environ)
         if range and 'bytes' == range[0] and 1 == len(range[1]):