move StateObject back into libmproxy

This commit is contained in:
Maximilian Hils
2014-01-31 01:06:35 +01:00
parent 5fce7be592
commit 6ce1470631
4 changed files with 112 additions and 9 deletions

View File

@@ -26,7 +26,7 @@ class ProtocolHandler(object):
This method gets called should there be an uncaught exception during the connection.
This might happen outside of handle_messages, e.g. if the initial SSL handshake fails in transparent mode.
"""
raise NotImplementedError
raise error
from . import http, tcp

View File

@@ -1,10 +1,10 @@
import Cookie, urllib, urlparse, time, copy
from email.utils import parsedate_tz, formatdate, mktime_tz
import netlib.utils
from netlib import http, tcp, http_status, stateobject, odict
from netlib import http, tcp, http_status, odict
from netlib.odict import ODict, ODictCaseless
from . import ProtocolHandler, ConnectionTypeChange, KILL
from .. import encoding, utils, version, filt, controller
from .. import encoding, utils, version, filt, controller, stateobject
from ..proxy import ProxyError, ClientConnection, ServerConnection
HDR_FORM_URLENCODED = "application/x-www-form-urlencoded"