Browse Source

Merge pull request #248 from peterfyj/master

Set default method as bytes.
master
clowwindy 10 years ago
parent
commit
a5fc1c7e5f
  1. 2
      shadowsocks/utils.py

2
shadowsocks/utils.py

@ -172,7 +172,7 @@ def get_config(is_local):
sys.exit(2) sys.exit(2)
config['password'] = config.get('password', '') config['password'] = config.get('password', '')
config['method'] = config.get('method', 'aes-256-cfb') config['method'] = config.get('method', b'aes-256-cfb')
config['port_password'] = config.get('port_password', None) config['port_password'] = config.get('port_password', None)
config['timeout'] = int(config.get('timeout', 300)) config['timeout'] = int(config.get('timeout', 300))
config['fast_open'] = config.get('fast_open', False) config['fast_open'] = config.get('fast_open', False)

Loading…
Cancel
Save