103 Commits

Author	SHA1	Message	Date
Guy Lewin	98fa3855bd	CR: export error string generation to a function	2020-02-11 16:57:38 +02:00
Guy Lewin	9440bc5d72	Merge branch 'dev' into feature/detailed-errors-to-client ... # Conflicts: # models/config/server_common.go	2020-02-11 11:25:04 +02:00
Guy Lewin	f8c6795119	DetailedErrorsToClient - only send detailed error info if this is on	2020-02-10 19:29:57 +02:00
Guy Lewin	c747f160aa	TlsOnly - only accept TLS connections if enabled	2020-02-10 18:56:41 +02:00
fatedier	91e46a2c53	support server plugin feature	2019-12-23 20:00:04 +08:00
fatedier	649f47c345	change log method	2019-10-12 20:13:12 +08:00
fatedier	e9e86fccf0	let max_pool_count valid	2019-08-29 21:13:21 +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
fatedier	b3ed863021	support http load balancing	2019-07-31 00:41:58 +08:00
Christian Muehlhaeuser	0b40ac2dbc	Fixed typos in comments ... Just nitpicky typo fixes.	2019-07-19 12:40:14 +02:00
fatedier	17cc0735d1	add read timeout for TLS check operation	2019-07-12 17:11:03 +08:00
fatedier	0dfd3a421c	frps: support custom_404_page	2019-04-25 12:29:34 +08:00
Gihan	9f47c324b7	api error fix due to status code	2019-04-25 09:54:56 +08:00
fatedier	b7a73d3469	support proxy protocol for type http	2019-04-10 10:51:01 +08:00
fatedier	7f9d88c10a	fix	2019-04-08 15:39:14 +08:00
fatedier	9c4ec56491	support proxy protocol	2019-03-29 19:01:18 +08:00
fatedier	74a8752570	fix route conflict	2019-03-29 17:12:44 +08:00
fatedier	e691a40260	improve the stability of xtcp	2019-03-11 15:53:58 +08:00
fatedier	d812488767	support tls connection	2019-03-11 14:14:31 +08:00
fatedier	2481dfab64	fix api	2019-02-11 14:37:52 +08:00
fatedier	95a881a7d3	frps: update server dashboard_api	2019-02-11 11:42:07 +08:00
fatedier	96d7e2da6f	add admin UI for frpc	2019-02-01 19:28:05 +08:00
fatedier	48990da22e	go vet	2019-01-31 16:49:23 +08:00
fatedier	70ac7d3d11	fix control delete error	2019-01-26 21:36:24 +08:00
荒野無燈	0bd8f9cd9b	frps dashboard api: fixup getProxyStatsByType no data return	2019-01-15 19:22:38 +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
fatedier	7c21906884	improve kcp shutdown	2018-12-11 15:17:36 +08:00
fatedier	08c17c3247	frpc: support health check	2018-12-07 18:40:17 +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
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	db2d1fce76	http: support setting headers	2018-05-20 23:22:07 +08:00
fatedier	6eb8146334	frps dashboard add stcp	2018-05-20 19:06:05 +08:00
fatedier	1a6cbbb2d2	return error quickly if nathole make error	2018-05-17 00:07:56 +08:00
fatedier	3e349455a0	commands for xtcp, stcp add 'bind_port', fix #767	2018-05-16 23:45:44 +08:00
fatedier	96b94d9164	dashbaord_api: more info	2018-05-11 17:14:16 +08:00
fatedier	1464836f05	logs panic debug strace info	2018-05-11 12:05:37 +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	a27e3dda88	vendor: update shutdown	2018-05-08 23:51:13 +08:00