haidy
|
edaaafbf9c
|
Merge branch 'frp/master'
# Conflicts:
# client/control.go
# cmd/frpc/sub/root.go
# server/proxy.go
# server/service.go
|
2019-01-17 21:45:16 +08:00 |
|
荒野無燈
|
a2ccb6c190
|
frpc: fixup ini config parse problem in sub command status and reload.
|
2019-01-16 13:12:25 +08:00 |
|
haidy
|
3c114e7cd9
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# client/control.go
# client/service.go
|
2018-12-13 22:44:09 +08:00 |
|
fatedier
|
7c21906884
|
improve kcp shutdown
|
2018-12-11 15:17:36 +08:00 |
|
fatedier
|
25cfda5768
|
conf: support render configure file using environment variables
|
2018-12-11 11:46:12 +08:00 |
|
fatedier
|
aea9f9fbcc
|
health: add more ci cases and fix bugs
|
2018-12-09 21:56:46 +08:00 |
|
haidy
|
f3813c32a0
|
更新frp接口
|
2018-11-26 22:28:48 +08:00 |
|
fatedier
|
c33b5152e7
|
split visitors from proxies and add health check config
|
2018-06-25 18:22:35 +08:00 |
|
haidy
|
48c763e282
|
Merge remote-tracking branch 'upstream/master'
|
2018-05-21 13:13:23 +08:00 |
|
haidy
|
183302d27c
|
修改合并最新代码导致的bug
|
2018-05-17 16:30:26 +08:00 |
|
haidy
|
c897e3e58d
|
Merge remote-tracking branch 'upstream/master'
|
2018-05-17 10:45:56 +08:00 |
|
Haidy
|
db6feaa0ea
|
修改frpc Exit(0)问题
|
2018-05-17 00:30:21 +08:00 |
|
fatedier
|
3e349455a0
|
commands for xtcp, stcp add 'bind_port', fix #767
|
2018-05-16 23:45:44 +08:00 |
|
haidy
|
de3b19cbb2
|
更新frpc
|
2018-05-16 14:15:08 +08:00 |
|
Haidy
|
9d383a5b5b
|
更新代码
|
2018-05-16 01:11:43 +08:00 |
|
fatedier
|
01b1df2b91
|
update cmd help info
|
2018-05-14 15:01:16 +08:00 |
|
haidy
|
0749c2eb4d
|
修改frpc异步执行
|
2018-05-14 14:37:48 +08:00 |
|
haidy
|
626dbaa92c
|
更新root.go
|
2018-05-11 14:21:02 +08:00 |
|
fatedier
|
60ecd1d58c
|
cmd: change http_user and http_pwd default value to empty
|
2018-05-03 10:20:09 +08:00 |
|
fatedier
|
9abbe33790
|
typo
|
2018-04-24 01:51:52 +08:00 |
|
fatedier
|
00b9ba95ae
|
frpc: support specify default dns server, close #700
|
2018-04-23 02:59:40 +08:00 |
|
fatedier
|
0f6f674a64
|
cmd: support more cli command
|
2018-04-23 02:00:25 +08:00 |
|