From 328cc8e7112ec61dc94f04533534a4fe1271fb2e Mon Sep 17 00:00:00 2001
From: Ken Giusti <kgiusti@apache.org>
Date: Mon, 9 Jun 2014 21:55:29 +0000
Subject: QPID-5808: framer should consume only header bytes

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1601513 13f79535-47bb-0310-9956-ffa450edef68
---
 python/qpid/framer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'python')

diff --git a/python/qpid/framer.py b/python/qpid/framer.py
index 8e4ef014f1..08e172287f 100644
--- a/python/qpid/framer.py
+++ b/python/qpid/framer.py
@@ -90,7 +90,9 @@ class Framer(Packer):
   def read(self, n):
     while len(self.rx_buf) < n:
       try:
-        s = self.sock.recv(n) # NOTE: instead of "n", arg should be "self.maxbufsize"
+        # QPID-5808: never consume more than n bytes from the socket,
+        # otherwise the extra bytes are discarded.
+        s = self.sock.recv(n - len(self.rx_buf))
         if self.security_layer_rx:
           try:
             s = self.security_layer_rx.decode(s)
-- 
cgit v1.2.1