diff --git a/examples/proxapp b/examples/proxapp index eb5bdbb70..3a94cd558 100755 --- a/examples/proxapp +++ b/examples/proxapp @@ -1,8 +1,8 @@ #!/usr/bin/env python """ - This example shows how to graft a WSGI app onto mitmproxy. In this - instance, we're using the Bottle framework (http://bottlepy.org/) to expose - a single simplest-possible page. +This example shows how to graft a WSGI app onto mitmproxy. In this +instance, we're using the Bottle framework (http://bottlepy.org/) to expose +a single simplest-possible page. """ import bottle import os diff --git a/examples/stickycookies b/examples/stickycookies index b07820fca..17cd6019b 100755 --- a/examples/stickycookies +++ b/examples/stickycookies @@ -1,9 +1,9 @@ #!/usr/bin/env python """ - This example builds on mitmproxy's base proxying infrastructure to - implement functionality similar to the "sticky cookies" option. This is at - a lower level than the Flow mechanism, so we're dealing directly with - request and response objects. +This example builds on mitmproxy's base proxying infrastructure to +implement functionality similar to the "sticky cookies" option. This is at +a lower level than the Flow mechanism, so we're dealing directly with +request and response objects. """ from libmproxy import controller, proxy import os diff --git a/libmproxy/flow.py b/libmproxy/flow.py index c20fa558d..1d15029b3 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -933,6 +933,7 @@ class ClientPlaybackState: """ if self.flows and not self.current: n = self.flows.pop(0) + n.request.reply = controller.DummyReply() n.request.client_conn = None self.current = master.handle_request(n.request) if not testing and not self.current.response: diff --git a/setup.py b/setup.py index d8eb7cb44..c0b957289 100644 --- a/setup.py +++ b/setup.py @@ -92,5 +92,12 @@ setup( "Topic :: Internet :: Proxy Servers", "Topic :: Software Development :: Testing" ], - install_requires=["netlib>=%s"%version.VERSION, "urwid>=1.1", "pyasn1>0.1.2", "pyopenssl>=0.12", "PIL", "lxml"], + install_requires=[ + "netlib>=%s"%version.VERSION, + "urwid>=1.1", + "pyasn1>0.1.2", + "pyopenssl>=0.12", + "PIL", + "lxml" + ], )