Changeset 1449

Timestamp:

11/27/06 13:50:39

Author:

fumanchu

Message:

Now that InternalRedirect? is external to the Request object, there is no need to check Response.timed_out so frequently; once at the end of the request is enough. Updated test_states to test implicit timeout handling without InternalRedirect?.

Files:

• trunk/cherrypy/_cprequest.py (modified) (6 diffs)
• trunk/cherrypy/test/test_states.py (modified) (2 diffs)

trunk/cherrypy/_cprequest.py

@@ -64 +64 @@
-    def run(self, point):
-        """Execute all registered Hooks (callbacks) for the given point."""
-        if cherrypy.response.timed_out:
-            raise cherrypy.TimeoutError()
-        
-        exc = None
-        hooks = self[point]
@@ -303 +300 @@
-        cherrypy.log.access()
-        
+        if cherrypy.response.timed_out:
+            raise cherrypy.TimeoutError()
+        
-        return cherrypy.response
-    
@@ -310 +310 @@
-            try:
-                try:
-                    if cherrypy.response.timed_out:
-                        raise cherrypy.TimeoutError()
-                    
-                    if self.app is None:
-                        raise cherrypy.NotFound()
@@ -434 +431 @@
-            raise cherrypy.HTTPError(413)
-        
+        # Note that, if headers['Content-Type'] is multipart/*,
+        # then forms.file will not exist; instead, each form[key]
+        # item will be its own file object, and will be handled
+        # by params_from_CGI_form.
-        if forms.file:
-            # request body was a content-type other than form params.
@@ -472 +473 @@
-    
-    def __set__(self, obj, value):
-        if cherrypy.response.timed_out:
-            raise cherrypy.TimeoutError()
-        # Convert the given value to an iterable object.
-        if isinstance(value, basestring):
@@ -528 +527 @@
-    def finalize(self):
-        """Transform headers (and cookies) into cherrypy.response.header_list."""
-        if self.timed_out:
-            raise cherrypy.TimeoutError()
-        
-        try:
-            code, reason, _ = http.valid_status(self.status)

trunk/cherrypy/test/test_states.py

@@ -29 +29 @@
-                cherrypy.response.timed_out = False
-                return "broken!"
-
+0
-    block_explicit.exposed = True
-    
-    def block_implicit(self):
-
+
+
-    block_implicit.exposed = True
-    block_implicit._cp_config = {'request.recursive_redirect': True}
-
-cherrypy.tree.mount(Root())
-cherrypy.config.update({
-    'environment': 'test_suite',
-
-
+0.
+0.
-    })
-
@@ -209 +209 @@
-            # request.close is called async.
-            while cherrypy.engine.servings:
-
+0
-            
-            # Request a page that explicitly checks itself for deadlock.