Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

httpserver: Fix Content-Length computation.

This commit is contained in:
Valentin Lorentz 2016-01-05 18:05:36 +01:00
parent 058e4100f2
commit 1d162dd048
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/httpserver.py
View File

@ -306,11 +306,12 @@ class SupyHTTPServerCallback(log.Firewalled):
self.wfile.write(s) self.wfile.write(s)
def doGet(self, handler, path, *args, **kwargs): def doGet(self, handler, path, *args, **kwargs):
response = self.defaultResponse.encode()
handler.send_response(405) handler.send_response(405)
self.send_header('Content-Type', 'text/plain; charset=utf-8; charset=utf-8') self.send_header('Content-Type', 'text/plain; charset=utf-8; charset=utf-8')
self.send_header('Content-Length', len(self.defaultResponse)) self.send_header('Content-Length', len(response))
self.end_headers() self.end_headers()
self.wfile.write(self.defaultResponse.encode()) self.wfile.write(response)
doPost = doHead = doGet doPost = doHead = doGet
@ -331,13 +332,13 @@ class Supy404(SupyHTTPServerCallback):
What I'm saying is you just triggered a 404 Not Found, and I am not What I'm saying is you just triggered a 404 Not Found, and I am not
trained to help you in such a case.""") trained to help you in such a case.""")
def doGet(self, handler, path, *args, **kwargs): def doGet(self, handler, path, *args, **kwargs):
response = self.response
if minisix.PY3:
response = response.encode()
handler.send_response(404) handler.send_response(404)
self.send_header('Content-Type', 'text/plain; charset=utf-8; charset=utf-8') self.send_header('Content-Type', 'text/plain; charset=utf-8; charset=utf-8')
self.send_header('Content-Length', len(self.response)) self.send_header('Content-Length', len(self.response))
self.end_headers() self.end_headers()
response = self.response
if minisix.PY3:
response = response.encode()
self.wfile.write(response) self.wfile.write(response)
doPost = doHead = doGet doPost = doHead = doGet
@ -355,12 +356,12 @@ class SupyIndex(SupyHTTPServerCallback):
plugins = '<ul class="plugins"><li>%s</li></ul>' % '</li><li>'.join( plugins = '<ul class="plugins"><li>%s</li></ul>' % '</li><li>'.join(
['<a href="/%s/">%s</a>' % (x,y.name) for x,y in plugins]) ['<a href="/%s/">%s</a>' % (x,y.name) for x,y in plugins])
response = get_template('index.html') % {'list': plugins} response = get_template('index.html') % {'list': plugins}
if minisix.PY3:
response = response.encode()
handler.send_response(200) handler.send_response(200)
self.send_header('Content-Type', 'text/html; charset=utf-8') self.send_header('Content-Type', 'text/html; charset=utf-8')
self.send_header('Content-Length', len(response)) self.send_header('Content-Length', len(response))
self.end_headers() self.end_headers()
if minisix.PY3:
response = response.encode()
self.wfile.write(response) self.wfile.write(response)
class Static(SupyHTTPServerCallback): class Static(SupyHTTPServerCallback):
@ -373,12 +374,12 @@ class Static(SupyHTTPServerCallback):
self._mimetype = mimetype self._mimetype = mimetype
def doGet(self, handler, path): def doGet(self, handler, path):
response = get_template(path) response = get_template(path)
if minisix.PY3:
response = response.encode()
handler.send_response(200) handler.send_response(200)
self.send_header('Content-type', self._mimetype) self.send_header('Content-type', self._mimetype)
self.send_header('Content-Length', len(response)) self.send_header('Content-Length', len(response))
self.end_headers() self.end_headers()
if minisix.PY3:
response = response.encode()
self.wfile.write(response) self.wfile.write(response)
class Favicon(SupyHTTPServerCallback): class Favicon(SupyHTTPServerCallback):
@ -409,12 +410,12 @@ class Favicon(SupyHTTPServerCallback):
self.wfile.write(response) self.wfile.write(response)
else: else:
response = _('No favicon set.') response = _('No favicon set.')
if minisix.PY3:
response = response.encode()
handler.send_response(404) handler.send_response(404)
self.send_header('Content-type', 'text/plain; charset=utf-8') self.send_header('Content-type', 'text/plain; charset=utf-8')
self.send_header('Content-Length', len(response)) self.send_header('Content-Length', len(response))
self.end_headers() self.end_headers()
if minisix.PY3:
response = response.encode()
self.wfile.write(response) self.wfile.write(response)
http_servers = [] http_servers = []