Paste: fix Ticket #299

2 files changed, 3 insertions, 1 deletions

diff --git a/paste/fileapp.py b/paste/fileapp.py
index 81d4786..8a0e8a1 100644
--- a/paste/fileapp.py
+++ b/paste/fileapp.py
@@ -104,7 +104,7 @@ class DataApp(object):
         return self.get(environ, start_response)
 
     def calculate_etag(self):
-        return str(self.last_modified) + '-' + str(self.content_length)
+        return '"%s-%s"' % (self.last_modified, self.content_length)
 
     def get(self, environ, start_response):
         headers = self.headers[:]
diff --git a/paste/urlparser.py b/paste/urlparser.py
index 9dd0121..f72355a 100644
--- a/paste/urlparser.py
+++ b/paste/urlparser.py
@@ -464,6 +464,8 @@ class StaticURLParser(object):
             mytime = os.stat(full).st_mtime
             if str(mytime) == if_none_match:
                 headers = []
+                ## FIXME: probably should be
+                ## ETAG.update(headers, '"%s"' % mytime)
                 ETAG.update(headers, mytime)
                 start_response('304 Not Modified', headers)
                 return [''] # empty body