Browse Source

Merge pull request #214 from wb14123/py3-str

fix str/byte issue in python 3
auth
clowwindy 10 years ago
parent
commit
e476a54658
  1. 2
      shadowsocks/tcprelay.py

2
shadowsocks/tcprelay.py

@ -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:

Loading…
Cancel
Save