Changeset 771

Timestamp:

10/31/05 15:52:35

Author:

fumanchu

Message:

Fix for #367 (error pages should reset response headers). And a new _cpOnHTTPError special attribute just for kicks.

Files:

• trunk/cherrypy/_cperror.py (modified) (2 diffs)
• trunk/cherrypy/_cputil.py (modified) (1 diff)

trunk/cherrypy/_cperror.py

@@ -164 +164 @@
-    def set_response(self):
-        import cherrypy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
@@ -199 +184 @@
-    def __init__(self, message=None):
-        HTTPError.__init__(self, 500, message)
+

trunk/cherrypy/_cputil.py

@@ -191 +191 @@
-    
-    return template % kwargs
+
+def _cpOnHTTPError(status, message):
+    """ Default _cpOnHTTPError method.
+    
+    status should be an int.
+    """
+    tb = formatExc()
+    if cherrypy.config.get('server.logTracebacks', True):
+        cherrypy.log(tb)
+    
+    if not cherrypy.config.get('server.showTracebacks', False):
+        tb = None
+    
+    response = cherrypy.response
+    
+    # Remove headers which applied to the original content,
+    # but do not apply to the error page.
+    for key in ["Accept-Ranges", "Age", "ETag", "Location",
+                "Retry-After", "Vary", "Content-Encoding",
+                "Content-Length", "Content-Location", "Content-MD5",
+                "Expires", "Last-Modified"]:
+        if response.headerMap.has_key(key):
+            del response.headerMap[key]
+    
+    if status != 416:
+        # A server sending a response with status code 416 (Requested
+        # range not satisfiable) SHOULD include a Content-Range field
+        # with a byte-range- resp-spec of "*". The instance-length
+        # specifies the current length of the selected resource.
+        # A response with status code 206 (Partial Content) MUST NOT
+        # include a Content-Range field with a byte-range- resp-spec of "*".
+        if response.headerMap.has_key("Content-Range"):
+            del response.headerMap["Content-Range"]
+    
+    # In all cases, finalize will be called after this method,
+    # so don't bother cleaning up response values here.
+    response.status = status
+    response.headerMap['Content-Type'] = "text/html"
+    response.body = getErrorPage(status, traceback=tb, message=message)
-
-def formatExc(exc=None):