aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/protocols
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-06-12 11:27:16 +1200
committerGitHub <noreply@github.com>2016-06-12 11:27:16 +1200
commite58a2bf0956c6916ebba2477df0320b554c139e2 (patch)
tree83934cad2a5918fd7b22a7236985356dfc9cced3 /pathod/protocols
parentdc545ca0f63b63c88dd5bf5d072a3d9b5cc2a2ea (diff)
parent1d4403096393369e0a8038ad79434ac26b503de3 (diff)
downloadmitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.tar.gz
mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.tar.bz2
mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.zip
Merge branch 'master' into appveyor
Diffstat (limited to 'pathod/protocols')
-rw-r--r--pathod/protocols/http.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pathod/protocols/http.py b/pathod/protocols/http.py
index 6eefb34f..7736df4b 100644
--- a/pathod/protocols/http.py
+++ b/pathod/protocols/http.py
@@ -1,6 +1,7 @@
+from netlib import version
from netlib.exceptions import TlsException
from netlib.http import http1
-from .. import version, language
+from .. import language
class HTTPProtocol(object):
@@ -17,7 +18,7 @@ class HTTPProtocol(object):
self.pathod_handler.wfile.write(
'HTTP/1.1 200 Connection established\r\n' +
- ('Proxy-agent: %s\r\n' % version.NAMEVERSION) +
+ ('Proxy-agent: %s\r\n' % version.PATHOD) +
'\r\n'
)
self.pathod_handler.wfile.flush()