# HG changeset patch
# User Richard Jones <richard@users.sourceforge.net>
# Date 1104962577 0
# Node ID b3f9dee6aa76973f2e7687dad6b2f4a2edaa2832
# Parent  d6b8484977472a0d8e03989d1de7aa6082ad86cd
merge from HEAD

diff -r d6b848497747 -r b3f9dee6aa76 CHANGES.txt
--- a/CHANGES.txt	Wed Jan 05 22:02:31 2005 +0000
+++ b/CHANGES.txt	Wed Jan 05 22:02:57 2005 +0000
@@ -63,6 +63,7 @@
 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
diff -r d6b848497747 -r b3f9dee6aa76 roundup/cgi/client.py
--- a/roundup/cgi/client.py	Wed Jan 05 22:02:31 2005 +0000
+++ b/roundup/cgi/client.py	Wed Jan 05 22:02:57 2005 +0000
@@ -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 @@
                 self.response_code = 302
             self.write_html('Redirecting to <a  target="_top" href="/newspapers?url=%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))