曹海迪
91f120371c
Merge branch 'origin_0.32.0'
...
# Conflicts:
# vendor/github.com/fatedier/golib/net/mux/mux.go
2020-10-11 23:10:34 +08:00
fatedier
495d999b6c
refactoring monitor code, support prometheus ( #1668 )
...
* refactoring monitor code, support prometheus
* remove vendor
2020-03-11 13:20:26 +08:00
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
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
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
0c7d778896
frps: optimize code
2019-01-11 14:34:50 +08:00
haidy
f2512f8fce
support ipv6
2019-01-04 22:21:57 +08:00
fatedier
6eb8146334
frps dashboard add stcp
2018-05-20 19:06:05 +08:00
fatedier
dfb892c8f6
Merge pull request #718 from fatedier/cmd
...
more cmds
2018-04-23 03:07:14 +08:00
fatedier
0f6f674a64
cmd: support more cli command
2018-04-23 02:00:25 +08:00
miwee
3fde9176c9
dashboard_api for getting a client status by name
2018-04-04 12:07:20 +05:30
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
d246400a71
frpc: add admin server for reload configure file
2017-07-13 02:20:49 +08:00
fatedier
44971c7918
dashboard: use gzip for static files, resolve #333
2017-05-31 01:44:18 +08:00
fatedier
7bc6c72844
dashboard: fix dashboard auth error, fix #339
2017-05-31 01:07:51 +08:00
fatedier
2883d70ea9
dashboard: don't check authentication if user and password is empty
2017-05-15 21:30:13 +08:00
fatedier
3f17837a2c
web: support http basic auth in dashboard
2017-05-15 21:18:06 +08:00
fatedier
8b2cde3a30
update for metric
2017-03-27 01:39:05 +08:00
fatedier
a4fece3f51
api: add server web api for statistics
2017-03-23 02:01:25 +08:00
fatedier
9e683fe446
update basic auth method
2017-03-21 21:36:48 +08:00
fatedier
88083d21e8
start refactoring
2017-03-09 22:44:42 +08:00
