635 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fatedier	2e773d550b	Merge pull request #606 from fatedier/test ... tests: more ci case	2018-01-18 15:04:03 +08:00
fatedier	e155ff056e	tests: more ci case	2018-01-18 14:53:44 +08:00
fatedier	37210d9983	Merge branch 'dev' of github.com:fatedier/frp into dev	2018-01-18 00:46:21 +08:00
fatedier	338d5bae37	fix panic when using socks5 plugin with encryption and compression, fix #446	2018-01-18 00:45:11 +08:00
fatedier	3e62198612	Merge pull request #604 from fatedier/http ... fix new http no traffic stats, fix #590	2018-01-17 23:28:48 +08:00
fatedier	4f7dfcdb31	fix new http no traffic stats, fix #590	2018-01-17 23:17:15 +08:00
fatedier	5b08201e5d	Merge pull request #603 from fatedier/test ... add test cases and new feature assgin a random port if remote_port is 0	2018-01-17 22:45:02 +08:00
fatedier	b2c846664d	new feature: assign a random port if remote_port is 0 in type tcp and ... udp	2018-01-17 22:18:34 +08:00
fatedier	3f6799c06a	add remoteAddr in NewProxyResp message	2018-01-17 15:01:26 +08:00
fatedier	9a5f0c23c4	fix ci	2018-01-17 01:18:40 +08:00
fatedier	afde0c515c	packages: add package github.com/rodaine/table	2018-01-17 01:15:34 +08:00
fatedier	584e098e8e	frpc: add status command	2018-01-17 01:09:33 +08:00
fatedier	37395b3ef5	Merge pull request #596 from NemoAlex/patch-2 ... Use sans-serif font in web	2018-01-10 10:36:28 +08:00
NemoAlex	43fb3f3ff7	Use sans-serif font in web	2018-01-08 13:56:51 +08:00
fatedier	82b127494c	Merge pull request #576 from gtt116/master ... Close connection if frpc can't connection to local server	2017-12-26 14:51:02 +08:00
gtt116	4d79648657	Close connection if frpc can't connection to local server ... Now, when frpc can't connect to local server it leaves the connection alone, the patch fix it. Fixed #575	2017-12-26 14:39:07 +08:00
fatedier	3bb404dfb5	more test case	2017-12-18 19:35:09 +08:00
fatedier	ff4bdec3f7	add test case	2017-12-16 23:59:46 +08:00
fatedier	69f8b08ac0	update role error log info	2017-12-16 21:56:13 +08:00
fatedier	d873df5ca8	let role default value to 'server'	2017-12-15 11:40:08 +08:00
fatedier	a384bf5580	Merge pull request #564 from fatedier/dev ... bump version to v0.14.1	2017-12-14 22:28:25 +08:00
fatedier	92046a7ca2	Merge pull request #561 from fatedier/http ... improve http vhost package	2017-12-13 23:48:18 +08:00
fatedier	4cc5ddc012	newhttp support BasicAuth	2017-12-13 23:44:27 +08:00
fatedier	46358d466d	support encryption and compression in new http reverser proxy	2017-12-13 04:28:58 +08:00
fatedier	7da61f004b	improve http vhost package	2017-12-13 03:27:43 +08:00
fatedier	63037f1c65	typo fix	2017-12-11 22:46:45 +08:00
fatedier	cc160995da	improve error role log info	2017-12-11 16:21:17 +08:00
fatedier	de48d97cb2	fix kcp port print error	2017-12-11 01:36:47 +08:00
fatedier	1a6a179b68	visitor: fix panic	2017-12-05 22:26:53 +08:00
fatedier	3a2946a2ff	Merge pull request #549 from fatedier/dev ... bump version to v0.14.0	2017-12-05 01:42:00 +08:00
fatedier	ae9a4623d9	Merge pull request #548 from fatedier/doc ... update doc and fix vistor -> visitor	2017-12-05 01:38:03 +08:00
fatedier	bd1e9a3010	update doc and fix vistor -> visitor	2017-12-05 01:34:33 +08:00
fatedier	92fff5c191	Merge pull request #539 from timerever/dev ... add custom dashboard bind address	2017-11-29 10:34:36 +08:00
timerever	8c65b337ca	add custom dashboard bind address	2017-11-28 15:56:34 +08:00
fatedier	0f1005ff61	using glide	2017-11-01 16:21:57 +08:00
fatedier	ad858a0d32	prevent sending on a closed channel in vhost package, fix #502	2017-11-01 10:51:30 +08:00
fatedier	1e905839f0	update kcp connection options	2017-10-25 03:02:25 +08:00
fatedier	bf50f932d9	update version to v0.14.0	2017-10-25 02:55:36 +08:00
fatedier	673047be2c	Merge pull request #496 from fatedier/0.14 ... xtcp for p2p communication	2017-10-24 13:54:32 -05:00
fatedier	fa2b9a836c	fix xtcp encryption	2017-10-25 02:49:56 +08:00
fatedier	9e0fd0c4ef	add packages	2017-10-25 02:29:04 +08:00
fatedier	0559865fe5	support xtcp for making nat hole	2017-10-25 01:27:04 +08:00
fatedier	4fc85a36c2	Merge pull request #486 from xiaox0321/patch-1 ... Update version.go	2017-10-20 04:12:47 -05:00
xiaox0321	3f1174a519	Update version.go ... Optimize duplicate code	2017-10-20 15:58:03 +08:00
fatedier	bcbdfcb99b	Merge pull request #473 from Hyduan/master ... doc: fix spelling error	2017-09-27 11:55:17 -05:00
Hyduan	df046bdeeb	doc: fix spelling error	2017-09-26 21:06:28 +08:00
fatedier	f83447c652	Merge pull request #461 from dvrkps/patch-1 ... travis: add 1.x to go versions	2017-09-11 06:04:14 -05:00
Davor Kapsa	9ae69b4aac	travis: add 1.x to go versions	2017-09-11 12:41:33 +02:00
fatedier	c48a89731a	Merge pull request #454 from GeorgeYuen/diamondyuan ... add Dockerfile_multiple_build	2017-09-06 01:07:36 -05:00
袁凡迪	36b58ab60c	add Dockerfile_multiple_build	2017-09-06 12:51:29 +08:00