haidy
|
d3f88fe5ea
|
Merge branch 'frp/master'
# Conflicts:
# server/service.go
|
2019-07-20 13:05:28 +08:00 |
|
fatedier
|
fd336a5503
|
Merge pull request #1275 from Arugal/dev
replace the _
|
2019-06-02 21:22:29 +08:00 |
|
zhangwei
|
802d1c1861
|
replace the _
|
2019-06-01 10:09:13 +08:00 |
|
Jiajun Huang
|
2d24879fa3
|
fix
|
2019-05-31 15:56:05 +08:00 |
|
Jiajun Huang
|
75383a95b3
|
resp.Body must be closed after function return
whether it's success or fail, otherwise it will cause memory leak
ref: https://golang.org/pkg/net/http/
|
2019-05-30 22:32:36 +08:00 |
|
haidy
|
10091ba351
|
Merge branch 'frp/master'
# Conflicts:
# client/control.go
# client/proxy/proxy.go
|
2019-04-17 21:49:35 +08:00 |
|
fatedier
|
7f9d88c10a
|
fix
|
2019-04-08 15:39:14 +08:00 |
|
haidy
|
d51527959b
|
Merge branch 'frp/master'
# Conflicts:
# client/control.go
# client/proxy/proxy.go
# client/service.go
# client/visitor.go
# server/service.go
|
2019-03-24 08:30:06 +08:00 |
|
fatedier
|
6b61cb3742
|
fix frps --log_file useless, fix #1125
|
2019-03-15 15:37:17 +08:00 |
|
haidy
|
512e601cc9
|
合并最新代码
|
2019-03-05 22:31:51 +08:00 |
|
haidy
|
b66cd62c0d
|
Merge branch 'frp/master'
# Conflicts:
# client/admin_api.go
# cmd/frpc/sub/root.go
|
2019-03-05 17:09:38 +08:00 |
|
fatedier
|
ba45d29b7c
|
fix xtcp cmd
|
2019-03-03 23:44:44 +08:00 |
|
fatedier
|
2481dfab64
|
fix api
|
2019-02-11 14:37:52 +08:00 |
|
fatedier
|
96d7e2da6f
|
add admin UI for frpc
|
2019-02-01 19:28:05 +08:00 |
|
haidy
|
61a3797c55
|
Merge branch 'frp/master'
|
2019-01-27 22:10:32 +08:00 |
|
fatedier
|
385c4d3dd5
|
frpc/cmd: update protocol description
|
2019-01-26 12:52:12 +08:00 |
|
haidy
|
9e42305909
|
更新至最新代码
|
2019-01-17 22:10:25 +08:00 |
|
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 |
|
fatedier
|
f76deb8898
|
frps: remove auth timeout
|
2019-01-15 00:22:13 +08:00 |
|
haidy
|
f2512f8fce
|
support ipv6
|
2019-01-04 22:21:57 +08:00 |
|
haidy
|
b2e15c752e
|
for mac support 10.11
|
2019-01-03 21:53:58 +08:00 |
|
haidy
|
85ebd0cb62
|
add log function
|
2018-12-29 01:44:48 +08:00 |
|
caohaidi
|
38c0513ada
|
添加mac支持库
|
2018-12-28 18:45:31 +08:00 |
|
caohaidi
|
522a665ddc
|
添加版本号
|
2018-12-28 18:44:19 +08:00 |
|
haidy
|
531d708f7b
|
修改日志功能
|
2018-12-26 22:48:10 +08:00 |
|
haidy
|
dda7861742
|
更新至最新代码
|
2018-12-14 08:50:55 +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
|
48c2d9287e
|
Delete cmd
|
2018-11-27 21:08:06 +08:00 |
|
caohaidi
|
f930b62d9c
|
更新关闭服务接口
|
2018-11-27 14:53:32 +08:00 |
|
haidy
|
f3813c32a0
|
更新frp接口
|
2018-11-26 22:28:48 +08:00 |
|
fatedier
|
89d1a1fb2b
|
Merge pull request #968 from fatedier/health
support health check and code refactor
|
2018-11-09 10:06:47 +08:00 |
|
Haidy
|
d29e84eb92
|
Merge pull request #1 from fatedier/master
fork origin
|
2018-08-19 14:30:04 +08:00 |
|
fatedier
|
ca88b07ecf
|
optimize
|
2018-08-08 11:18:38 +08:00 |
|
fatedier
|
6e305db4be
|
Merge pull request #882 from 235832289/master
Fix the problem of long connection for more than 30 seconds and disconnection of the server
|
2018-08-08 11:03:08 +08:00 |
|
itcode
|
9bb08396c7
|
Fix the problem of long connection for more than 30 seconds and disconnection of the server
|
2018-08-08 10:52:08 +08:00 |
|
fatedier
|
42ee536dae
|
add module comments for vgo
|
2018-06-27 11:46:53 +08:00 |
|
fatedier
|
c33b5152e7
|
split visitors from proxies and add health check config
|
2018-06-25 18:22:35 +08:00 |
|
haidy
|
4d86202521
|
更新frps代码，添加关闭功能
|
2018-06-14 14:23:27 +08:00 |
|
Haidy
|
bf64f410b1
|
修改frps逻辑
|
2018-06-13 08:49:20 +08:00 |
|
Haidy
|
a99ea707f7
|
修改frp库
|
2018-06-09 16:36:18 +08:00 |
|
kac-
|
e64fcce417
|
cmd: frps: allow_ports option
|
2018-06-06 18:25:55 +02:00 |
|
haidy
|
48c763e282
|
Merge remote-tracking branch 'upstream/master'
|
2018-05-21 13:13:23 +08:00 |
|
fatedier
|
e1918f6396
|
frps add '-t' to set token
|
2018-05-18 10:58:08 +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 |
|