[CalendarServer-changes] [5879] CalendarServer/branches/users/wsanchez/deployment-pre-partition
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 13 11:20:08 PDT 2010
Revision: 5879
http://trac.macosforge.org/projects/calendarserver/changeset/5879
Author: glyph at apple.com
Date: 2010-07-13 11:20:08 -0700 (Tue, 13 Jul 2010)
Log Message:
-----------
pull r5877 from deployment
Revision Links:
--------------
http://trac.macosforge.org/projects/calendarserver/changeset/5877
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/metafd.py
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
+ /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
Modified: CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/metafd.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/metafd.py 2010-07-13 18:18:32 UTC (rev 5878)
+++ CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/metafd.py 2010-07-13 18:20:08 UTC (rev 5879)
@@ -77,13 +77,13 @@
self.reportingFactory.inheritedPort.stopReading()
- def createTransport(self, skt, data, protocol):
+ def createTransport(self, addr, skt, data, protocol):
"""
Create a TCP transport, from a socket object passed by the parent.
"""
self._connectionCount += 1
transport = Server(skt, protocol,
- skt.getpeername(), JustEnoughLikeAPort,
+ addr, JustEnoughLikeAPort,
self._connectionCount)
if data == 'SSL':
transport.startTLS(self.contextFactory)
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:18:32 UTC (rev 5878)
+++ CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/sendfdport.py 2010-07-13 18:20:08 UTC (rev 5879)
@@ -251,14 +251,14 @@
@param fd: a file descriptor
@type fd: C{int}
-
- @param transportFactory: a 3-argument function that takes the socket
- object produced from the file descriptor, the (non-ancillary) data
- sent along with the incoming file descriptor, and the protocol
- built along with it, and returns an L{ITransport} provider. Note
- that this should NOT call C{makeConnection} on the protocol that it
- produces, as this class will do that.
+ @param transportFactory: a 4-argument function that takes the peer
+ address, socket object produced from the file descriptor, the
+ (non-ancillary) data sent along with the incoming file descriptor,
+ and the protocol built along with it, and returns an L{ITransport}
+ provider. Note that this should NOT call C{makeConnection} on the
+ protocol that it produces, as this class will do that.
+
@param protocolFactory: an L{IProtocolFactory}
"""
FileDescriptor.__init__(self)
@@ -297,7 +297,7 @@
except:
peeraddr = ('0.0.0.0', 0)
protocol = self.protocolFactory.buildProtocol(peeraddr)
- transport = self.transportFactory(skt, description, protocol)
+ transport = self.transportFactory(addr, 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/029c96d0/attachment.html>
More information about the calendarserver-changes
mailing list