aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-10-02 00:58:40 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-10-02 00:58:40 +0200
commit6ce6b1ad69df886af6da025c16d4d6916a56da2c (patch)
tree3e3d84eaa3273a404936905d5983a6637336b304
parentc2634476e5a6460ee553aa8c093980a589342d2c (diff)
downloadmitmproxy-6ce6b1ad69df886af6da025c16d4d6916a56da2c.tar.gz
mitmproxy-6ce6b1ad69df886af6da025c16d4d6916a56da2c.tar.bz2
mitmproxy-6ce6b1ad69df886af6da025c16d4d6916a56da2c.zip
replay: carry over SNI value
-rw-r--r--MANIFEST.in5
-rw-r--r--libmproxy/protocol/http.py5
2 files changed, 4 insertions, 6 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index efe18f43..cc048b61 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,10 +2,7 @@ include mitmproxy mitmdump
include LICENSE CHANGELOG CONTRIBUTORS README.txt
exclude README.mkd
recursive-include examples *
-recursive-exclude examples *.pyc *.pyo *.swo *.swp
recursive-include doc *
-recursive-exclude doc *.pyc *.pyo *.swo *.swp
recursive-include test *
-recursive-exclude test *.pyc *.pyo *.swo *.swp
recursive-include libmproxy *
-recursive-exclude libmproxy *.pyc *.pyo *.swo *.swp \ No newline at end of file
+recursive-exclude * *.pyc *.pyo *.swo *.swp \ No newline at end of file
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index de5f9950..0bb014a2 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -1304,7 +1304,7 @@ class RequestReplayThread(threading.Thread):
server.connect()
if r.scheme == "https":
send_connect_request(server, r.host, r.port)
- server.establish_ssl(self.config.clientcerts, sni=r.host)
+ server.establish_ssl(self.config.clientcerts, sni=self.flow.server_conn.sni)
r.form_out = "relative"
else:
r.form_out = "absolute"
@@ -1313,10 +1313,11 @@ class RequestReplayThread(threading.Thread):
server = ServerConnection(server_address)
server.connect()
if r.scheme == "https":
- server.establish_ssl(self.config.clientcerts, sni=r.host)
+ server.establish_ssl(self.config.clientcerts, sni=self.flow.server_conn.sni)
r.form_out = "relative"
server.send(r.assemble())
+ self.flow.server_conn = server
self.flow.response = HTTPResponse.from_stream(server.rfile, r.method,
body_size_limit=self.config.body_size_limit)
self.channel.ask("response", self.flow)