Mxmilu666/frp
1
1
Fork 1
mirror of https://github.com/fatedier/frp.git synced 2026-07-30 18:22:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
220 Commits 3 Branches 116 Tags
d9304d81665d50ac2b0a7e3c36cdb4b3cbe3ccf9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fatedierandGitHub 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
fatedierandGitHub 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
fatedierandGitHub 3d6578b15f Merge pull request #90 from fatedier/release0.8 
merge some fix
 2016-08-23 10:23:44 +08:00
fatedierandGitHub 899d6837df release v0.8.1 
release v0.8.1
 2016-08-23 10:22:31 +08:00
fatedierandGitHub 0e1752b5ce Merge pull request #88 from fatedier/fatedier/wildcard_domains 
utils/vhost: support wildcard domains
 2016-08-23 01:03:41 +08:00
fatedier da182ecd81 utils/vhost: support wildcard domains 2016-08-23 00:58:51 +08:00
fatedier 94c7f57949 dep: fix a log file deleted bug caused by beego.logs 2016-08-22 01:08:19 +08:00
fatedier c8e5096f48 utils/pcrypto: fix the bug of using aes 
1. The aes IV needs to be unique, but not secure.
2. The key should be 16, 24 or 32 bytes.

Fixes #85.
 2016-08-21 23:28:01 +08:00
fatedier 5079bf01fd doc: update 2016-08-21 00:52:15 +08:00
fatedier 603d7df49a build: add mips64 and mips64le 2016-08-21 00:07:25 +08:00
fatedier 2b1c39e03d cmd/frps: a bug of status display in dashboard, fix #80 2016-08-18 14:52:11 +08:00
fatedier 46ee2f2bc8 utils/conn: typo 2016-08-17 10:07:16 +08:00
fatedier 3d5c3acee0 dockerfile: add dockerfile for alpine 2016-08-16 16:10:04 +08:00
fatedier 41fd4bb673 typo 2016-08-16 15:09:32 +08:00
fatedier e1e18ba9d6 dockerfile: update 2016-08-16 15:06:48 +08:00
fatedier ab9eff97a8 doc: update contributing 2016-08-16 14:09:29 +08:00
fatedier 6f40b1a70a build: use golang 1.7 2016-08-16 14:03:19 +08:00
fatedierandGitHub 87c9b8f548 Merge pull request #78 from moul/add-docker 
Initial Docker support
 2016-08-15 23:37:53 +08:00
fatedier a655f5699b utils/version: change version to 0.9.0 2016-08-15 01:11:37 +08:00
fatedierandGitHub 09624b56ca Merge pull request #76 from fatedier/fatedier/support_http_proxy 
frpc: add support for connecting server through http proxies, see #67
 2016-08-15 01:07:50 +08:00
fatedier e262ac6abd frpc: add support for connecting server through http proxies, see #67 2016-08-15 00:55:22 +08:00
fatedierandGitHub 47c1a3e52c Merge pull request #74 from se77en/master 
Add basic auth to dashboard
 2016-08-14 13:55:13 +08:00
fatedierandGitHub e1ed6660b0 Merge pull request #71 from ericlarssen/updateDocs 
Sentence Spacing in Readme, killed some whitespace.
 2016-08-13 23:17:38 +08:00
fatedierandGitHub a0903d4121 release v0.8.0 
release v0.8.0
 2016-08-12 14:00:54 +08:00
fatedierandGitHub b403e4142b Merge pull request #65 from fatedier/0.8doc 
0.8doc
 2016-08-12 13:58:32 +08:00
fatedier 46716acd8e doc: update 2016-08-12 13:44:25 +08:00
fatedier c7f85bcdd3 doc: new features 2016-08-12 12:50:12 +08:00
fatedier ddd2acfe9f models/msg: fix current connections statistics problem 2016-08-12 10:07:02 +08:00
fatedier e3bf7e2b2b cmd/frps: typo 2016-08-12 00:57:46 +08:00
fatedier 4914472215 assets: update assets 2016-08-12 00:39:39 +08:00
fatedier 5d9300c1e9 utils/conn: support ipv6, fix #62 2016-08-12 00:32:33 +08:00
fatedierandGitHub b4a577b0d7 Merge pull request #64 from fatedier/fatedier/assets_to_binary 
assets: use statik to compile static files into binary files
 2016-08-11 21:58:58 +08:00
fatedier 32d0ce9ea0 assets: use statik to compile static files into binary files 2016-08-11 21:47:26 +08:00
fatedier 2d30a6e8a7 build: remove support for go1.4, add go1.7 2016-08-11 17:03:19 +08:00
fatedier 740691b080 update package beego/logs 2016-08-11 16:32:05 +08:00
fatedier 11fe4b1d8b Godep workspace -> vendor/ 2016-08-11 16:26:21 +08:00
fatedier c64931fce9 package: use net.http instead of gin 2016-08-11 16:20:59 +08:00
fatedier d4ecc2218d all: modify import path, change version to v0.8.0 2016-08-11 16:10:44 +08:00
fatedierandGitHub 9c0ca8675d Merge pull request #63 from fatedier/vashstorm/dashboard_view 
provide a simple dashboard webpage
 2016-08-11 15:37:15 +08:00
fatedier 5cdb84c666 index.html table show today flow_out and flow_in 2016-08-11 15:31:35 +08:00
fatedier 4300169041 assets: optimize static files archetucture 2016-08-10 20:18:36 +08:00
fatedier 1da81ad7d3 models/msg: limit single package length 2016-08-07 13:18:54 +08:00
fatedier 3b06d771ac utils/conn: wsarecv error in windows means connection closed? 2016-08-01 15:24:04 +08:00
fatedier 7f386fc042 utils/pool: use sync.pool to reduce the pressure of garbage collection 2016-07-31 03:26:41 +08:00
fatedierandGitHub df8edefa56 Merge pull request #55 from fatedier/fatedier/privilege_mode_port 
all: privilege_allow_ports can be set in frps for ending abuse of ports
 2016-07-31 02:27:06 +08:00
fatedier ecb6ad4885 all: privilege_allow_ports can be set in frps for ending abuse of ports 2016-07-31 02:17:10 +08:00
fatedier 785dcaad44 Merge branch 'fatedier/connection_pool' into dev 2016-07-29 23:39:48 +08:00
fatedier fd3c97a0e9 Fix conflicts in fatedier/connection_pool with dev 
Conflicts:
	src/frp/cmd/frpc/control.go
	src/frp/cmd/frps/control.go
	src/frp/models/config/config.go
	src/frp/models/server/server.go
 2016-07-29 23:38:34 +08:00
fatedier 8f5f0b0a9a all: new feature connection pool 2016-07-29 23:08:00 +08:00
fatedier 452e02adab add host_header_rewrite in frpc.ini to rewrite your requests with a modified Host header 2016-07-26 00:18:19 +08:00
fatedierandGitHub d2e1cfa5bc Merge pull request #52 from maodanp/http_hostname 
support host rewrite
 2016-07-25 20:52:45 +08:00
fatedierandGitHub 4067591a4d Merge pull request #50 from fatedier/fatedier/fix_package_loss 
frp/models/msg: fix a bug if local service write to socket immediatel…
 2016-07-20 16:37:45 +08:00
fatedier 926d0b74a9 utils/vhost: update TcpConn with bufio.Reader 2016-07-20 16:33:42 +08:00
fatedier 4f49458af0 frp/models/msg: fix a bug if local service write to socket immediately every time accept one user connection, fix #20 2016-07-20 16:04:06 +08:00
fatedier fd6b94908b models/server: add statistics for proxies enabled privilege mode. 2016-07-18 00:30:46 +08:00
fatedier dee4cbd48c models/metric: sort for metric result 2016-07-18 00:18:40 +08:00
fatedierandGitHub 9a3564f29c Merge pull request #49 from fatedier/fatedier/statistics 
all: add /api/proxies api for statistics info
 2016-07-17 21:52:07 +08:00
fatedier ac09ba3982 all: add /api/proxies api for statistics info 2016-07-17 21:42:21 +08:00
fatedier a9bf25f255 build: add go 1.6.2 2016-07-12 01:08:08 +08:00
fatedierandGitHub 6bc05de58e Merge pull request #48 from fatedier/dev 
update README.md
 2016-07-12 00:18:20 +08:00
fatedierandGitHub 5265b79957 Merge branch 'master' into dev 2016-07-11 23:45:36 +08:00
fatedierandGitHub fefc0a38c3 Merge pull request #47 from fatedier/fatedier/update_doc 
update README.md
 2016-07-11 23:44:24 +08:00
fatedier c387138006 doc: update README.md 2016-07-11 23:35:34 +08:00
fatedier 36f8beee3d doc: update README.md 2016-07-11 23:31:35 +08:00
fatedierandGitHub 366a0c898d Merge pull request #46 from fatedier/dev 
merge for new README_zh.md
 2016-07-09 13:13:45 +08:00
fatedierandGitHub d747f9207e Merge pull request #45 from fatedier/fatedier/update_doc 
doc: update README_zh.md
 2016-07-09 13:10:51 +08:00
fatedier 5400366036 doc: update README_zh.md 2016-07-09 13:06:20 +08:00
fatedier 9dae7ad6fe cmd/frps: update 2016-07-08 14:19:26 +08:00
fatedier a4e051d494 cmd/frps: improve the description of login failed 2016-07-08 14:15:26 +08:00
fatedierandGitHub 28251a8104 Merge pull request #41 from fatedier/dev 
release v0.7.0
 2016-07-04 15:11:10 +08:00
fatedier e99357da4e doc: add contributor 2016-07-04 15:08:16 +08:00
fatedier e580c7b6e6 all: release resources when proxy closed using privilege mode 2016-06-28 00:55:30 +08:00
fatedier ba74934a1f all: privilege mode update 2016-06-28 00:21:13 +08:00
fatedierandGitHub 1bad5c6561 Merge pull request #40 from fatedier/fatedier/privilege_mode 
support privilege mode
 2016-06-26 22:43:02 +08:00
fatedier f968f3eace all: add new feature privilege mode 2016-06-26 22:36:07 +08:00
fatedier b14441d5cd utils/vhost: update for vhost_https 2016-06-24 15:43:58 +08:00
fatedierandGitHub 0a50c3bd82 Merge pull request #39 from fatedier/release0.7 
add support for https
 2016-06-24 14:09:50 +08:00
fatedierandGitHub ef5702213f Merge pull request #38 from fatedier/fatedier/fix_vhost_bug 
cmd/frps: fix a bug when vhost_http_port is not set, fix #30
 2016-06-24 14:00:50 +08:00
fatedier c5e4b24f8f all: add use_gzip configure and some improvements, see #28 2016-06-24 13:12:34 +08:00
fatedierandGitHub 51eaec14ab Merge pull request #32 from maodanp/release0.7 
add https proto for reverse proxy
 2016-06-13 22:43:32 +08:00
fatedier 817f4463f4 cmd/frps: fix a bug when vhost_http_port is not set, fix #30 2016-06-12 21:57:55 +08:00
fatedier 654981019d release v0.6.0 
release v0.6.0
 2016-06-07 22:35:56 +08:00
fatedier 740fb05b21 build: remove godep command(can not download packages in golang.org used in latest godep version) 2016-06-07 22:17:37 +08:00
fatedier e8c830e5c8 all: format 2016-06-07 11:15:59 +08:00
fatedier 2640c0b570 utils/conn: fix a socket error in windows 2016-06-06 11:43:41 +08:00
fatedier 04014bb78f doc: update 2016-06-03 18:15:01 +08:00