Download Install Tutorial Docs FAQ Tools WikiLicense Team IRC Planet Involvement Shop Book

Changeset 1388

Show
Ignore:
Timestamp:
09/30/06 10:56:25
Author:
fumanchu
Message:

Safer wsgi close.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/cherrypy/_cpwsgiserver.py

    r1380 r1388  
    268268    def respond(self): 
    269269        response = self.wsgi_app(self.environ, self.start_response) 
    270         for line in response: 
    271             self.write(line) 
    272         if hasattr(response, "close"): 
    273             response.close() 
     270        try: 
     271            for line in response: 
     272                self.write(line) 
     273        finally: 
     274            if hasattr(response, "close"): 
     275                response.close() 
    274276        if (self.ready and not self.sent_headers 
    275277                and not self.connection.server.interrupt): 
  • trunk/cherrypy/lib/wsgiapp.py

    r1340 r1388  
    6262     
    6363    # run the wsgi app and have it set response.body 
    64     cherrypy.response.body = app(environ, start_response) 
     64    response = app(environ, start_response) 
     65    try: 
     66        cherrypy.response.body = response 
     67    finally: 
     68        if hasattr(response, "close"): 
     69            response.close() 
    6570     
    6671    return True 

Hosted by WebFaction

Log in as guest/cpguest to create tickets