Mxmilu666/frp
1
1
Fork 1
mirror of https://github.com/fatedier/frp.git synced 2026-07-30 07:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
580 Commits 3 Branches 116 Tags
a1ac0026940ca5d6147a758593de69853a0b6913
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fatedier a1ac002694 update golib, fix #959 2018-11-07 21:10:47 +08:00
fatedierandGitHub 3b3f3dc2b5 Merge pull request #947 from HaraldNordgren/master 
Bump Travis versions
 2018-10-29 10:16:58 +08:00
fatedierandGitHub ec0b59732c Merge pull request #955 from muesli/readme-fixes 
Grammar fixes and improved README
 2018-10-25 10:43:02 +08:00
fatedierandGitHub 229740524e Merge pull request #891 from mark86092/bump-docker-to-1-10 
Upgrade dockerfile golang to 1.10
 2018-08-12 22:04:49 +08:00
fatedierandGitHub 66a69f873f Merge pull request #890 from fatedier/dev 
bump version to v0.21.0
 2018-08-12 12:10:16 +08:00
fatedier fb13774457 version to v0.21.0 2018-08-12 12:04:12 +08:00
fatedierandGitHub f14ed87b29 Merge pull request #886 from fatedier/websocket 
Connect protocol support websocket
 2018-08-10 16:36:02 +08:00
fatedier 07623027bc websocket: fix 2018-08-10 16:31:49 +08:00
fatedier 941ac25648 fix ci 2018-08-10 12:02:38 +08:00
fatedier f645082d72 vendor: add package golang.org/x/net/websocket 2018-08-10 11:49:33 +08:00
fatedier 7793f55545 websocket: update muxer for websocket 2018-08-10 11:45:48 +08:00
fatedier ca88b07ecf optimize 2018-08-08 11:18:38 +08:00
fatedierandGitHub 6e305db4be Merge pull request #882 from 235832289/master 
Fix the problem of long connection for more than 30 seconds and disconnection of the server
 2018-08-08 11:03:08 +08:00
fatedierandGitHub 64136a3b3e Merge pull request #875 from jettyu/jettyu-websocket 
websocket protocol
 2018-08-06 15:20:09 +08:00
fatedierandGitHub b6c219aa97 Merge pull request #814 from neohe/dev 
update xtcp log info
 2018-06-08 22:51:12 +08:00
fatedier f5778349d5 config: fix server_name not using user as prefix, fix #804 2018-06-08 14:44:19 +08:00
fatedierandGitHub 71603c6d0b Merge pull request #807 from kac-/allowPorts 
cmd: frps: allow_ports option
 2018-06-08 10:52:05 +08:00
fatedierandGitHub 629f2856b1 Merge pull request #801 from fatedier/dev 
bump version v0.20.0
 2018-06-01 00:15:22 +08:00
fatedier aeb9f2b64d update golib 2018-05-29 02:08:41 +08:00
fatedierandGitHub 85dd41c17b Merge pull request #795 from fatedier/lb 
support lb
 2018-05-26 22:42:03 +08:00
fatedier 102408d37f doc: load balancing 2018-05-26 02:28:13 +08:00
fatedier 495b577819 update group ci 2018-05-23 14:39:12 +08:00
fatedier f56b49ad3b new feature: load balancing for tcp proxy 2018-05-22 23:59:35 +08:00
fatedierandGitHub cb1bf71bef Merge pull request #787 from lonwern/arm64 
build linux_arm64 package
 2018-05-21 21:43:16 +08:00
fatedier b9f062bef2 support lb 2018-05-21 21:22:10 +08:00
fatedier 490019fb51 update vendor, fix #788 2018-05-21 21:09:18 +08:00
fatedier 2e497274ba add ci for setting headers 2018-05-20 23:55:22 +08:00
fatedierandGitHub cf4136fe99 Merge pull request #786 from fatedier/header 
support setting headers in http request
 2018-05-20 23:44:19 +08:00
fatedier b1e9cff622 doc: about headers 2018-05-20 23:41:15 +08:00
fatedier db2d1fce76 http: support setting headers 2018-05-20 23:22:07 +08:00
fatedierandGitHub 0c35273759 Merge pull request #783 from fatedier/stcp 
frps dashboard add stcp
 2018-05-20 19:09:43 +08:00
fatedier 6eb8146334 frps dashboard add stcp 2018-05-20 19:06:05 +08:00
fatedierandGitHub da78e3f52e Merge pull request #781 from fatedier/dev 
bump version to 0.19.1
 2018-05-19 23:10:17 +08:00
fatedier e1918f6396 frps add '-t' to set token 2018-05-18 10:58:08 +08:00
fatedier ad1e32fd2d fix panic error when vhost_http_port is not set but there is a http 
proxy, fix #776
 2018-05-18 00:21:11 +08:00
fatedier 3726f99b04 fix ci 2018-05-17 00:44:53 +08:00
fatedier c8a7405992 version to 0.19.1 2018-05-17 00:17:22 +08:00
fatedierandGitHub 040d198e36 Merge pull request #773 from fatedier/nat 
return error quickly if nathole make error
 2018-05-17 00:10:53 +08:00
fatedier 1a6cbbb2d2 return error quickly if nathole make error 2018-05-17 00:07:56 +08:00
fatedierandGitHub ea79e03bd0 Merge pull request #772 from fatedier/web 
update dashboard ui
 2018-05-16 23:56:12 +08:00
fatedier 3e349455a0 commands for xtcp, stcp add 'bind_port', fix #767 2018-05-16 23:45:44 +08:00
fatedier c7a457a045 update web assets 2018-05-16 03:34:43 +08:00
fatedier 0b0d5c982e update web 2018-05-16 02:51:02 +08:00
fatedier c4f873c07a update web package 2018-05-14 16:17:13 +08:00
fatedier 01b1df2b91 update cmd help info 2018-05-14 15:01:16 +08:00
fatedierandGitHub f1bea49314 Merge pull request #766 from fatedier/dev 
bump version to 0.19.0
 2018-05-14 11:08:46 +08:00
fatedier 2ffae3489b dashboard: more params 2018-05-11 17:25:01 +08:00
fatedier 96b94d9164 dashbaord_api: more info 2018-05-11 17:14:16 +08:00
fatedier 76b04f52d1 udpate doc 2018-05-11 16:54:36 +08:00
fatedierandGitHub 97db0d187a Merge pull request #760 from fatedier/vendor 
move some packages to golib (https://github.com/fatedier/golib)
 2018-05-11 16:47:03 +08:00
fatedier d9aadab4cb vendor: add golib/msg 2018-05-11 16:42:08 +08:00
fatedier a0fe2fc2c2 vendor: models/msg 2018-05-11 16:37:44 +08:00
fatedier 1464836f05 logs panic debug strace info 2018-05-11 12:05:37 +08:00
fatedier b2a2037032 change accept connection error loglevel to debug 2018-05-11 10:35:16 +08:00
fatedier 071cbf4b15 vendor: update 2018-05-09 01:05:14 +08:00
fatedier 20fcb58437 vendor: add package golib/net 2018-05-09 00:23:42 +08:00
fatedier a27e3dda88 vendor: update shutdown 2018-05-08 23:51:13 +08:00
fatedier 1dd7317c06 vendor: add package io 2018-05-08 23:42:04 +08:00
fatedierandGitHub 58a54bd0fb Merge pull request #755 from king6cong/master 
typo fix
 2018-05-08 17:12:02 +08:00
fatedier dd8f788ca4 use dep instead of glide 2018-05-08 02:40:11 +08:00
fatedier 8a6d6c534a vendor: udpate 2018-05-08 02:13:30 +08:00
fatedierandGitHub 39089cf262 Merge pull request #750 from fatedier/doc 
doc: update
 2018-05-07 16:48:52 +08:00
fatedier 55800dc29f doc: update 2018-05-07 16:46:04 +08:00
fatedier 04560c1896 web: translate web interface completely to English, fix #680 2018-05-06 23:39:33 +08:00
fatedierandGitHub 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
fatedierandGitHub 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
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
fatedierandGitHub 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
fatedierandGitHub 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
fatedierandGitHub e43f9f5850 Merge pull request #734 from fatedier/mux 
use yamux instead of smux
 2018-05-02 21:57:18 +08:00
fatedierandGitHub d5f30ccd6b Merge pull request #726 from shuaihanhungry/develop 
do not ignore config parsing error
 2018-05-02 21:51:02 +08:00
fatedier 976cf3e9f8 use yamux instead of smux 2018-04-25 02:42:00 +08:00
fatedierandGitHub 371c401f5b Merge pull request #720 from fatedier/dev 
bump version to v0.17.0
 2018-04-24 01:58:57 +08:00
fatedierandGitHub 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
fatedierandGitHub 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
fatedierandGitHub 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
fatedierandGitHub af7cca1a93 Merge pull request #685 from toby1991/dev 
fix https://github.com/fatedier/frp/issues/684
 2018-04-04 11:32:48 +08:00
fatedierandGitHub 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
fatedierandGitHub 87763e8251 Merge pull request #670 from fatedier/new 
some fix
 2018-03-21 11:45:48 +08:00