From e94df810cb87356f178416c815f0571c8c1e3676 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Mon, 7 Oct 2013 01:12:31 +0000
Subject: [PATCH] proper fix for unit test http proxy handling EAGAIN

---
 test/http.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/http.py b/test/http.py
index 484c53821..3866aa98e 100644
--- a/test/http.py
+++ b/test/http.py
@@ -81,7 +81,7 @@ Qual a diferença entre um proxy Elite, Anónimo e Transparente?
 
 """
 
-import socket, thread, select, sys, base64, time
+import socket, thread, select, sys, base64, time, errno
 
 __version__ = '0.1.0 Draft 1'
 BUFLEN = 8192
@@ -123,15 +123,15 @@ class ConnectionHandler:
         self.target.close()
 
     def get_base_header(self):
+        retries = 0
         while 1:
             try:
                 self.client_buffer += self.client.recv(BUFLEN)
-            except Exception, e:
-                print dir(e)
-                print type(e)
-                # 35 == EAGAIN
-                if e.errno == 35:
+            except socket.error, e:
+                err = e.args[0]
+                if (err == errno.EAGAIN or err == errno.EWOULDBLOCK) and retries < 20:
                     time.sleep(0.5)
+                    retries += 1
                     continue
                 raise e
             end = self.client_buffer.find('\r\n\r\n')