Commit Graph

891 Commits

Author SHA1 Message Date
91e46a2c53 support server plugin feature 2019-12-23 20:00:04 +08:00
a57679f837 support meta info for client and proxy 2019-12-08 21:01:58 +08:00
75f3bce04d Merge pull request #1542 from fatedier/dev
bump version to v0.30.0
v0.30.0
2019-11-28 14:21:27 +08:00
df18375308 Merge pull request #1537 from fatedier/new
bump version to v0.30.0
2019-11-26 10:42:31 +08:00
c63737ab3e update doc for bandwith limit 2019-11-26 10:23:37 +08:00
1cdceee347 bump version to v0.30.0 2019-11-26 09:15:24 +08:00
694c434b9e Merge pull request #1529 from kingjcy/20191118
plugin http2https
2019-11-22 15:25:01 +08:00
62af5c8844 handle close 2019-11-22 15:18:20 +08:00
56c53909aa plugin http2https
plugin http2https
2019-11-22 11:12:48 +08:00
21a126e4e4 Merge pull request #1510 from CallanTaylor/close-file
Close file
2019-11-12 14:02:49 +08:00
8affab1a2b Close file 2019-11-12 11:38:55 +13:00
12cc53d699 update bandwidth_limit 2019-11-09 01:13:30 +08:00
2ab832bb89 Merge pull request #1495 from fatedier/new
support bandwith limit for one proxy
2019-11-08 21:05:13 +08:00
42425d8218 update vendor files 2019-11-03 01:21:47 +08:00
6da093a402 support bandwith limit for one proxy 2019-11-03 01:20:49 +08:00
adc3adc13b Merge pull request #1494 from fatedier/dev
bump version to v0.29.1
v0.29.1
2019-11-02 21:14:50 +08:00
22a79710d8 bump version to v0.29.1 2019-11-02 21:05:37 +08:00
0927553fe4 Merge pull request #1465 from lzhfromustc/dev_dup_mis_unlock
dev:udp: Add an Unlock before a continue, to fix a double lock bug
2019-10-16 00:51:26 +08:00
858d8f0ba7 Merge pull request #1460 from weisi/dev
Fix typos in English Readme.
2019-10-15 13:52:13 +08:00
8eb945ee9b dev:udp: Add an Unlock before a continue, to fix a double lock bug 2019-10-14 23:35:08 -04:00
dc0fd60d30 frp: Fix typos in English Readme. 2019-10-13 14:46:08 -07:00
cd44c9f55c Merge pull request #1459 from fatedier/new
change log method
2019-10-12 20:19:01 +08:00
649f47c345 change log method 2019-10-12 20:13:12 +08:00
6ca3160b33 Merge pull request #1451 from GuyLewin/dev
Grammer fixes
2019-10-10 10:54:09 +08:00
5f8ed4fc60 Fix CR 2019-10-09 13:41:05 -07:00
bf0993d2a6 Grammer fixes 2019-10-01 15:58:35 -04:00
5dc8175fc8 Merge pull request #1420 from Hurricanezwf/fix-bad-xtcp-encryption
fix #1347:  bad encryption and compression when use xtcp
2019-09-01 20:49:13 +08:00
dc6a5a29c1 fix bad encryption and compression when use xtcp 2019-08-31 21:24:20 +08:00
e62d9a5242 Merge pull request #1415 from fatedier/dev
bump version to v0.29.0
v0.29.0
2019-08-29 21:22:30 +08:00
94212ac8b8 Merge pull request #1414 from fatedier/new
let max_pool_count valid
2019-08-29 21:17:30 +08:00
e9e86fccf0 let max_pool_count valid 2019-08-29 21:13:21 +08:00
58745992ef typo 2019-08-27 14:10:53 +08:00
234d634bfe Merge pull request #1411 from fatedier/new
proxy protocol: fix detect method for IPV4 and IPV6, fix #1410
2019-08-26 15:30:26 +08:00
fdc6902a90 proxy protocol: fix detect method for IPV4 and IPV6 2019-08-26 11:13:33 +08:00
d8d587fd93 Merge pull request #1408 from velovix/issue-1387_api-documentation
Add documentation for common configuration fields, common proxy configuration, and sessions
2019-08-25 21:15:32 +08:00
92791260a7 Add documentation for base proxy config 2019-08-24 15:25:52 -07:00
4dfd851c46 Add docs for common config fields & sessions
Now that the common configuration objects and session objects are part
of a public API, they need to be documented in a way that can be read
with godoc. This commit should lead to easier development with FRP as a
library.
2019-08-24 15:20:34 -07:00
bc4df74b5e Merge pull request #1401 from velovix/issue-1387_client-conf-as-argument
Pass client configuration as an argument
2019-08-22 00:14:56 +08:00
666f122a72 Pass client configuration as an argument
The ClientCommonConf, configuration file path, and server UDP port are
now passed around as arguments instead of being shared between
components as global variables. This allows for multiple clients to
exist in the same process, and allows client.Session to be used as a
library more easily.
2019-08-20 14:08:01 -07:00
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