Donate CPU: Use CRLF in HTTP responses

This commit is contained in:
Daniel Marjamäki 2018-08-26 11:17:18 +02:00
parent ad0ebd8f1a
commit 08837b2232
1 changed files with 6 additions and 10 deletions

View File

@ -72,10 +72,10 @@ def sendAll(connection, data):
def httpGetResponse(connection, data, contentType): def httpGetResponse(connection, data, contentType):
resp = 'HTTP/1.1 200 OK\n' resp = 'HTTP/1.1 200 OK\r\n'
resp += 'Connection: close\n' resp += 'Connection: close\r\n'
resp += 'Content-length: ' + str(len(data)) + '\n' resp += 'Content-length: ' + str(len(data)) + '\r\n'
resp += 'Content-type: ' + contentType + '\n\n' resp += 'Content-type: ' + contentType + '\r\n\r\n'
resp += data resp += data
sendAll(connection, resp) sendAll(connection, resp)
@ -101,19 +101,15 @@ class HttpClientThread(Thread):
filename = os.path.expanduser('~/donated-results/') + package filename = os.path.expanduser('~/donated-results/') + package
if not os.path.isfile(filename): if not os.path.isfile(filename):
print('HTTP/1.1 404 Not Found') print('HTTP/1.1 404 Not Found')
connection.send('HTTP/1.1 404 Not Found\n\n') connection.send('HTTP/1.1 404 Not Found\r\n\r\n')
else: else:
f = open(filename,'rt') f = open(filename,'rt')
data = f.read() data = f.read()
f.close() f.close()
httpGetResponse(self.connection, data, 'text/plain') httpGetResponse(self.connection, data, 'text/plain')
print('HttpClientThread: sleep 30 seconds..') finally:
time.sleep(30)
print('HttpClientThread: stopping')
time.sleep(1) time.sleep(1)
self.connection.close() self.connection.close()
except:
return
if __name__ == "__main__": if __name__ == "__main__":
resultPath = os.path.expanduser('~/donated-results') resultPath = os.path.expanduser('~/donated-results')