aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-11-05 04:17:08 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-11-05 04:17:08 +0100
commitde5df2e4d4ec253a9ffbc0dffd8ce69d035383e9 (patch)
tree2f8a58a192c570efd6d29c25edefcf2f394fd886
parentfb463f50ed6c1431b29d77a8bf239fb25dd2b6e9 (diff)
parent6b6b0a94163c53f0834e10c5412344ec54beacd6 (diff)
downloadmitmproxy-de5df2e4d4ec253a9ffbc0dffd8ce69d035383e9.tar.gz
mitmproxy-de5df2e4d4ec253a9ffbc0dffd8ce69d035383e9.tar.bz2
mitmproxy-de5df2e4d4ec253a9ffbc0dffd8ce69d035383e9.zip
Merge pull request #819 from tekii/hotfix-broken-copy
fix copy to clipboard command when copying content
-rw-r--r--libmproxy/console/common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 1a72fa2a..12fdfe27 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -256,7 +256,7 @@ def copy_flow_format_data(part, scope, flow):
return None, "Request content is missing"
with decoded(flow.request):
if part == "h":
- data += flow.client_conn.protocol.assemble(flow.request)
+ data += netlib.http.http1.assemble_request(flow.request)
elif part == "c":
data += flow.request.content
else:
@@ -269,7 +269,7 @@ def copy_flow_format_data(part, scope, flow):
return None, "Response content is missing"
with decoded(flow.response):
if part == "h":
- data += flow.client_conn.protocol.assemble(flow.response)
+ data += netlib.http.http1.assemble_response(flow.response)
elif part == "c":
data += flow.response.content
else: