aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/pathoc.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-06-17 14:15:48 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-06-17 15:06:01 +0200
commiteb3ed87100ff7c32e5bf040db7eb6ea3d0c06e12 (patch)
tree7a4b871c24193d31f8dc23794b0a37f58c111c92 /pathod/pathoc.py
parentfcf5dc8728816bae73a175ee021f8a11a1591567 (diff)
downloadmitmproxy-eb3ed87100ff7c32e5bf040db7eb6ea3d0c06e12.tar.gz
mitmproxy-eb3ed87100ff7c32e5bf040db7eb6ea3d0c06e12.tar.bz2
mitmproxy-eb3ed87100ff7c32e5bf040db7eb6ea3d0c06e12.zip
move custom HTTP/2 stack from netlib to pathod
Diffstat (limited to 'pathod/pathoc.py')
-rw-r--r--pathod/pathoc.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index ea21b747..c6783878 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -11,18 +11,18 @@ import time
import OpenSSL.crypto
import six
+import logging
+from netlib.tutils import treq
+from netlib import strutils
from netlib import tcp, certutils, websockets, socks
from netlib import exceptions
from netlib.http import http1
-from netlib.http import http2
from netlib import basethread
-from pathod import log, language
+from . import log, language
+from .protocols import http2
-import logging
-from netlib.tutils import treq
-from netlib import strutils
logging.getLogger("hpack").setLevel(logging.WARNING)
@@ -227,7 +227,7 @@ class Pathoc(tcp.TCPClient):
"Pathoc might not be working as expected without ALPN.",
timestamp=False
)
- self.protocol = http2.HTTP2Protocol(self, dump_frames=self.http2_framedump)
+ self.protocol = http2.HTTP2StateProtocol(self, dump_frames=self.http2_framedump)
else:
self.protocol = http1