chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip, progress!
[hippotat.git]
/
server
diff --git
a/server
b/server
index 3bfbc4261affd995355ecdb2e25175522d3dcb65..e5aa67b588878fca227564a896f808e2fd5382f6 100755
(executable)
--- a/
server
+++ b/
server
@@
-165,6
+165,8
@@
def process_request(request, desca):
log_http(desca, 'processing', idof=id(request), d=d)
log_http(desca, 'processing', idof=id(request), d=d)
+ d = mime_translate(d)
+
cl.process_arriving_data(d)
cl.new_request(request)
cl.process_arriving_data(d)
cl.new_request(request)
@@
-186,7
+188,7
@@
class IphttpResource(twisted.web.resource.Resource):
try: process_request(request, desca)
except Exception as e:
emsg = traceback.format_exc()
try: process_request(request, desca)
except Exception as e:
emsg = traceback.format_exc()
- log_http(desca, 'EXCEPTION ' + emsg)
+ log_http(desca, '
RETURNING
EXCEPTION ' + emsg)
request.setHeader('Content-Type','text/plain; charset="utf-8"')
request.setResponseCode(400)
return (emsg + ' # ' + repr(desca) + '\r\n').encode('utf-8')
request.setHeader('Content-Type','text/plain; charset="utf-8"')
request.setResponseCode(400)
return (emsg + ' # ' + repr(desca) + '\r\n').encode('utf-8')
@@
-230,6
+232,6
@@
def process_cfg():
common_startup()
process_cfg()
common_startup()
process_cfg()
-start_ipif(c.ipif_command,
route
)
+start_ipif(c.ipif_command,
(lambda p,s,d: route(p,"[ipif]",s,d))
)
start_http()
common_run()
start_http()
common_run()