haidy
59aa7cd710
Merge branch 'frp/master'
...
# Conflicts:
# client/admin_api.go
# client/control.go
# client/proxy/proxy.go
# client/service.go
# client/visitor.go
# cmd/frpc/sub/root.go
# server/service.go
2019-10-03 14:19:23 +08:00
fatedier
f999c8a87e
Merge pull request #1396 from velovix/issue-1387_server-conf-as-argument
...
Pass server configuration as an argument
2019-08-21 00:30:01 +08:00
Tyler Compton
5fc7b3ceb5
Remove global ServerService variable
...
This variable didn't seem to be used anyway, so no further changes were
required.
2019-08-19 16:23:33 -07:00
Tyler Compton
6277af4790
Pass server configuration as an argument
...
The ServerCommonConf is now passed around as an argument instead of
being shared between components as a global variable. This allows for
more natural interaction with server.Session as a library and allows for
multiple servers to co-exist within the same process.
Related: #1387
2019-08-19 15:52:08 -07:00
Tyler Compton
00bd0a8af4
Load assets for dashboard/admin panel on demand
...
The client and server services now only attempt to load assets if the
dashboard or admin panel are enabled. This change makes it possible to
use FRP as a library without having to manage assets. If a library user
wants to start a server with the dashboard enabled, they will need to
set the DashboardPort and AssetsDir fields of ServerCommonConf.
2019-08-19 10:10:50 -07:00
haidy
b661dfb6ec
merge from frp 0.28.2
2019-08-13 22:20:48 +08:00
haidy
b86ff20d5a
Merge branch 'frp/master'
...
# Conflicts:
# client/service.go
# server/group/tcp.go
# server/service.go
2019-08-13 22:16:51 +08:00
fatedier
b3ed863021
support http load balancing
2019-07-31 00:41:58 +08:00
haidy
d3f88fe5ea
Merge branch 'frp/master'
...
# Conflicts:
# server/service.go
2019-07-20 13:05:28 +08:00
fatedier
17cc0735d1
add read timeout for TLS check operation
2019-07-12 17:11:03 +08:00
haidy
cefd81e873
Merge branch 'frp/master'
2019-04-27 12:01:38 +08:00
fatedier
0dfd3a421c
frps: support custom_404_page
2019-04-25 12:29:34 +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
d812488767
support tls connection
2019-03-11 14:14:31 +08:00
haidy
fb756e03de
修复内存泄漏的问题
2019-03-07 21:45:38 +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
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
70ac7d3d11
fix control delete error
2019-01-26 21:36:24 +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
fatedier
f76deb8898
frps: remove auth timeout
2019-01-15 00:22:13 +08:00
fatedier
611d063e1f
server: adjust code structure
2019-01-15 00:11:08 +08:00
fatedier
0c7d778896
frps: optimize code
2019-01-11 14:34:50 +08:00
haidy
f2512f8fce
support ipv6
2019-01-04 22:21:57 +08:00
caohaidi
594ae40261
修改判断frp状态可能错误的bug
2018-12-27 13:32:20 +08:00
fatedier
7c21906884
improve kcp shutdown
2018-12-11 15:17:36 +08:00
caohaidi
f930b62d9c
更新关闭服务接口
2018-11-27 14:53:32 +08:00
haidy
f3813c32a0
更新frp接口
2018-11-26 22:28:48 +08:00
Haidy
d29e84eb92
Merge pull request #1 from fatedier/master
...
fork origin
2018-08-19 14:30:04 +08:00
fatedier
f14ed87b29
Merge pull request #886 from fatedier/websocket
...
Connect protocol support websocket
2018-08-10 16:36:02 +08:00
fatedier
07623027bc
websocket: fix
2018-08-10 16:31:49 +08:00
fatedier
941ac25648
fix ci
2018-08-10 12:02:38 +08:00
fatedier
7793f55545
websocket: update muxer for websocket
2018-08-10 11:45:48 +08:00
fatedier
ca88b07ecf
optimize
2018-08-08 11:18:38 +08:00
FishFish
b8037475ed
websocket protocol
2018-08-05 12:55:31 +08:00
haidy
4d86202521
更新frps代码，添加关闭功能
2018-06-14 14:23:27 +08:00
fatedier
495b577819
update group ci
2018-05-23 14:39:12 +08:00
fatedier
f56b49ad3b
new feature: load balancing for tcp proxy
2018-05-22 23:59:35 +08:00
fatedier
b2a2037032
change accept connection error loglevel to debug
2018-05-11 10:35:16 +08:00
fatedier
20fcb58437
vendor: add package golib/net
2018-05-09 00:23:42 +08:00
fatedier
5db605ca02
frps: vhost_http_port and vhost_https_port can be same with frps bind
...
port
2018-05-06 20:25:52 +08:00
fatedier
f45283dbdb
disable yamux default log
2018-05-05 00:09:39 +08:00
fatedier
976cf3e9f8
use yamux instead of smux
2018-04-25 02:42:00 +08:00
fatedier
4a5c00286e
doc: update
2018-04-24 01:28:25 +08:00
fatedier
0f6f674a64
cmd: support more cli command
2018-04-23 02:00:25 +08:00
fatedier
b2c846664d
new feature: assign a random port if remote_port is 0 in type tcp and
...
udp
2018-01-17 22:18:34 +08:00
fatedier
584e098e8e
frpc: add status command
2018-01-17 01:09:33 +08:00
fatedier
7da61f004b
improve http vhost package
2017-12-13 03:27:43 +08:00
