118 Commits

Author	SHA1	Message	Date
fatedier	694ee44af6	subdomain: subdomain can be configured in frps.ini, fix #220	2017-01-13 02:23:04 +08:00
fatedier	1f49510e3e	udp proxy: fix reconnect error, fix #209	2017-01-05 23:09:17 +08:00
fatedier	c80dcd050d	update default value of heartbeat_interval and heartbeat_timeout	2017-01-04 23:09:28 +08:00
fatedier	043ab62587	build: update Makefile.cross-compiles	2017-01-04 22:56:08 +08:00
bingtianbaihua	e26285eefc	added heartbeat conf	2016-12-30 17:47:34 +08:00
fatedier	299bd7b5cb	frps: fix panic caused by frps closing the nil channel, fix #205	2016-12-29 23:49:39 +08:00
fatedier	90d1384bf7	frps: update	2016-12-28 00:56:55 +08:00
fatedier	cdcc1240ec	vhost: fix a wrong usage of sort.Reverse	2016-12-27 02:52:32 +08:00
fatedier	c2c9f68a00	frps: improve login response message	2016-12-27 01:45:22 +08:00
fatedier	37470c26f0	frps: fix sometimes no response when frpc login to frps, see #142	2016-12-27 01:19:19 +08:00
fatedier	04a4591caa	vhost: check host and location for url router	2016-12-27 01:01:39 +08:00
fatedier	9faf4acd62	connection pool: ssh can't work when pool_count is set, fix #193	2016-12-26 01:55:54 +08:00
fatedier	4c3fb22295	modify version to 0.9.1	2016-12-25 14:26:16 +08:00
fatedier	a56f068f8c	subdomain: fix a bug that subdomain is not correct for https, close #194	2016-12-25 14:16:54 +08:00
fatedier	6f90c3400c	update conf	2016-12-25 02:09:01 +08:00
fatedier	eb4f779384	update	2016-12-25 01:53:23 +08:00
fatedier	b1d1a7a20a	Merge branch 'pr_182' into dev	2016-12-24 08:51:26 -06:00
fatedier	ddbb56ee8f	update	2016-12-21 01:07:30 +08:00
fatedier	10fc6c67e0	some fix	2016-12-21 01:01:44 +08:00
fatedier	0573ddcd84	Merge pull request #186 from vashstorm/bugfix ... add auth for reload api	2016-12-20 05:20:54 -06:00
vashstorm	5eb5fec761	add auth for reload api	2016-12-20 18:32:17 +08:00
fatedier	52fe721202	frps: fix a panic bug caused by reading map	2016-12-20 01:30:10 +08:00
fatedier	d7d2b72431	Merge pull request #184 from fatedier/fatedier/udp ... udp: fix privilege_mode not success for udp type	2016-12-19 09:57:08 -06:00
fatedier	d04d31b39a	udp: fix privilege_mode not success for udp type	2016-12-19 23:30:48 +08:00
Pan Hao	d9304d8166	Merge pull request #183 from fatedier/fatedier/udp ... support udp type	2016-12-19 07:30:44 -06:00
XueBing	a44be1e2ed	set default location empty string array ... modified: src/models/server/config.go modified: src/utils/vhost/router.go modified: src/models/server/config.go modified: src/utils/vhost/router.go	2016-12-19 10:38:41 +08:00
fatedier	f2999e3317	support udp type	2016-12-19 01:22:21 +08:00
XueBing	a4c05e6ff9	show "Port" incorrectly in dashboard	2016-12-18 23:43:08 +08:00
XueBing	d93dd82ed9	modify the getListener function && add TPS in dashboard	2016-12-18 23:35:14 +08:00
XueBing	edf4bc431d	support the configure of url in "http" section	2016-12-18 22:40:58 +08:00
Maodanping	c702355669	frps/control rename authTimeout; add judgement for subdomain	2016-11-08 13:40:40 +08:00
Maodanping	54beb19435	frps/control.go remove log info	2016-11-05 14:26:04 +08:00
Maodanping	396e148f80	add subdomain configuration; add conn auth timeout	2016-11-05 14:15:16 +08:00
fatedier	4c69a4810e	Merge pull request #112 from moul/patch-1 ... Grammar fix	2016-09-13 09:43:50 +08:00
Manfred Touron	40e023f5f4	Grammar fix	2016-09-12 23:15:34 +02:00
fatedier	adcb2c1ea5	typo	2016-09-06 17:56:09 +08:00
fatedier	8c497793c5	Merge pull request #101 from fatedier/maodanp/http_auth ... Maodanp/http auth	2016-09-05 22:25:01 -05:00
Maodanping	78c6845781	utils/vhost: remove fmt.Printf method	2016-08-29 11:02:59 +08:00
Maodanping	dc5e130d33	utils/vhost: supprot http authentication	2016-08-29 10:53:02 +08:00
fatedier	fbc504dfa3	cmd/frps: fix wrong usage of package docopt ... Fixes #98.	2016-08-26 23:00:56 +08:00
fatedier	5661537f7c	cmd/frpc: fix a merge typo cause pool_count do not work	2016-08-23 15:59:50 +08:00
fatedier	c21f8ad291	utils/version: bump version to 0.8.1	2016-08-23 10:34:14 +08:00
fatedier	3d6578b15f	Merge pull request #90 from fatedier/release0.8 ... merge some fix	2016-08-23 10:23:44 +08:00
fatedier	da182ecd81	utils/vhost: support wildcard domains	2016-08-23 00:58:51 +08:00
fatedier	c8e5096f48	utils/pcrypto: fix the bug of using aes ... 1. The aes IV needs to be unique, but not secure. 2. The key should be 16, 24 or 32 bytes. Fixes #85.	2016-08-21 23:28:01 +08:00
fatedier	2b1c39e03d	cmd/frps: a bug of status display in dashboard, fix #80	2016-08-18 14:52:11 +08:00
fatedier	46ee2f2bc8	utils/conn: typo	2016-08-17 10:07:16 +08:00
fatedier	a655f5699b	utils/version: change version to 0.9.0	2016-08-15 01:11:37 +08:00
fatedier	e262ac6abd	frpc: add support for connecting server through http proxies, see #67	2016-08-15 00:55:22 +08:00
Eric Larssen	4dadaac905	Add basic auth to dashboard	2016-08-14 12:45:35 +08:00