Commit Graph
100 Commits
Author SHA1 Message Date
fatedier 6c13b6d37a net: fix HTTP_PROXY include escape characters error, fix #275 2017-05-23 02:10:36 +08:00
fatedierandGitHub 1c04de380d Merge pull request #328 from fatedier/plugin
new feature plugin and unix domian socket plugin
2017-05-22 01:12:14 -05:00
fatedier 738e5dad22 new feature plugin and unix domian socket plugin 2017-05-22 00:15:18 +08:00
fatedier faf584e1dd metric: fix statistics error 2017-05-19 18:38:31 +08:00
fatedier ba6afd5789 doc: update 2017-05-19 02:59:51 +08:00
fatedierandGitHub b8082e6e08 Merge pull request #321 from fatedier/doc
doc: update
2017-05-18 13:31:46 -05:00
fatedier 7957572ced update 2017-05-19 02:20:10 +08:00
fatedierandGitHub c2ff37d0d8 Merge pull request #320 from yuyulei/dev
change allow ports from map to array
2017-05-18 13:05:33 -05:00
fatedier c67f9d5e76 doc: update 2017-05-19 01:54:57 +08:00
fatedier 3fe50df200 doc: update 2017-05-18 01:59:46 +08:00
fatedier 93d86ca635 vendor: add github.com/xtaci/smux 2017-05-17 22:48:41 +08:00
fatedier b600a07ec0 support tcp stream multiplexing by smux 2017-05-17 17:47:20 +08:00
fatedier a5f06489cb update 2017-05-17 16:02:31 +08:00
fatedier 2883d70ea9 dashboard: don't check authentication if user and password is empty 2017-05-15 21:30:13 +08:00
fatedier 3f17837a2c web: support http basic auth in dashboard 2017-05-15 21:18:06 +08:00
fatedierandGitHub fd268b5082 Merge pull request #316 from fatedier/refactoring
Refactoring
2017-05-14 11:15:52 -05:00
fatedier 69b09eb8a2 udp: add heartbeat in udp work connection 2017-05-15 00:08:21 +08:00
fatedier a84dd05351 add connection read timeout 2017-05-10 00:46:42 +08:00
fatedier 71f7caa1ee add more log info 2017-04-25 00:34:14 +08:00
fatedier 5360febd72 update log module 2017-04-21 16:44:51 +08:00
fatedier 1b70f0c4fd update log module 2017-04-21 00:02:21 +08:00
fatedier 5c75efa222 update dashboard fetch api 2017-03-28 01:08:04 +08:00
fatedier ab4a53965b test: more case 2017-03-28 00:27:30 +08:00
fatedier a0c83bdb78 test: add test case 2017-03-27 23:46:38 +08:00
fatedier 30aeaf968e fix heartbeat error 2017-03-27 17:25:25 +08:00
fatedier 58d0d41501 fix 2017-03-27 03:53:21 +08:00
fatedier 6a95a63fd4 metric: update date_counter 2017-03-27 03:39:32 +08:00
fatedier aa185eb9f3 update static files for dashboard 2017-03-27 02:21:37 +08:00
fatedier d8683a0079 new frps dashboard 2017-03-27 02:15:31 +08:00
fatedier 8b2cde3a30 update for metric 2017-03-27 01:39:05 +08:00
fatedier 634e048d0c dep: add httprouter 2017-03-23 02:06:04 +08:00
fatedier a4fece3f51 api: add server web api for statistics 2017-03-23 02:01:25 +08:00
fatedier 9e683fe446 update basic auth method 2017-03-21 21:36:48 +08:00
fatedier 54bbfe26b0 support udp 2017-03-13 02:44:47 +08:00
fatedier a1023fdfc2 add more log 2017-03-12 03:22:35 +08:00
fatedier b02e1007fb support more proxy type 2017-03-12 01:08:33 +08:00
fatedier f90028cf96 Use encryption in frp protocol. 2017-03-10 01:44:50 +08:00
fatedier f83a2a73ab test: update 2017-03-10 00:52:32 +08:00
fatedier 307b74cc13 build: add go1.8 and remove go1.5 2017-03-09 22:55:30 +08:00
fatedier f00a28598f github: add issue template 2017-03-09 22:53:32 +08:00
fatedier 6ee0b25782 update 2017-03-09 22:45:44 +08:00
fatedier 88083d21e8 start refactoring 2017-03-09 22:44:42 +08:00
fatedier a22440aade start refactoring 2017-03-09 22:28:31 +08:00
fatedierandGitHub b006540141 Merge pull request #266 from fsyxhua/master
Disable the "CGO" mode ,fix the "./frpc not found" problem,fix #262
2017-02-24 02:59:49 -06:00
fatedierandGitHub e655f07674 Merge branch 'dev' into master 2017-02-24 02:57:47 -06:00
fatedier 1325148cd3 build: support 32 bit of mips, remove darwin 32 2017-01-17 23:53:17 +08:00
fatedierandGitHub 3f9749488a Merge pull request #238 from fatedier/dev
bump version to 0.9.3
2017-01-17 09:18:45 -06:00
fatedier f9a0d891a1 pool: fix panic caused by sending to closed channel, fix #237 2017-01-17 23:12:52 +08:00
fatedier 92daa45b68 change version to 0.9.3 2017-01-14 00:48:56 +08:00
fatedierandGitHub 5f20a22b0d Merge pull request #231 from LitleCarl/dev
Fix Bug for issure, fix #227
2017-01-12 23:38:05 -06:00
fatedier 694ee44af6 subdomain: subdomain can be configured in frps.ini, fix #220 2017-01-13 02:23:04 +08:00
fatedierandGitHub edb97abf50 Merge pull request #217 from fatedier/dev
bump version to 0.9.2
2017-01-08 09:22:28 -06:00
fatedier 0c10279deb doc: add new contributor 2017-01-08 23:18:25 +08:00
fatedier 1f49510e3e udp proxy: fix reconnect error, fix #209 2017-01-05 23:09:17 +08:00
fatedierandGitHub 1868b3bafb Merge pull request #215 from bingtianbaihua/dev
modified readme.md
2017-01-05 07:39:15 -06: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
fatedierandGitHub a8969b1901 Merge pull request #207 from bingtianbaihua/master
added heartbeat conf
2016-12-30 04:01:02 -06: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 a5434e31b7 doc: update 2016-12-28 00:40:45 +08:00
fatedierandGitHub 044bb692dc Merge pull request #201 from fatedier/dev
bump version to 0.9.1
2016-12-27 10:35:14 -06:00
fatedierandGitHub 34b98dde52 Merge pull request #200 from fatedier/doc
doc: support url routing
2016-12-27 10:32:06 -06:00
fatedier 020f786bf5 doc: support url routing 2016-12-28 00:26:50 +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 8bf61d5e39 doc: add qq group 2016-12-26 12:18:46 +08:00
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
fatedierandGitHub 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
fatedierandGitHub 59a34b81e0 Merge pull request #182 from xuebing1110/dev
[dev] http router by host and url
2016-12-24 09:08:20 -06:00
fatedierandGitHub 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
fatedierandGitHub dde734c953 Merge pull request #188 from fatedier/dev
bump version to 0.9.0
2016-12-21 00:11:10 -06:00
fatedierandGitHub 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
fatedierandGitHub 0573ddcd84 Merge pull request #186 from vashstorm/bugfix
add auth for reload api
2016-12-20 05:20:54 -06:00
fatedier 52fe721202 frps: fix a panic bug caused by reading map 2016-12-20 01:30:10 +08:00
fatedierandGitHub 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
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
fatedierandGitHub 47db75e921 Merge pull request #152 from fatedier/maodanp/subdomain
Maodanp/subdomain
2016-11-09 00:14:33 +08:00
fatedierandGitHub 4c69a4810e Merge pull request #112 from moul/patch-1
Grammar fix
2016-09-13 09:43:50 +08:00
fatedier adcb2c1ea5 typo 2016-09-06 17:56:09 +08:00
fatedierandGitHub 8c497793c5 Merge pull request #101 from fatedier/maodanp/http_auth
Maodanp/http auth
2016-09-05 22:25:01 -05: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