[CalendarServer-changes] [1622] CalendarServer/trunk/lib-patches/PyDirector/pydirector. pdnetworktwisted.patch

[source_changes at macosforge.org]

Revision: 1622
          http://trac.macosforge.org/projects/calendarserver/changeset/1622
Author:   dreid at apple.com
Date:     2007-06-27 11:44:23 -0700 (Wed, 27 Jun 2007)

Log Message:
-----------
Make sure that when the server closes the connection cleanly we close the connection with the client.  This can cause clients to hang and the loadbalancer to run out of filedescriptors

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/PyDirector/pydirector.pdnetworktwisted.patch

Modified: CalendarServer/trunk/lib-patches/PyDirector/pydirector.pdnetworktwisted.patch
===================================================================
--- CalendarServer/trunk/lib-patches/PyDirector/pydirector.pdnetworktwisted.patch	2007-06-26 00:12:31 UTC (rev 1621)
+++ CalendarServer/trunk/lib-patches/PyDirector/pydirector.pdnetworktwisted.patch	2007-06-27 18:44:23 UTC (rev 1622)
@@ -1,5 +1,5 @@
---- pydirector/pdnetworktwisted.py	2004-12-14 05:31:39.000000000 -0800
-+++ pydirector/pdnetworktwisted.py	2007-04-10 17:25:44.000000000 -0700
+--- pydirector/pdnetworktwisted.py	2007-06-27 11:42:28.000000000 -0700
++++ pydirector/pdnetworktwisted.py	2007-06-27 11:40:37.000000000 -0700
 @@ -28,10 +28,13 @@
          attribute .listening_address: read - a tuple of (host,port)
      """
@@ -16,6 +16,15 @@
          self.setScheduler(scheduler)
          reactor.listenTCP(bindport, self.rfactory, interface=bindhost)
  
+@@ -58,7 +61,7 @@
+         """
+         if self.receiver is not None:
+             if reason.type is twisted.internet.error.ConnectionDone:
+-                return
++                pass
+             elif reason.type is twisted.internet.error.ConnectionLost:
+                 pass
+             else:
 @@ -79,6 +82,14 @@
              it's ok to send any buffered data from the client.
          """

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070627/b64aac77/attachment.html