[CalendarServer-changes] [4847] CalendarServer/branches/users/wsanchez/deployment/lib-patches/ Twisted/twisted.internet.tcp.patch

[source_changes at macosforge.org]

Revision: 4847
          http://trac.macosforge.org/projects/calendarserver/changeset/4847
Author:   cdaboo at apple.com
Date:     2009-12-09 09:07:53 -0800 (Wed, 09 Dec 2009)
Log Message:
-----------
A little extra log info.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/lib-patches/Twisted/twisted.internet.tcp.patch

Modified: CalendarServer/branches/users/wsanchez/deployment/lib-patches/Twisted/twisted.internet.tcp.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/lib-patches/Twisted/twisted.internet.tcp.patch	2009-12-09 17:03:05 UTC (rev 4846)
+++ CalendarServer/branches/users/wsanchez/deployment/lib-patches/Twisted/twisted.internet.tcp.patch	2009-12-09 17:07:53 UTC (rev 4847)
@@ -2,15 +2,16 @@
 ===================================================================
 --- twisted/internet/tcp.py	(revision 19773)
 +++ twisted/internet/tcp.py	(working copy)
-@@ -772,6 +772,14 @@
+@@ -772,6 +772,15 @@
                      return
                  try:
                      skt, addr = self.socket.accept()
 +                    if addr is None: # sometimes this happens on OS X
-+                        log.msg("socket.accept() return None for addr. self.socket: %s, %s, %s, skt: %s" % (
++                        log.msg("socket.accept() return None for addr. self.socket: %s, %s, %s, %s, skt: %s" % (
 +                            self.socket.family,
 +                            self.socket.type,
 +                            self.socket.proto,
++                            self.socket.getsockname(),
 +                            skt,
 +                        ))
 +                        raise socket.error(ECONNABORTED)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091209/738fbcc7/attachment.html>