Fixing a bug in HTTP proxy, was calling recv() too many times

This commit is contained in:
lanjelot 2015-03-05 15:33:41 +11:00
commit ddaa9f8767

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:
data = i.recv(8192)
if len(HTMLToServe)>5: if len(HTMLToServe)>5:
data = InjectData(i.recv(8192)) data = InjectData(data)
if InjectPage(i.recv(8192),self.client_address[0]):
data = InjectPage(i.recv(8192),self.client_address[0])
else: else:
data = i.recv(8192) data = InjectPage(data,self.client_address[0])
except: except:
pass pass
else: else: