Do not interrupt streaming when encountering 0-length frames

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-08-31 15:58:28 -07:00 committed by Joffrey F
parent a49d73e9df
commit 7107e265b1
2 changed files with 5 additions and 3 deletions

View File

@ -59,7 +59,7 @@ def next_frame_size(socket):
try:
data = read_exactly(socket, 8)
except SocketError:
return 0
return -1
_, actual = struct.unpack('>BxxxL', data)
return actual
@ -71,7 +71,7 @@ def frames_iter(socket):
"""
while True:
n = next_frame_size(socket)
if n == 0:
if n < 0:
break
while n > 0:
result = read(socket, n)

View File

@ -205,7 +205,9 @@ def get_fake_wait():
def get_fake_logs():
status_code = 200
response = (b'\x01\x00\x00\x00\x00\x00\x00\x11Flowering Nights\n'
response = (b'\x01\x00\x00\x00\x00\x00\x00\x00'
b'\x02\x00\x00\x00\x00\x00\x00\x00'
b'\x01\x00\x00\x00\x00\x00\x00\x11Flowering Nights\n'
b'\x01\x00\x00\x00\x00\x00\x00\x10(Sakuya Iyazoi)\n')
return status_code, response