Commit Graph

10 Commits

Author SHA1 Message Date
haidy
10091ba351 Merge branch 'frp/master'
# Conflicts:
#	client/control.go
#	client/proxy/proxy.go
2019-04-17 21:49:35 +08:00
fatedier
b7a73d3469 support proxy protocol for type http 2019-04-10 10:51:01 +08:00
fatedier
9c4ec56491 support proxy protocol 2019-03-29 19:01:18 +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
e691a40260 improve the stability of xtcp 2019-03-11 15:53:58 +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
3df27b9c04 xtcp: wrap yamux on kcp connections 2019-03-05 11:18:17 +08:00
fatedier
48990da22e go vet 2019-01-31 16:49:23 +08:00
haidy
f2512f8fce support ipv6 2019-01-04 22:21:57 +08:00
fatedier
35278ad17f mv folders 2018-12-09 22:06:22 +08:00