vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #214 from wb14123/py3-str

Browse source 
fix str/byte issue in python 3
This commit is contained in:
clowwindy 2014-11-10 11:30:23 +08:00
commit e476a54658
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/tcprelay.py
View file

@ -407,7 +407,7 @@ class TCPRelayHandler(object):
def _on_local_write(self): def _on_local_write(self):
if self._data_to_write_to_local: if self._data_to_write_to_local:
data = ''.join(self._data_to_write_to_local) data = b''.join(self._data_to_write_to_local)
self._data_to_write_to_local = [] self._data_to_write_to_local = []
self._write_to_sock(data, self._local_sock) self._write_to_sock(data, self._local_sock)
else: else: