Merge pull request #39 from lanjelot/fixproxy

Fixing a bug in HTTP proxy, was calling recv() too many times
This commit is contained in:
lgandx 2015-03-05 16:24:44 -06:00
commit 889bc5949f

View file

@ -1827,7 +1827,7 @@ def InjectPage(data, client):
buffer1.calculate() buffer1.calculate()
return str(buffer1) return str(buffer1)
else: else:
return False return data
def InjectData(data): def InjectData(data):
Payload = HTMLToServe Payload = HTMLToServe
@ -1957,12 +1957,12 @@ class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler):
if i is soc: if i is soc:
out = self.connection out = self.connection
try: try:
if len(HTMLToServe)>5:
data = InjectData(i.recv(8192))
if InjectPage(i.recv(8192),self.client_address[0]):
data = InjectPage(i.recv(8192),self.client_address[0])
else:
data = i.recv(8192) data = i.recv(8192)
if len(HTMLToServe)>5:
data = InjectData(data)
else:
data = InjectPage(data,self.client_address[0])
except: except:
pass pass
else: else: