aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-04-11 14:14:18 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-04-11 14:14:18 -0700
commit70e35b7017b830705125a401aae2c6e283495220 (patch)
treeed13c4c317b64238ba17cb9a4e4b78f70bc8a7ef /netlib
parent14e9b0a0ac5ca8c1177e0e501906f43511798ca1 (diff)
downloadmitmproxy-70e35b7017b830705125a401aae2c6e283495220.tar.gz
mitmproxy-70e35b7017b830705125a401aae2c6e283495220.tar.bz2
mitmproxy-70e35b7017b830705125a401aae2c6e283495220.zip
peer_address -> ip_address
Diffstat (limited to 'netlib')
-rw-r--r--netlib/http/request.py1
-rw-r--r--netlib/tcp.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/netlib/http/request.py b/netlib/http/request.py
index 692ba30f..160ce3a3 100644
--- a/netlib/http/request.py
+++ b/netlib/http/request.py
@@ -18,6 +18,7 @@ from .message import Message, _native, _always_bytes, MessageData
# https://bugzilla.mozilla.org/show_bug.cgi?id=45891
host_header_re = re.compile(r"^(?P<host>[^:]+|\[.+\])(?::(?P<port>\d+))?$")
+
class RequestData(MessageData):
def __init__(self, first_line_format, method, scheme, host, port, path, http_version, headers=None, content=None,
timestamp_start=None, timestamp_end=None):
diff --git a/netlib/tcp.py b/netlib/tcp.py
index 04aa868b..d26bb5f7 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -458,11 +458,11 @@ class _Connection(object):
def __init__(self, connection):
if connection:
self.connection = connection
- self.peer_address = Address(connection.getpeername())
+ self.ip_address = Address(connection.getpeername())
self._makefile()
else:
self.connection = None
- self.peer_address = None
+ self.ip_address = None
self.rfile = None
self.wfile = None
@@ -708,7 +708,7 @@ class TCPClient(_Connection):
'Error connecting to "%s": %s' %
(self.address.host, err))
self.connection = connection
- self.peer_address = Address(connection.getpeername())
+ self.ip_address = Address(connection.getpeername())
self._makefile()
def settimeout(self, n):