aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/__init__.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-04 10:51:18 +0100
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-04 10:51:18 +0100
commit023026e032f7f78a53a598eb7bd130d1b14930d2 (patch)
tree01982db6659f75f2bfe737a81b82022550e48e28 /libmproxy/protocol/__init__.py
parentae4a1dd6dec9d95e450837db8937e3fb7604c121 (diff)
parent98f54d21b6156ceaa8450072be9f53dfde137248 (diff)
downloadmitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.tar.gz
mitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.tar.bz2
mitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.zip
Merge pull request #883 from mitmproxy/hyper-h2
HTTP/2: Implementation using hyper-h2
Diffstat (limited to 'libmproxy/protocol/__init__.py')
-rw-r--r--libmproxy/protocol/__init__.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py
index d46f16f5..ea958d06 100644
--- a/libmproxy/protocol/__init__.py
+++ b/libmproxy/protocol/__init__.py
@@ -27,15 +27,19 @@ as late as possible; this makes server replay without any outgoing connections p
from __future__ import (absolute_import, print_function, division)
from .base import Layer, ServerConnectionMixin, Kill
-from .http import Http1Layer, UpstreamConnectLayer, Http2Layer
from .tls import TlsLayer
from .tls import is_tls_record_magic
from .tls import TlsClientHello
+from .http import UpstreamConnectLayer
+from .http1 import Http1Layer
+from .http2 import Http2Layer
from .rawtcp import RawTCPLayer
__all__ = [
"Layer", "ServerConnectionMixin", "Kill",
- "Http1Layer", "UpstreamConnectLayer", "Http2Layer",
"TlsLayer", "is_tls_record_magic", "TlsClientHello",
+ "UpstreamConnectLayer",
+ "Http1Layer",
+ "Http2Layer",
"RawTCPLayer",
]