wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

attempt to fix test http proxy to handle EAGAIN errors

This commit is contained in:
Arvid Norberg 2013-10-07 00:34:06 +00:00
parent d90f7336b1
commit 793c65cc61
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/http.py
View File

@ -81,7 +81,7 @@ Qual a diferença entre um proxy Elite, Anónimo e Transparente?
""" """
import socket, thread, select, sys, base64 import socket, thread, select, sys, base64, time
__version__ = '0.1.0 Draft 1' __version__ = '0.1.0 Draft 1'
BUFLEN = 8192 BUFLEN = 8192
@ -124,7 +124,16 @@ class ConnectionHandler:
def get_base_header(self): def get_base_header(self):
while 1: while 1:
try:
self.client_buffer += self.client.recv(BUFLEN) self.client_buffer += self.client.recv(BUFLEN)
except Exception, e:
print dir(e)
print type(e)
# 35 == EAGAIN
if e.errno == 35:
time.sleep(0.5)
continue
raise e
end = self.client_buffer.find('\r\n\r\n') end = self.client_buffer.find('\r\n\r\n')
if end!=-1: if end!=-1:
break break
@ -185,7 +194,7 @@ class ConnectionHandler:
if count == time_out_max: if count == time_out_max:
break break
def start_server(host='localhost', port=8080, IPv6=False, timeout=60, def start_server(host='localhost', port=8080, IPv6=False, timeout=100,
handler=ConnectionHandler): handler=ConnectionHandler):
if IPv6==True: if IPv6==True:
soc_type=socket.AF_INET6 soc_type=socket.AF_INET6

2
test/setup_transfer.cpp
View File

@ -447,7 +447,7 @@ int start_proxy(int proxy_type)
char buf[512]; char buf[512];
snprintf(buf, sizeof(buf), "%s --port %d%s", cmd, port, auth); snprintf(buf, sizeof(buf), "%s --port %d%s", cmd, port, auth);
fprintf(stderr, "%s starting socks proxy on port %d (%s %s)...\n", time_now_string(), port, type, auth); fprintf(stderr, "%s starting proxy on port %d (%s %s)...\n", time_now_string(), port, type, auth);
fprintf(stderr, "%s\n", buf); fprintf(stderr, "%s\n", buf);
int r = async_run(buf); int r = async_run(buf);
if (r == 0) exit(1); if (r == 0) exit(1);