diff options
Diffstat (limited to 'libpathod')
| -rw-r--r-- | libpathod/pathod.py | 10 | ||||
| -rw-r--r-- | libpathod/rparse.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py index aed95675..ef37d5ad 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -26,7 +26,7 @@ class PathodHandler(tcp.BaseHandler): if path.startswith(self.server.prefix): spec = urllib.unquote(path)[len(self.server.prefix):] try: - presp = rparse.parse({}, spec) + presp = rparse.parse(self.server.request_settings, spec) except rparse.ParseException, v: presp = rparse.InternalResponse( 800, @@ -34,8 +34,7 @@ class PathodHandler(tcp.BaseHandler): ) ret = presp.serve(self.wfile) if ret["disconnect"]: - self.close() - + self.finish() ret["request"] = dict( path = path, method = method, @@ -65,6 +64,7 @@ class Pathod(tcp.TCPServer): def __init__(self, addr, ssloptions=None, prefix="/p/", staticdir=None, anchors=None): tcp.TCPServer.__init__(self, addr) self.ssloptions = ssloptions + self.staticdir = staticdir self.prefix = prefix self.app = app.app self.app.config["pathod"] = self @@ -73,7 +73,9 @@ class Pathod(tcp.TCPServer): @property def request_settings(self): - return {} + return dict( + staticdir = self.staticdir + ) def handle_connection(self, request, client_address): PathodHandler(request, client_address, self) diff --git a/libpathod/rparse.py b/libpathod/rparse.py index 92d0a54b..8a407388 100644 --- a/libpathod/rparse.py +++ b/libpathod/rparse.py @@ -2,8 +2,6 @@ import operator, string, random, mmap, os, time import contrib.pyparsing as pp from netlib import http_status -TESTING = False - class ParseException(Exception): def __init__(self, msg, s, col): Exception.__init__(self) |