From 876252eba8272409e29ddea2806835e147bc6f70 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 25 Jun 2015 10:27:22 +1200 Subject: Remove stray print & massage whitespace a bit --- libmproxy/protocol/http.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'libmproxy') diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 9bce7206..da15066b 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -1314,9 +1314,7 @@ class HTTPHandler(ProtocolHandler): pass elif request.form_in == self.expected_form_in: - request.form_out = self.expected_form_out - if request.form_in == "absolute": if request.scheme != "http": raise http.HttpError( @@ -1328,7 +1326,7 @@ class HTTPHandler(ProtocolHandler): # value at flow.server_conn self.c.set_server_address((request.host, request.port)) flow.server_conn = self.c.server_conn - + elif request.form_in == "relative": if self.c.config.mode == "spoof": # Host header @@ -1340,22 +1338,21 @@ class HTTPHandler(ProtocolHandler): ) p = http.parse_url("http://" + h) request.scheme = p[0] - request.host = p[1] - request.port = p[2] + request.host = p[1] + request.port = p[2] self.c.set_server_address((request.host, request.port)) flow.server_conn = self.c.server_conn - + if self.c.config.mode == "sslspoof": # SNI is processed in server.py if not (flow.server_conn and flow.server_conn.ssl_established): - print ":::::::::::::::" raise http.HttpError( 400, "Invalid request: No host information" ) - + return None - + raise http.HttpError( 400, "Invalid HTTP request form (expected: %s, got: %s)" % ( self.expected_form_in, request.form_in -- cgit v1.2.3