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

[source_changes at macosforge.org]

Revision: 5881
          http://trac.macosforge.org/projects/calendarserver/changeset/5881
Author:   glyph at apple.com
Date:     2010-07-13 11:34:58 -0700 (Tue, 13 Jul 2010)
Log Message:
-----------
pull r5788 from deployment

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

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,5853,5856,5877
   + /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,5856,5877,5880

Modified: CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/sendfdport.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/sendfdport.py	2010-07-13 18:34:19 UTC (rev 5880)
+++ CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/sendfdport.py	2010-07-13 18:34:58 UTC (rev 5881)
@@ -297,7 +297,7 @@
                 except:
                     peeraddr = ('0.0.0.0', 0)
                 protocol = self.protocolFactory.buildProtocol(peeraddr)
-                transport = self.transportFactory(addr, skt, description, protocol)
+                transport = self.transportFactory(peeraddr, skt, description, protocol)
                 protocol.makeConnection(transport)
             except:
                 log.err()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100713/7174fbfd/attachment.html>