Changeset 1941

Timestamp:

04/05/08 15:40:13

Author:

fumanchu

Message:

Partial fix for #800 (). I'm not yet happy with making error handler authors do all the hard work: spec conformance, be IE unfriendly, even manually set the status, etc.

Files:

• branches/800-error-handlers/cherrypy/_cperror.py (modified) (3 diffs)
• branches/800-error-handlers/cherrypy/_cprequest.py (modified) (4 diffs)
• branches/800-error-handlers/cherrypy/test/test_core.py (modified) (3 diffs)

branches/800-error-handlers/cherrypy/_cperror.py

@@ -149 +149 @@
-
-
+def clean_headers(status):
+    """Remove any headers which should not apply to an error response."""
+    import cherrypy
+    
+    response = cherrypy.response
+    
+    # Remove headers which applied to the original content,
+    # but do not apply to the error page.
+    respheaders = response.headers
+    for key in ["Accept-Ranges", "Age", "ETag", "Location", "Retry-After",
+                "Vary", "Content-Encoding", "Content-Length", "Expires",
+                "Content-Location", "Content-MD5", "Last-Modified"]:
+        if respheaders.has_key(key):
+            del respheaders[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 respheaders.has_key("Content-Range"):
+            del respheaders["Content-Range"]
+
+
-class HTTPError(CherryPyException):
-    """ Exception used to return an HTTP error code (4xx-5xx) to the client.
@@ -174 +200 @@
-        response = cherrypy.response
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        
-        # In all cases, finalize will be called after this method,
@@ -199 +208 @@
-        if cherrypy.request.show_tracebacks:
-            tb = format_exc()
-
+onse.
-        
-        content = self.get_error_page(self.status, traceback=tb,
-                                      message=self.message)
-        response.body = content
-
+onse.
-        
-        _be_ie_unfriendly(self.status)

branches/800-error-handlers/cherrypy/_cprequest.py

@@ -393 +393 @@
-    error_page = {}
-    error_page__doc = """
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    show_tracebacks = True
@@ -592 +600 @@
-                    cherrypy.response.finalize()
-                except (cherrypy.HTTPRedirect, cherrypy.HTTPError), inst:
-
+
+
+
+
+
-                    self.stage = 'before_finalize (HTTPError)'
-                    self.hooks.run('before_finalize')
@@ -716 +728 @@
-    
-    def handle_error(self, exc):
-
+unanticipated 
-        try:
-            self.hooks.run("before_error_response")
@@ -724 +736 @@
-            cherrypy.response.finalize()
-        except cherrypy.HTTPRedirect, inst:
-
+
+
+
+
+
-            cherrypy.response.finalize()
-

branches/800-error-handlers/cherrypy/test/test_core.py

@@ -240 +240 @@
-            for chunk in self.as_yield():
-                yield chunk
-
-
+
+
+
+
+
+
+
+
-    class Error(Test):
-        
@@ -247 +253 @@
-                      }
-        
-
-
-
+
+
+
+
+
-        
-        def noexist(self):
@@ -725 +733 @@
-        self.assertStatus(404)
-        self.assertBody("Hello, world\r\n" + (" " * 499))
+        
+        # Test custom error page.
+        self.getPage("/error/custom?err=401")
+        self.assertStatus(401)
+        self.assertBody("Well, I'm very sorry but you haven't paid!")
-        
-        # Test error in custom error page (ticket #305).