Changeset 788

Timestamp:

11/04/05 23:32:32

Author:

fumanchu

Message:

Moved IE-friendly-error-fix from finalize method to HTTPError.

Files:

• trunk/cherrypy/_cphttptools.py (modified) (3 diffs)
• trunk/cherrypy/_cputil.py (modified) (3 diffs)
• trunk/cherrypy/test/test_core.py (modified) (3 diffs)

trunk/cherrypy/_cphttptools.py

@@ -352 +352 @@
-    _header_order_map[_] = 2
-
-_ie_friendly_error_sizes = {400: 512, 403: 256, 404: 512, 405: 256,
-                            406: 512, 408: 512, 409: 512, 410: 256,
-                            500: 512, 501: 512, 505: 512,
-                            }
-
-
-class Response(object):
@@ -401 +396 @@
-                self.headerMap['Content-Length'] = len(content)
-        
-        # For some statuses, Internet Explorer 5+ shows "friendly error messages"
-        # instead of our response.body if the body is smaller than a given size.
-        # Fix this by returning a body over that size (by adding whitespace).
-        # See http://support.microsoft.com/kb/q218155/
-        s = int(self.status.split(" ")[0])
-        s = _ie_friendly_error_sizes.get(s, 0)
-        if s:
-            s += 1
-            # Since we are issuing an HTTP error status, we assume that
-            # the entity is short, and we should just collapse it.
-            content = ''.join([chunk for chunk in self.body])
-            self.body = [content]
-            l = len(content)
-            if l and l < s:
-                # IN ADDITION: the response must be written to IE
-                # in one chunk or it will still get replaced! Bah.
-                self.body = [self.body[0] + (" " * (s - l))]
-                self.headerMap['Content-Length'] = s
-        
-        # Headers
-        headers = []
@@ -428 +404 @@
-            for value in valueList:
-                headers.append((order, (key, str(value))))
- fields
-rst, followed by request-header or response-header fields, and
-
+
+elds first, followed by request-header or response-header
+fields, and 
-        headers.sort()
-        self.headers = [item[1] for item in headers]

trunk/cherrypy/_cputil.py

@@ -189 +189 @@
-    return template % kwargs
-
+
-def _cpOnHTTPError(status, message):
-    """ Default _cpOnHTTPError method.
@@ -205 +206 @@
-    # Remove headers which applied to the original content,
-    # but do not apply to the error page.
-
-
-
-
+
+
+
-        if response.headerMap.has_key(key):
-            del response.headerMap[key]
@@ -227 +227 @@
-    response.headerMap['Content-Type'] = "text/html"
-    response.body = getErrorPage(status, traceback=tb, message=message)
+    
+    be_ie_unfriendly(status)
+    
+    response.headerMap['Content-Length'] = len(response.body)
+
+
+_ie_friendly_error_sizes = {
+    400: 512, 403: 256, 404: 512, 405: 256,
+    406: 512, 408: 512, 409: 512, 410: 256,
+    500: 512, 501: 512, 505: 512,
+    }
+
+
+def be_ie_unfriendly(status):
+    
+    response = cherrypy.response
+    
+    # For some statuses, Internet Explorer 5+ shows "friendly error
+    # messages" instead of our response.body if the body is smaller
+    # than a given size. Fix this by returning a body over that size
+    # (by adding whitespace).
+    # See http://support.microsoft.com/kb/q218155/
+    s = _ie_friendly_error_sizes.get(status, 0)
+    if s:
+        s += 1
+        # Since we are issuing an HTTP error status, we assume that
+        # the entity is short, and we should just collapse it.
+        content = ''.join([chunk for chunk in response.body])
+        l = len(content)
+        if l and l < s:
+            # IN ADDITION: the response must be written to IE
+            # in one chunk or it will still get replaced! Bah.
+            response.body = [content + (" " * (s - l))]
+        else:
+            response.body = [content]
-
-def formatExc(exc=None):

trunk/cherrypy/test/test_core.py

@@ -151 +151 @@
-    
-    def custom(self):
+        raise cherrypy.HTTPError(404, "No, <b>really</b>, not found!")
+    
+    def noexist(self):
-        raise cherrypy.HTTPError(404, "No, <b>really</b>, not found!")
-    
@@ -329 +332 @@
-    },
-    '/error/custom': {
+        'errorPage.404': os.path.join(localDir, "static/index.html"),
+    },
+    '/error/noexist': {
-        'errorPage.404': "nonexistent.html",
-    },
@@ -566 +572 @@
-            ignore.pop()
-        
+        # Test custom error page.
+        self.getPage("/error/custom")
+        self.assertStatus("404 Not Found")
+        self.assertEqual(len(self.body), 513)
+        self.assertBody("Hello, world\r\n" + (" " * 499))
+        
-        # Test error in custom error page (ticket #305).
-        # Note that the message is escaped for HTML (ticket #310).
-custom
+noexist
-        self.assertStatus("404 Not Found")
-        msg = ("No, &lt;b&gt;really&lt;/b&gt;, not found!<br />"