Commit Graph
2354 Commits
Author SHA1 Message Date
root 02f25e588c add ss-manager read manager_address from config.json 2020-05-02 10:57:36 +08:00
Max Lv bc77b6189c Merge pull request #2694 from wangxinhe2006/master
Add `xchacha20-ietf-poly1305` to docs and completions
2020-04-29 11:37:29 +08:00
Max Lv 236c98d6d9 Merge pull request #2685 from JamisHoo/master
Also apply LIB_ONLY for dynamic library, fix #2443
2020-04-29 11:37:16 +08:00
汪心禾 2ae8006ee3 *Shadowsocks-libev* accepts 19 different ciphers 2020-04-29 09:50:03 +08:00
汪心禾 2cc92827e5 xchacha20-ietf-poly1305 doc 2020-04-28 15:44:20 +08:00
汪心禾 1e7bb4512c xchacha20-ietf-poly1305 completion 2020-04-28 15:43:55 +08:00
Max Lv aa9fe8cceb Fix #2692 2020-04-27 09:44:22 +08:00
Max Lv 401d323480 Merge pull request #2691 from rogers0/PR/fix_debian_rules
debian/rules: Fix #2675
2020-04-18 21:14:45 +08:00
Roger Shimizu 5f947a8466 debian/rules: Fix #2675
Regression caused by commit [0d96da4].
2020-04-18 21:21:07 +09:00
Max Lv 9ea9aa0368 Merge pull request #2690 from Loyalsoldier/update-telegram-CIDR
Update telegram CIDR
2020-04-18 11:08:46 +08:00
loyalsoldier 4d33f01042 Update telegram CIDR
Update telegram CIDR according to https://core.telegram.org/resources/cidr.txt
2020-04-18 10:05:30 +08:00
Max Lv 1d78159613 Merge pull request #2688 from Loyalsoldier/update-acl
Update ACL files
2020-04-18 08:26:17 +08:00
loyalsoldier 1e5d55777d Update gfwlist on 2020.04.18 2020-04-18 01:47:34 +08:00
loyalsoldier d258132414 Update local IPs 2020-04-18 01:35:20 +08:00
loyalsoldier 1cce832bef Update China Mainland IPv4
Update China Mainland IPv4 according to @17mon/china_ip_list
2020-04-18 01:35:15 +08:00
Max Lv 33a1932023 Fix #2687 2020-04-17 13:42:30 +08:00
Max Lv 870f9d914d Merge pull request #2686 from shadowsocks/rm-fedora-copr-librehat
Remove the unmaintained Fedora COPR section
2020-04-14 19:45:29 +08:00
Symeon Huang 4baff35e25 Remove the unmaintained Fedora COPR section
I'm no longer maintaining the packages for Fedora and RHEL. This PR seeks to remove this section to avoid confusions.
2020-04-14 12:43:38 +01:00
Jamis Hoo bbb2849b60 Also apply LIB_ONLY for shared library, fix #2443 2020-04-13 22:08:43 +08:00
Max Lv cc658e49cb Merge pull request #2674 from cyber386/work
Update public libraries
2020-03-31 06:03:18 +08:00
cyber368 bab75a877a Update public libraries 2020-03-31 00:09:58 +08:00
Max Lv 34f1bbed5b Merge pull request #2673 from JamisHoo/master
cmake: fix build issues when this project is built as dependency of other CMake projects
2020-03-29 18:51:45 +08:00
Max Lv 2cdcb41fa8 Merge pull request #2672 from rogers0/PR/sync_debian
Sync debian/ folder with debian version 3.3.4+ds-3
2020-03-29 18:08:51 +08:00
Jamis Hoo 138186b3db Add include_directories property for shared_libraries 2020-03-29 17:35:22 +08:00
Jamis Hoo 0aa55a29e5 Replace CMAKE_XXX_DIR with PROJECT_XXX_DIR, so that this project can be used in an enclosing project 2020-03-29 17:35:12 +08:00
Roger Shimizu 0d96da4471 Sync debian/ folder with debian version 3.3.4+ds-3 2020-03-29 17:49:39 +09:00
Max Lv b9ce095ee7 Merge pull request #2666 from imMMX/add-dockerfile-timezone
Add Dockerfile timezone, Update readme.
2020-03-20 17:01:25 +08:00
mmx 57e0c9f924 Update Dockerfile set default timezone to UTC. 2020-03-20 16:28:48 +08:00
mmx b6ddbbe0b0 Add Dockerfile timezone, Update readme. 2020-03-20 14:20:28 +08:00
Max Lv f34b362af0 Merge pull request #2659 from ideal/master
Fix a tiny memory leak
2020-03-15 06:52:25 +08:00
ideal af722a4b92 Fix a tiny memory leak 2020-03-15 01:21:51 +08:00
Max Lv cafdd77b3d Update README.md 2020-03-01 17:13:58 +08:00
Max Lv 6f7a6fd7e3 Merge pull request #2628 from Mygod/kill-sniparser
Remove sniparser
2020-02-20 17:50:49 +08:00
Max Lv 64d3235c67 Fix #2620 2020-02-15 11:06:42 +08:00
Max Lv 69b79e5b24 Merge pull request #2631 from shadowsocks/revert-2626-snapd-classic
Revert "Use classic mode to install shadowsocks-libev"
2020-02-14 09:02:27 +08:00
Max Lv 33976557d6 Revert "Use classic mode to install shadowsocks-libev" 2020-02-14 09:02:00 +08:00
Max Lv 8c251b2bc5 Fix build 2020-02-12 15:48:22 +08:00
Mygod 1c818ebca7 Fix build 2020-02-11 23:55:58 -05:00
Mygod 355adddff1 Remove unused is_remote_dns option 2020-02-11 23:52:48 -05:00
Mygod 301fea635b Remove sniparser 2020-02-11 23:48:30 -05:00
Max Lv bb12209941 Merge pull request #2626 from shadowsocks/snapd-classic
Use classic mode to install shadowsocks-libev
2020-02-12 08:21:37 +08:00
Mygod 5c16299c1a Use classic mode to install shadowsocks-libev
This can prevent `Too many open files` error from happening due to sandboxing.
2020-02-11 18:34:57 -05:00
Max Lv ac61025066 Merge pull request #2623 from babarosaM33/master
udprelay: exclude udp remote_recv_sendto buff full
2020-02-09 12:40:10 +08:00
babarosaM33 81bbd98d8b udprelay: exclude udp remote_recv_sendto buff full
before:
udp send buff full would not reset timeout trigger
after:
fix it
2020-02-08 17:55:07 +08:00
Max Lv f5c140dc1f Merge pull request #2619 from babarosaM33/master
updrelay: cleanup
2020-02-07 17:50:33 +08:00
babarosaM33 a5111fe32f updrelay: cleanup 2020-02-07 15:11:14 +08:00
Max Lv 375257954e Merge pull request #2618 from imba-tjd/patch-1
readme(docker): remove "--fast-open"
2020-02-06 21:01:53 +08:00
谭九鼎 21e3224ff1 readme(docker): remove "--fast-open" 2020-02-06 20:38:58 +08:00
Max Lv a0ef1a56f7 Merge pull request #2611 from hosiet/patch-1
tests/test.py: Make script compatible with python3
2020-02-01 07:39:34 +08:00
Boyuan Yang defa4f8dcf tests/test.py: Make script compatible with python3
Currently the test script assumes the returned web page is always encoded in UTF-8, which might not be the case. It is likely that the real encoding is `ISO-8859-1` and that running the script under python3 will raise error:

```
< 
{ [11931 bytes data]
100 11923    0 11923    0     0   184k      0 --:--:-- --:--:-- --:--:--  187k
Traceback (most recent call last):
  File "tests/test.py", line 106, in <module>
    line = str(line, 'utf8')
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xa0 in position 1105: invalid start byte
```
This pull request makes no assumption on the returned data and send the raw output to stderr as `bytes`. This should allow the test script to finish successfully when `tests/test.py` is run by python3.
2020-01-31 16:11:21 -05:00