diff --git a/CHANGES b/CHANGES index bcae1a6..85b1666 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +2.0.6 2014-06-19 +- Fix CPU 100% on POLL_HUP +- More friendly logging + 2.0.5 2014-06-18 - Support a simple config format for multiple ports diff --git a/setup.py b/setup.py index b379d22..fa7e13e 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open('README.rst') as f: setup( name="shadowsocks", - version="2.0.5", + version="2.0.6", license='MIT', description="A fast tunnel proxy that help you get through firewalls", author='clowwindy', diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py index a789cd2..10f73d6 100644 --- a/shadowsocks/tcprelay.py +++ b/shadowsocks/tcprelay.py @@ -74,7 +74,7 @@ WAIT_STATUS_READING = 1 WAIT_STATUS_WRITING = 2 WAIT_STATUS_READWRITING = WAIT_STATUS_READING | WAIT_STATUS_WRITING -BUF_SIZE = 8 * 1024 +BUF_SIZE = 32 * 1024 class TCPRelayHandler(object):