[CalendarServer-changes] [5855] CalendarServer/trunk/twext/internet/sendfdport.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Jul 7 11:02:45 PDT 2010


Revision: 5855
          http://trac.macosforge.org/projects/calendarserver/changeset/5855
Author:   glyph at apple.com
Date:     2010-07-07 11:02:45 -0700 (Wed, 07 Jul 2010)
Log Message:
-----------
pull up r5853 from deployment

Revision Links:
--------------
    http://trac.macosforge.org/projects/calendarserver/changeset/5853

Modified Paths:
--------------
    CalendarServer/trunk/twext/internet/sendfdport.py

Modified: CalendarServer/trunk/twext/internet/sendfdport.py
===================================================================
--- CalendarServer/trunk/twext/internet/sendfdport.py	2010-07-07 17:22:47 UTC (rev 5854)
+++ CalendarServer/trunk/twext/internet/sendfdport.py	2010-07-07 18:02:45 UTC (rev 5855)
@@ -274,7 +274,10 @@
                 # should this be on the transportFactory's side of things?
 
                 close(fd)       # fromfd() calls dup()
-                peeraddr = skt.getpeername()
+                try:
+                    peeraddr = skt.getpeername()
+                except SocketError:
+                    peeraddr = ('0.0.0.0', 0)
                 protocol = self.protocolFactory.buildProtocol(peeraddr)
                 transport = self.transportFactory(skt, description, protocol)
                 protocol.makeConnection(transport)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100707/911ac77e/attachment.html>


More information about the calendarserver-changes mailing list