[CalendarServer-changes] [5854] CalendarServer/branches/users/wsanchez/deployment-pre-partition

[source_changes at macosforge.org]

Revision: 5854
          http://trac.macosforge.org/projects/calendarserver/changeset/5854
Author:   glyph at apple.com
Date:     2010-07-07 10:22:47 -0700 (Wed, 07 Jul 2010)
Log Message:
-----------
merged r5853 from deployment

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

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/sendfdport.py

Property Changed:
----------------
    CalendarServer/branches/users/wsanchez/deployment-pre-partition/


Property changes on: CalendarServer/branches/users/wsanchez/deployment-pre-partition
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalendarServer/branches/users/glyph/deployment-plus-sendfd:5426-5429
/CalendarServer/branches/users/sagen/deployment-inherit-fds-4571:4573-4709
/CalendarServer/branches/users/sagen/deployment-inspection:4927-4937
/CalendarServer/branches/users/wsanchez/deployment:5845
   + /CalendarServer/branches/users/glyph/deployment-plus-sendfd:5426-5429
/CalendarServer/branches/users/sagen/deployment-inherit-fds-4571:4573-4709
/CalendarServer/branches/users/sagen/deployment-inspection:4927-4937
/CalendarServer/branches/users/wsanchez/deployment:5845,5853

Modified: CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/sendfdport.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/sendfdport.py	2010-07-07 17:19:06 UTC (rev 5853)
+++ CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/sendfdport.py	2010-07-07 17:22:47 UTC (rev 5854)
@@ -292,7 +292,10 @@
                 # should this be on the transportFactory's side of things?
 
                 close(fd)       # fromfd() calls dup()
-                peeraddr = skt.getpeername()
+                try:
+                    peeraddr = skt.getpeername()
+                except:
+                    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/0d14a6dc/attachment-0001.html>