Merge branch 'master' into nat

2014-08-13 19:51:12 -07:00
parent a280501ff1 161e7997fa
commit 735080a84b
1 changed files with 3 additions and 0 deletions
@@ -263,6 +263,9 @@ class Node( object ):
        # Look for PID
        marker = chr( 1 ) + r'\d+\r\n'
        if findPid and chr( 1 ) in data:
+            # Marker can be read in chunks; continue until all of it is read
+            while not re.findall( marker, data ):
+                data += self.read( 1024 )
            markers = re.findall( marker, data )
            if markers:
                self.lastPid = int( markers[ 0 ][ 1: ] )