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

fix travis

Browse source
This commit is contained in:
clowwindy 2014-12-24 18:23:35 +08:00
parent dd140814a8
commit 30f4f78557
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -9,7 +9,7 @@ cache:
- dante-1.4.0 - dante-1.4.0
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq build-essential libssl-dev swig python-m2crypto python-numpy dnsutils iproute nginx - sudo apt-get install -qq build-essential libssl-dev swig python-m2crypto python-numpy dnsutils iproute nginx bc
- sudo dd if=/dev/urandom of=/usr/share/nginx/www/file bs=1M count=10 - sudo dd if=/dev/urandom of=/usr/share/nginx/www/file bs=1M count=10
- sudo service nginx restart - sudo service nginx restart
- pip install m2crypto salsa20 pep8 pyflakes nose coverage - pip install m2crypto salsa20 pep8 pyflakes nose coverage

4
shadowsocks/utils.py
View file

@ -29,7 +29,7 @@ import json
import sys import sys
import getopt import getopt
import logging import logging
from shadowsocks.common import to_bytes from shadowsocks.common import to_bytes, to_str
VERBOSE_LEVEL = 5 VERBOSE_LEVEL = 5
@ -73,7 +73,7 @@ def check_config(config):
logging.warn('warning: local set to listen on 0.0.0.0, it\'s not safe') logging.warn('warning: local set to listen on 0.0.0.0, it\'s not safe')
if config.get('server', '') in [b'127.0.0.1', b'localhost']: if config.get('server', '') in [b'127.0.0.1', b'localhost']:
logging.warn('warning: server set to listen on %s:%s, are you sure?' % logging.warn('warning: server set to listen on %s:%s, are you sure?' %
(config['server'], config['server_port'])) (to_str(config['server']), config['server_port']))
if (config.get('method', '') or '').lower() == b'table': if (config.get('method', '') or '').lower() == b'table':
logging.warn('warning: table is not safe; please use a safer cipher, ' logging.warn('warning: table is not safe; please use a safer cipher, '
'like AES-256-CFB') 'like AES-256-CFB')