comparison mercurial/httpclient/__init__.py @ 14341:5c3de67e7402

httpclient: import revision b8c3511a8cae from py-nonblocking-http

Fixes issues with SSL_ERROR_WANT_READ incorrectly breaking the
response read.

14340:defa319d8bb7

            if not (self.complete() or
                    (self._content_len == _LEN_CLOSE_IS_END and self._body)):
                logger.info('timed out with timeout of %s', self._timeout)
                raise HTTPTimeoutException('timeout reading data')
            logger.info('cl: %r body: %r', self._content_len, self._body)
        data = self.sock.recv(INCOMING_BUFFER_SIZE)
        logger.debug('response read %d data during _select', len(data))
        if not data:
            if not self.headers:
                self._load_response(self._end_headers)
                self._content_len = 0

            was_first = first

            # incoming data
            if r:
                try:
                    data = r[0].recv(INCOMING_BUFFER_SIZE)
                    if not data:
                        logger.info('socket appears closed in read')
                        outgoing_headers = body = None
                        break
                    if response is None:

14341:5c3de67e7402

            if not (self.complete() or
                    (self._content_len == _LEN_CLOSE_IS_END and self._body)):
                logger.info('timed out with timeout of %s', self._timeout)
                raise HTTPTimeoutException('timeout reading data')
            logger.info('cl: %r body: %r', self._content_len, self._body)
        try:
            data = self.sock.recv(INCOMING_BUFFER_SIZE)
        except socket.sslerror, e:
            if e.args[0] != socket.SSL_ERROR_WANT_READ:
                raise
            logger.debug('SSL_WANT_READ in _select, should retry later')
            return True
        logger.debug('response read %d data during _select', len(data))
        if not data:
            if not self.headers:
                self._load_response(self._end_headers)
                self._content_len = 0

            was_first = first

            # incoming data
            if r:
                try:
                    try:
                        data = r[0].recv(INCOMING_BUFFER_SIZE)
                    except socket.sslerror, e:
                        if e.args[0] != socket.SSL_ERROR_WANT_READ:
                            raise
                        logger.debug(
                            'SSL_WANT_READ while sending data, retrying...')
                        continue
                    if not data:
                        logger.info('socket appears closed in read')
                        outgoing_headers = body = None
                        break
                    if response is None: