***  
---  
***************
*** 277,294 ****
  
      def read(self, size=-1):
          data = self._rbuf
          if size < 0:
              # Read until EOF
              buffers = []
              if data:
                  buffers.append(data)
              self._rbuf = ""
-             if self._rbufsize <= 1:
-                 recv_size = self.default_bufsize
-             else:
-                 recv_size = self._rbufsize
              while True:
!                 data = self._sock.recv(recv_size)
                  if not data:
                      break
                  buffers.append(data)
--- 277,294 ----
  
      def read(self, size=-1):
          data = self._rbuf
+         if self._rbufsize <= 1:
+             rbufsize = self.default_bufsize
+         else:
+             rbufsize = self._rbufsize
          if size < 0:
              # Read until EOF
              buffers = []
              if data:
                  buffers.append(data)
              self._rbuf = ""
              while True:
!                 data = self._sock.recv(rbufsize)
                  if not data:
                      break
                  buffers.append(data)
***************
*** 305,311 ****
              self._rbuf = ""
              while True:
                  left = size - buf_len
!                 recv_size = max(self._rbufsize, left)
                  data = self._sock.recv(recv_size)
                  if not data:
                      break
--- 305,311 ----
              self._rbuf = ""
              while True:
                  left = size - buf_len
!                 recv_size = max(rbufsize, left)
                  data = self._sock.recv(recv_size)
                  if not data:
                      break