Mercurial > p > roundup > code
changeset 3071:b3f9dee6aa76 maint-0.8
merge from HEAD
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Wed, 05 Jan 2005 22:02:57 +0000 |
| parents | d6b848497747 |
| children | 326ad9da0b75 |
| files | CHANGES.txt roundup/cgi/client.py |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 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))