745 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fatedier	659f84bab2	conf: update	2016-12-26 09:58:58 +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	d243f70125	doc: update contributors	2016-12-25 14:25:12 +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	6a6ccc5302	Merge pull request #192 from fatedier/pr_182 ... http proxy support router by url	2016-12-24 12:41:20 -06: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	59a34b81e0	Merge pull request #182 from xuebing1110/dev ... [dev] http router by host and url	2016-12-24 09:08:20 -06:00
fatedier	b1d1a7a20a	Merge branch 'pr_182' into dev	2016-12-24 08:51:26 -06:00
fatedier	6b34ed4644	update doc	2016-12-21 21:22:10 +08:00
fatedier	dde734c953	Merge pull request #188 from fatedier/dev ... bump version to 0.9.0	2016-12-21 00:11:10 -06:00
fatedier	5532881b09	Merge pull request #187 from fatedier/doc ... update doc for v0.9.0	2016-12-21 00:04:16 -06:00
fatedier	94ddeebc21	update doc	2016-12-21 12:10:21 +08: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	2bf1d3e922	conf: update	2016-12-19 01:48:57 +08:00
fatedier	19f349a65e	vendor: fix	2016-12-19 01:44:17 +08:00
fatedier	b0e56945cd	vendor: update godep conf	2016-12-19 01:33:26 +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
fatedier	47db75e921	Merge pull request #152 from fatedier/maodanp/subdomain ... Maodanp/subdomain	2016-11-09 00:14:33 +08:00
Maodanping	c702355669	frps/control rename authTimeout; add judgement for subdomain	2016-11-08 13:40:40 +08:00
Maodanping	7cc5d03f35	conf/frps.ini modify domain field	2016-11-07 09:51:27 +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	77f207d69a	Merge branch 'master' into dev	2016-08-24 13:49:46 +08:00
fatedier	b65e037b5e	Fix conflicts ... Conflicts: README_zh.md src/utils/version/version.go	2016-08-24 13:49:13 +08:00
fatedier	b8a28e945c	Merge pull request #94 from fatedier/doc ... doc: add donation info	2016-08-24 13:40:55 +08:00
fatedier	0476a85a7d	doc: add donation info	2016-08-24 13:36:38 +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	19f7950485	bump version to 0.8.1 ... bump version to 0.8.1	2016-08-23 10:37:22 +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