455 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
fatedier	6320f15a7c	typo for default config file name used for frpc	2017-07-19 22:56:12 +08:00
fatedier	066172e9c1	Merge pull request #403 from fatedier/dev ... bump version to v0.13.0	2017-07-16 13:20:42 -05:00
fatedier	d5931758b6	fix user in reload command	2017-07-17 02:14:30 +08:00
fatedier	c75c3acd21	Merge pull request #402 from fatedier/doc ... update doc for v0.13.0	2017-07-16 13:12:06 -05:00
fatedier	0208ecd1d9	update doc for v0.13.0	2017-07-17 02:09:51 +08:00
fatedier	23e9845e65	Merge pull request #401 from fatedier/0.13 ... merge 0.13	2017-07-14 23:13:42 +08:00
fatedier	2b1ba3a946	update conf	2017-07-13 12:01:46 +08:00
fatedier	ee9ddf52cd	frpc: support --reload command	2017-07-13 02:30:25 +08:00
fatedier	d246400a71	frpc: add admin server for reload configure file	2017-07-13 02:20:49 +08:00
fatedier	f63a4f0cdd	frps: new parameter 'proxy_bind_addr'	2017-07-05 01:40:01 +08:00
fatedier	b743b5aaed	Merge pull request #390 from lukazh/patch-1 ... Update README.md	2017-07-05 01:27:41 +08:00
Lukaz	9d9416ab94	Update README.md ... fix a typo	2017-07-04 23:05:24 +08:00
fatedier	c081df40e1	vendor: add github.com/armon/go-socks5	2017-07-01 16:09:09 +08:00
fatedier	fe32a7c4bb	doc: update	2017-07-01 16:03:13 +08:00
fatedier	7bb8c10647	plugin: add socks5 plugin	2017-07-01 15:56:48 +08:00
fatedier	0752508469	vhost: a bug fix of reading request	2017-07-01 12:13:44 +08:00
fatedier	4cc1663a5f	vhost: add real ip in first request of one connection ... 1. fix #248 host_header_rewrite bug 2. close #270, #127	2017-07-01 01:54:37 +08:00
fatedier	b55a24a27e	update mutex used in frpc control	2017-06-27 23:31:02 +08:00
fatedier	aede4e54f8	close all proxies if protocol = kcp	2017-06-27 01:59:30 +08:00
fatedier	b811a620c3	vhost: fix 404 page	2017-06-26 22:24:47 +08:00
fatedier	07fe05a9d5	update version to v0.13.0	2017-06-26 20:57:10 +08:00
fatedier	171bc8dd22	new proxy type: stcp(secret tcp)	2017-06-26 03:02:33 +08:00
fatedier	9c175d4eb5	Merge pull request #380 from IanSmith123/fixbug ... fix backquote	2017-06-24 13:19:43 +08:00
Iansmith's win10	9f736558e2	fix backquote	2017-06-24 12:17:09 +08:00
fatedier	8f071dd2c2	Merge pull request #375 from fangqiuming/fangqiuming-patch-1 ... Fix dockerfile	2017-06-21 18:50:47 +08:00
方秋鸣	bcaf51a6ad	Fix dockerfile ... Fix incorrect filenames	2017-06-21 14:46:24 +08:00
fatedier	ad3cf9a64a	Merge pull request #372 from fatedier/dev ... bump verson to v0.12.0	2017-06-19 21:36:51 +08:00
fatedier	e3fc73dbc5	update doc	2017-06-17 18:01:08 +08:00
fatedier	f884e894f2	Merge pull request #363 from fatedier/doc ... update doc	2017-06-13 12:44:47 -05:00
fatedier	d57ed7d3d8	update doc	2017-06-14 01:40:20 +08:00