diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-06-16 13:53:24 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-06-16 13:53:24 +1200 |
| commit | 18a03c063e4c0f8023c5ae53fdceac6684ab7bff (patch) | |
| tree | 49a4ebbf1a46a22fb8f5ceb06624f9050b972a95 /libmproxy/proxy.py | |
| parent | 4e53f1ee908949c0dcafd822bf05f9523e00d189 (diff) | |
| download | mitmproxy-18a03c063e4c0f8023c5ae53fdceac6684ab7bff.tar.gz mitmproxy-18a03c063e4c0f8023c5ae53fdceac6684ab7bff.tar.bz2 mitmproxy-18a03c063e4c0f8023c5ae53fdceac6684ab7bff.zip | |
Simplify netlib and improve API.
Diffstat (limited to 'libmproxy/proxy.py')
| -rw-r--r-- | libmproxy/proxy.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 9febba72..54536b39 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -12,12 +12,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - -""" - A simple proxy server implementation, which always reads all of a server - response into memory, performs some transformation, and then writes it back - to the client. -""" import sys, os, string, socket, time import shutil, tempfile, threading import optparse, SocketServer @@ -535,8 +529,7 @@ class ProxyServer(netlib.TCPServer): def handle_connection(self, request, client_address): ProxyHandler(self.config, request, client_address, self, self.masterq) - def shutdown(self): - netlib.TCPServer.shutdown(self) + def handle_shutdown(self): try: shutil.rmtree(self.certdir) except OSError: |