Changeset 545 for trunk/daemon/orbited/cometsession.py

Timestamp:

09/20/08 15:44:51 (4 months ago)

Author:

rgl

Message:

Merge the 0.7 branch into trunk.

For now on, trunk will contain the bleeding-edge version of Orbited.

Files:

• trunk/daemon/orbited/cometsession.py (modified) (2 diffs)

trunk/daemon/orbited/cometsession.py

@@ -320 +320 @@
         if not self.open:
             self.open = True
-            self.packetId += 1
             self.cometTransport.sendPacket("open", self.packetId)
         self.cometTransport.flush()
@@ -373 +372 @@
         if ackId <= self.lastAckId:
             return
-        for i in range(ackId - self.lastAckId - 1): # -1 as the OPEN packet need not be ack'ed
+        for i in range(ackId - self.lastAckId):
             self.unackQueue.pop(0)
         self.lastAckId = ackId