diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-09-14 23:47:04 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-09-14 23:47:04 +0200 |
| commit | 2956c144d30558141ec43bec798a424974ffa6f1 (patch) | |
| tree | 297a3a9de73f66f5ad0224e60d7ae7520048d282 /libmproxy/proxy.py | |
| parent | 729677cd85cffedec8f481f1b6025f00fb637e13 (diff) | |
| parent | 38a1135ab8f3ab2e97d07fa8e339067c67722e16 (diff) | |
| download | mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.tar.gz mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.tar.bz2 mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'libmproxy/proxy.py')
| -rw-r--r-- | libmproxy/proxy.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 5dcf6dc1..4fdeeb65 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -88,11 +88,13 @@ class RequestReplayThread(threading.Thread): server = ServerConnection(self.config, r.scheme, r.host, r.port, r.host) server.connect() server.send(r) + tsstart = utils.timestamp() httpversion, code, msg, headers, content = http.read_response( server.rfile, r.method, self.config.body_size_limit ) response = flow.Response( - self.flow.request, httpversion, code, msg, headers, content, server.cert + self.flow.request, httpversion, code, msg, headers, content, server.cert, + server.rfile.first_byte_timestamp ) self.channel.ask(response) except (ProxyError, http.HttpError, tcp.NetLibError), v: @@ -224,6 +226,7 @@ class ProxyHandler(tcp.BaseHandler): request.ssl_setup_timestamp = sc.ssl_setup_timestamp sc.rfile.reset_timestamps() try: + tsstart = utils.timestamp() httpversion, code, msg, headers, content = http.read_response( sc.rfile, request.method, @@ -242,7 +245,7 @@ class ProxyHandler(tcp.BaseHandler): response = flow.Response( request, httpversion, code, msg, headers, content, sc.cert, - sc.rfile.first_byte_timestamp, utils.timestamp() + sc.rfile.first_byte_timestamp ) response_reply = self.channel.ask(response) # Not replying to the server invalidates the server |