The first can be problematic if poll(2) returns POLLHUP|POLLERR on a socket. Before it would be only be respected for SOCKOP_RECV, but since they can also occur on other socket operations, esp. in combination with OpenSSL, letting the socket functions handle POLLHUP|POLLERR seems to be the right thing.
The second is a typo leading to an endless loop if the first line of an HTTP connection is empty (simply "\r\n"). Instead of removing the empty line, it would remove anything after it. Signed-off-by: Michael Hanselmann <[email protected]> Reviewed-by: Iustin Pop <[email protected]> --- This is a cherry-pick of 0be1313662 from devel-2.0. lib/http/__init__.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/http/__init__.py b/lib/http/__init__.py index 6f0d95c..533be81 100644 --- a/lib/http/__init__.py +++ b/lib/http/__init__.py @@ -403,9 +403,9 @@ def SocketOperation(sock, op, arg1, timeout): if event is None: raise HttpSocketTimeout() - if (op == SOCKOP_RECV and - event & (select.POLLNVAL | select.POLLHUP | select.POLLERR)): - return "" + if event & (select.POLLNVAL | select.POLLHUP | select.POLLERR): + # Let the socket functions handle these + break if not event & wait_for_event: continue @@ -862,7 +862,7 @@ class HttpMessageReader(object): # the CRLF." if idx == 0: # TODO: Limit number of CRLFs/empty lines for safety? - buf = buf[:2] + buf = buf[2:] continue if idx > 0: -- 1.6.6
