From 8e176c2086bee1c83165b1000dd980fa62e3b51e Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Fri, 1 Jul 2011 13:07:09 +1200 Subject: Cast some data read from dump files to str, to prevent unicode promotion. This fixes a bug that caused a traceback when de-serialized requests were replayed. Also adds unit tests for the problem. --- libmproxy/proxy.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libmproxy') diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 916d18eb..362d622d 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -198,11 +198,11 @@ class Request(controller.Msg): def from_state(klass, state): return klass( ClientConnect.from_state(state["client_conn"]), - state["host"], + str(state["host"]), state["port"], - state["scheme"], - state["method"], - state["path"], + str(state["scheme"]), + str(state["method"]), + str(state["path"]), utils.Headers.from_state(state["headers"]), base64.decodestring(state["content"]), state["timestamp"] @@ -353,7 +353,7 @@ class Response(controller.Msg): return klass( request, state["code"], - state["msg"], + str(state["msg"]), utils.Headers.from_state(state["headers"]), base64.decodestring(state["content"]), state["timestamp"], -- cgit v1.2.3