957 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fatedier	178efd67f1	Merge pull request #746 from fatedier/mux ... http port and https port can be same with frps bind_port	2018-05-06 22:54:30 +08:00
fatedier	6ef5fb6391	Merge pull request #744 from wujingquan/patch-1 ... Update frps_full.ini	2018-05-06 22:53:59 +08:00
fatedier	1ae43e4d41	plugin: update http_proxy	2018-05-06 22:47:26 +08:00
fatedier	5db605ca02	frps: vhost_http_port and vhost_https_port can be same with frps bind ... port	2018-05-06 20:25:52 +08:00
Touch	e087301425	Update frps_full.ini	2018-05-06 04:08:36 +08:00
fatedier	f45283dbdb	disable yamux default log	2018-05-05 00:09:39 +08:00
fatedier	b0959b3caa	bump version to v0.19.0	2018-05-04 23:14:38 +08:00
fatedier	c5c89a2519	doc: update	2018-05-04 23:12:23 +08:00
fatedier	bebd1db22a	Merge pull request #740 from fatedier/socks5 ... frpc: support connectiong frps by socks5 proxy	2018-05-04 19:15:11 +08:00
fatedier	cd37d22f3b	vendor: udpate golang.org/x/net	2018-05-04 18:37:43 +08:00
fatedier	30af32728a	frpc: support connectiong frps by socks5 proxy	2018-05-04 18:36:38 +08:00
fatedier	60ecd1d58c	cmd: change http_user and http_pwd default value to empty	2018-05-03 10:20:09 +08:00
fatedier	a60be8f562	update Makefile	2018-05-03 00:32:05 +08:00
fatedier	c008b14d0f	Merge pull request #735 from fatedier/dev ... bump version to v0.18.0	2018-05-02 22:37:09 +08:00
fatedier	853892f3cd	change version to v0.18.0	2018-05-02 22:09:15 +08:00
fatedier	e43f9f5850	Merge pull request #734 from fatedier/mux ... use yamux instead of smux	2018-05-02 21:57:18 +08:00
fatedier	d5f30ccd6b	Merge pull request #726 from shuaihanhungry/develop ... do not ignore config parsing error	2018-05-02 21:51:02 +08:00
hanshuai	b87df569e7	do not ignore config parsing error	2018-05-02 20:40:33 +08:00
fatedier	976cf3e9f8	use yamux instead of smux	2018-04-25 02:42:00 +08:00
fatedier	371c401f5b	Merge pull request #720 from fatedier/dev ... bump version to v0.17.0	2018-04-24 01:58:57 +08:00
fatedier	69919e8ef9	Merge pull request #719 from fatedier/doc ... update	2018-04-24 01:55:19 +08:00
fatedier	9abbe33790	typo	2018-04-24 01:51:52 +08:00
fatedier	4a5c00286e	doc: update	2018-04-24 01:28:25 +08:00
fatedier	dfb892c8f6	Merge pull request #718 from fatedier/cmd ... more cmds	2018-04-23 03:07:14 +08:00
fatedier	461c4c18fd	update doc	2018-04-23 03:04:33 +08:00
fatedier	00b9ba95ae	frpc: support specify default dns server, close #700	2018-04-23 02:59:40 +08:00
fatedier	c47aad348d	fix	2018-04-23 02:40:25 +08:00
fatedier	4cb4da3afc	add package github.com/spf13/cobra	2018-04-23 02:35:50 +08:00
fatedier	c1f57da00d	update packages	2018-04-23 02:31:00 +08:00
fatedier	fe187eb8ec	remove package github.com/docopt/docopt-go	2018-04-23 02:15:01 +08:00
fatedier	0f6f674a64	cmd: support more cli command	2018-04-23 02:00:25 +08:00
fatedier	814afbe1f6	Merge pull request #688 from miwee/dashboard_api_client_status ... dashboard_api for getting a client status by name	2018-04-10 17:57:26 +08:00
miwee	3fde9176c9	dashboard_api for getting a client status by name	2018-04-04 12:07:20 +05:30
fatedier	af7cca1a93	Merge pull request #685 from toby1991/dev ... fix https://github.com/fatedier/frp/issues/684	2018-04-04 11:32:48 +08:00
toby1991	7dd28a14aa	fix https://github.com/fatedier/frp/issues/684 ... #684 Cannot build from Dockerfile	2018-04-04 11:06:47 +08:00
fatedier	1325c59a4c	Merge pull request #672 from fatedier/dev ... bump version to v0.16.1	2018-03-21 18:09:39 +08:00
fatedier	82dc1e924f	vhost: typo fix	2018-03-21 18:06:43 +08:00
fatedier	3166bdf3f0	bump version to v0.16.1	2018-03-21 18:00:31 +08:00
fatedier	8af70c8822	update go version to go1.10	2018-03-21 11:52:11 +08:00
fatedier	87763e8251	Merge pull request #670 from fatedier/new ... some fix	2018-03-21 11:45:48 +08:00
fatedier	e9241aeb94	udp proxy: fix #652	2018-03-19 20:22:15 +08:00
fatedier	2eaf134042	Merge pull request #646 from travisghansen/dev ... build freebsd packages	2018-02-27 23:14:15 +08:00
Travis Glenn Hansen	1739e012d6	build freebsd packages	2018-02-26 21:00:55 -07:00
fatedier	9e8980429f	typo	2018-02-07 11:39:30 +08:00
fatedier	1d0865ca49	statsConn: avoid repetition of close function	2018-02-01 11:15:35 +08:00
fatedier	5c9909aeef	typo	2018-01-30 22:07:16 +08:00
fatedier	456ce09061	Merge pull request #630 from fatedier/dev ... bump version to v0.16.0	2018-01-30 00:04:02 +08:00
fatedier	ffc13b704a	update version	2018-01-30 00:00:05 +08:00
fatedier	5d239127bb	Merge pull request #629 from fatedier/new ... new feature	2018-01-29 23:58:55 +08:00
fatedier	9b990adf96	frpc: add proxy status 'wait start'	2018-01-29 23:51:46 +08:00