130 Commits

Author SHA1 Message Date
Max Lv
486bebd920 Merge pull request #252 from rogers0/PR/fix_gcc9
Fix FTBFS under GCC-9
2019-08-17 16:00:58 +08:00
Roger Shimizu
1fab9b9d7b Fix FTBFS under GCC-9
Resolve report from Debian:
 - https://bugs.debian.org/925829

obfs_http.c: In function 'check_http_header':
obfs_http.c:247:13: error: 'strncasecmp' specified bound
18446744073709551614 exceeds maximum object size 9223372036854775807
[-Werror=stringop-overflow=]
  247 |         if (strncasecmp(hostname, obfs_http->host, result) == 0)
{
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2019-08-17 01:22:36 +09:00
Max Lv
df8089c159 Merge pull request #251 from Meshkati/master
Fix a typo in README
2019-08-09 21:28:54 +08:00
Seyed Mostafa Meshkati
cc57c2ddf3 Merge pull request #1 from Meshkati/fix/readme
Fix a typo in README
2019-08-09 17:32:09 +04:30
Seyed Mostafa Meshkati
9f84254fbe Fix a typo in README
changed obfusacting to obfuscating
2019-08-09 17:31:54 +04:30
Max Lv
6261a92ad4 Merge pull request #232 from Mygod/patch-1
Deprecate the project
2019-01-14 20:00:07 +08:00
Mygod
a098dad80f Deprecate the project. 2019-01-14 19:42:56 +08:00
Max Lv
5cbfdcc28c Merge pull request #215 from kiichi7/master
Add RPM package build files.
2018-12-19 12:10:53 +08:00
Max Lv
9d8c10135c Merge pull request #205 from antmak/patch-1
Add a needed dependency for building CentOS7
2018-12-19 12:10:41 +08:00
Max Lv
e91ebafcc4 Merge pull request #230 from MrJeos/patch-1
Fix package error for Alpine
2018-12-19 12:10:25 +08:00
Artem Kochnev
2407155540 Fix package error for Alpine 2018-12-18 15:46:29 +03:00
Max Lv
7659eeccf4 Merge pull request #221 from DDoSolitary/fix-clearenv-include
Update for shadowsocks/libcork#8.
2018-09-18 16:18:13 +08:00
DDoSolitary
ba45e514f4 Update for shadowsocks/libcork#8. 2018-09-16 19:00:51 +08:00
Max Lv
64f10bee0d Merge pull request #220 from DDoSolitary/fix-libcork-clearenv
Update libcork: shadowsocks/libcork#7.
2018-09-13 08:59:26 +08:00
DDoSolitary
f85784b634 Update libcork: shadowsocks/libcork#7. 2018-09-12 10:26:49 +08:00
kiichi
fce4e04e72 Add RPM package build files. 2018-07-30 11:20:31 +08:00
Max Lv
5b0e103e81 Merge pull request #211 from ticonci/master
fix compile warning with GCC8
2018-07-06 13:32:35 +08:00
Zane
117dd05632 fix compile warning with GCC8 2018-07-06 11:03:24 +08:00
Max Lv
ead13d7cf4 Merge pull request #210 from slurin/master
Some improvement
2018-07-04 17:33:56 +08:00
slurin
c720ed863c Another method to check the client's http request.
Since the request method are fixed,
we need to check the first line of client's request,
rather than the first few chars.
2018-07-04 17:06:56 +08:00
slurin
6867e6a627 Accept all HTTP method if it's not set on the server side. 2018-07-04 16:59:33 +08:00
Max Lv
26bc54be06 Merge pull request #208 from slurin/master
Add config for http obfs request method.
2018-07-03 11:09:08 +08:00
Chiya
0714bc306e Bug fix 2018-07-02 20:50:48 +08:00
Chiya
af050bd20a help text bug fix. 2018-07-02 20:14:51 +08:00
Chiya
f42ab1ebb0 Add config option for obfs HTTP method 2018-07-02 19:57:19 +08:00
antmak
f7e4314c92 Add a needed dependency for building CentOS7 2018-06-20 15:57:00 +08:00
Max Lv
3763198a49 Merge pull request #195 from linusyang92/master
MinGW: add missing macro in Fast Open branch
2018-04-07 22:46:07 +08:00
Linus Yang
21a14b73b3 MinGW: add missing macro in Fast Open branch 2018-04-07 17:28:25 +08:00
Max Lv
f4f8a72ff6 Merge pull request #192 from kimw/patch-1
Update obfs-server.asciidoc
2018-03-25 07:05:18 +08:00
Kim
40f56beab8 Update obfs-server.asciidoc
Remove dups
2018-03-25 05:04:02 +08:00
Max Lv
0864223dbf Merge pull request #190 from ipcjs/master
failover need set port
2018-03-20 08:52:37 +08:00
ipcjs
f4e03d9cc2 failover need set port 2018-03-20 00:59:28 +08:00
Max Lv
474158f924 Merge pull request #185 from linusyang92/mingw-new
Port latest MinGW changes
2018-03-14 10:47:22 +08:00
Linus Yang
b401b29b4b Port latest MinGW changes 2018-03-14 09:50:11 +08:00
Max Lv
27145e1e1d Merge pull request #178 from DDoSolitary/patch-update-libcork
Update libcork for shadowsocks/libcork#3.
2018-02-25 09:49:34 +08:00
DDoSolitary
1a6c77bb81 Update libcork for shadowsocks/libcork#3. 2018-02-22 22:38:21 +08:00
Max Lv
0c6ea880a4 Merge pull request #167 from slurin/master
Add url path specifying support.
2018-01-29 16:31:00 +08:00
slurin
b2a54b5437 Add url path specifying support. 2018-01-29 14:29:06 +08:00
Max Lv
e390bb1786 Fix the build with win32 thread mingw 2017-11-27 09:48:29 +08:00
Max Lv
caba87c2d3 Refine mingw linking options 2017-11-24 13:03:26 +08:00
Max Lv
f3916e78df Merge pull request #145 from rogers0/PR/debian_sync
Sync debian/ folder with debian version 0.0.5-1
2017-11-24 09:19:54 +08:00
Roger Shimizu
7e15603349 Sync debian/ folder with debian version 0.0.5-1 2017-11-23 21:43:02 +09:00
Max Lv
d59998f7ea Merge pull request #142 from lrinQVQ/master
Update Alpine APKBUILD
2017-11-18 11:52:30 +08:00
lrinQVQ
3d29d50fe2 Update Alpine APKBUILD 2017-11-17 17:43:03 +08:00
Max Lv
e2f9a4d10d Merge pull request #141 from lrinQVQ/master
Remove c-ares dependency in README
2017-11-17 08:44:52 +08:00
lrinQVQ
c7ae0e6d44 Remove c-ares dependency in README
6478110bd8
2017-11-16 23:44:35 +08:00
Max Lv
a9c43588e4 Bump version v0.0.5 2017-11-16 18:18:27 +08:00
Max Lv
8df0a7c83d Fix the windows socket issue with MinGW 2017-11-16 18:03:30 +08:00
Max Lv
fa5ee69b04 Disable signal watch in mingw32 2017-11-10 14:38:35 +08:00
Max Lv
693dd70f28 Fix a warning 2017-11-09 17:51:52 +08:00