merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -63,6 +63,7 @@ Fixed:
 2004-10-06 0.7.11
 Fixed:
 - index args URL generation broken in .10 (sf bug 1096027)
+- handle NotModified for non-static files (sf patch 1095790)
 
 
 2004-10-04 0.7.10

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.211 2004-12-03 22:19:41 richard Exp $
+# $Id: client.py,v 1.211.2.1 2005-01-05 22:02:05 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -270,7 +270,12 @@ def inner_main(self):
                 self.response_code = 302
             self.write_html('Redirecting to <a href="%s">%s</a>'%(url, url))
         except SendFile, designator:
-            self.serve_file(designator)
+            try:
+                self.serve_file(designator)
+            except NotModified:
+                # send the 304 response
+                self.request.send_response(304)
+                self.request.end_headers()
         except SendStaticFile, file:
             try:
                 self.serve_static_file(str(file))