Commit Graph

1099 Commits

Author SHA1 Message Date
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
90a32ab75d Merge pull request #1399 from renmu123/dev
fix one punctuation in Chinese docs
2019-08-20 17:24:05 +08:00
0713fd28da fix one punctuation in Chinese docs 2019-08-20 17:17:17 +08:00
f5b33e6de8 Merge pull request #1397 from velovix/issue-1387_client-assets-dir
Add an "assets_dir" option for frpc
2019-08-20 11:06:12 +08:00
fc6043bb4d Merge pull request #1395 from velovix/issue-1387_load-assets-on-demand
Load assets for dashboard/admin panel on demand
2019-08-20 11:03:05 +08:00
bc46e3330a Add an "assets_dir" option for frpc
This option allows users to specify where they want assets to be loaded
from, like the "assets_dir" option that already exists for frps. This
allows library users to use the admin panel without having to bundle
assets with statik.
2019-08-19 16:51:03 -07:00
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
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
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
a415573e45 Merge pull request #1390 from fatedier/new
support disable_log_color for console mode
2019-08-15 23:50:17 +08:00
e68012858e ci: add http load balancing test cases 2019-08-15 23:36:05 +08:00
ca8a5b753c Merge pull request #1382 from Hurricanezwf/feature/add-httpstohttp-header
add support for customized http header when using https2http plugin
2019-08-14 21:00:16 +08:00
d1f4ac0f2d add README for this feature 2019-08-14 20:44:44 +08:00
ff357882ac use Set() instead of Add() when attaching additional headers 2019-08-14 20:36:10 +08:00
934ac2b836 add support for add http header when using https2http plugin 2019-08-13 21:14:06 +08:00
1ad50d5982 bump version to v0.29.0 2019-08-12 00:48:50 +08:00
388b016842 support disable_log_color for console mode 2019-08-12 00:47:35 +08:00
50796643fb Merge pull request #1368 from fatedier/new
fix health check bug, fix #1367
2019-08-09 12:52:46 +08:00
b1838b1d5e bump version to v0.28.2 2019-08-09 12:50:33 +08:00
757b3613fe fix health check bug, fix #1367 2019-08-09 12:47:27 +08:00
b657c0fe09 Merge pull request #1358 from fatedier/new
update vendor packages
2019-08-06 18:59:03 +08:00
84df71047c no support for go1.11 2019-08-06 18:53:32 +08:00
abc6d720d0 vendor update github.com/gorilla/websocket 2019-08-06 18:53:15 +08:00
80154639e3 fix 2019-08-06 17:29:35 +08:00
f2117d8331 bump version to v0.28.1 2019-08-06 16:51:55 +08:00
261be6a7b7 add vendor files 2019-08-06 16:50:54 +08:00
b53a2c1ed9 update reverseproxy from std libraries 2019-08-06 16:49:22 +08:00
ee0df07a3c vendor update 2019-08-03 23:23:00 +08:00
4e363eca2b update version of github.com/gorilla/mux 2019-08-03 23:22:22 +08:00
4277405c0e update vendors 2019-08-03 18:49:55 +08:00
6a99f0caf7 update testify and kcp-go 2019-08-03 18:44:11 +08:00
394af08561 close session in login() 2019-08-03 16:43:21 +08:00
30cb0a3ab0 Merge pull request #1344 from fatedier/new
support http load balancing
2019-08-01 13:59:41 +08:00
5680a88267 fix connection leak when login_fail_exit is false, fix #1335 2019-07-31 00:50:38 +08:00
6b089858db bump version to v0.28.0 2019-07-31 00:47:50 +08:00
b3ed863021 support http load balancing 2019-07-31 00:41:58 +08:00
5796c27ed5 doc: update 2019-07-31 00:41:43 +08:00
310e8dd768 Merge pull request #1331 from muesli/typo-fixes
Fixed typos in comments
2019-07-19 18:50:29 +08:00
0b40ac2dbc Fixed typos in comments
Just nitpicky typo fixes.
2019-07-19 12:40:14 +02:00
f22c8e0882 Merge pull request #1323 from skyrocknroll/skyrocknroll-patch-1
Typo
2019-07-15 14:03:57 +08:00
a388bb2c95 Typo
English Grammar Typo
2019-07-15 01:05:43 +05:30
e611c44dea Merge pull request #1322 from fatedier/dev
bump version to v0.27.1
v0.27.1
2019-07-14 20:00:31 +08:00
8e36e2bb67 Merge pull request #1320 from fatedier/new
add read timeout for TLS check operation
2019-07-14 10:57:22 +08:00
541ad8d899 update ISSUE_TEMPLATE 2019-07-12 17:59:45 +08:00
17cc0735d1 add read timeout for TLS check operation 2019-07-12 17:11:03 +08:00
fd336a5503 Merge pull request #1275 from Arugal/dev
replace the _
2019-06-02 21:22:29 +08:00
802d1c1861 replace the _ 2019-06-01 10:09:13 +08:00
65fe0a1179 Merge pull request #1271 from jiajunhuang/resp_body_should_be_closed
resp.Body must be closed after function return
2019-06-01 00:44:03 +08:00
2d24879fa3 fix 2019-05-31 15:56:05 +08:00
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