diff roundup/cgi/client.py @ 3072:c2f9cd78f12f maint-0.7

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Wed, 05 Jan 2005 22:02:57 +0000
parents 1836d2361553
children
line wrap: on
line diff
--- a/roundup/cgi/client.py	Wed Jan 05 21:57:22 2005 +0000
+++ b/roundup/cgi/client.py	Wed Jan 05 22:02:57 2005 +0000
@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.176.2.9 2004-12-03 22:21:31 richard Exp $
+# $Id: client.py,v 1.176.2.10 2005-01-05 22:02:57 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -227,7 +227,12 @@
                 self.response_code = 302
             self.write('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))

Roundup Issue Tracker: http://roundup-tracker.org/