Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh.github.com:cortesi/netlib

Browse Source
This commit is contained in:
Aldo Cortesi 2014-02-26 10:10:27 +13:00
commit 0e867adcf2
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netlib/http_auth.py
View File

@ -1,4 +1,4 @@
import contrib.md5crypt as md5crypt
from .contrib import md5crypt
import http
from argparse import Action, ArgumentTypeError

9
netlib/tcp.py
View File

@ -380,7 +380,7 @@ class BaseHandler(SocketCloseMixin):
class TCPServer:
class TCPServer(object):
request_queue_size = 20
def __init__(self, address):
self.address = Address.wrap(address)
@ -416,7 +416,10 @@ class TCPServer:
connection, client_address = self.socket.accept()
t = threading.Thread(
target = self.connection_thread,
args = (connection, client_address)
args = (connection, client_address),
name = "ConnectionThread (%s:%s -> %s:%s)" %
(client_address[0], client_address[1],
self.address.host, self.address.port)
)
t.setDaemon(1)
t.start()
@ -443,7 +446,7 @@ class TCPServer:
print >> fp, exc
print >> fp, '-'*40
def handle_client_connection(self, conn, client_address): # pragma: no cover
def handle_client_connection(self, conn, client_address): # pragma: no cover
"""
Called after client connection.
"""

2
netlib/version.py
View File

@ -1,4 +1,4 @@
IVERSION = (0, 10)
IVERSION = (0, 11)
VERSION = ".".join(str(i) for i in IVERSION)
NAME = "netlib"
NAMEVERSION = NAME + " " + VERSION