github
/
frp
mirror of https://github.com/fatedier/frp
1
0
Fork 0
Code Issues Releases Wiki Activity
1,055 Commits
3 Branches
102 Tags
80 MiB
Commit Graph

1055 Commits (8c6303c1e57408cac22c6e7f192f35b68af565d7)

Author SHA1 Message Date
Guy Lewin 98fa3855bd CR: export error string generation to a function 2020-02-11 16:57:38 +02:00
Guy Lewin 9440bc5d72 Merge branch 'dev' into feature/detailed-errors-to-client 
# Conflicts:
#	models/config/server_common.go
 2020-02-11 11:25:04 +02:00
fatedier 95753ebf1c
Merge pull request #1643 from GuyLewin/feature/tls-only 
Feature/tls only
 2020-02-11 13:57:03 +08:00
Guy Lewin f8c6795119 DetailedErrorsToClient - only send detailed error info if this is on 2020-02-10 19:29:57 +02:00
Guy Lewin 7033f3e72b Test TlsOnly 2020-02-10 19:14:07 +02:00
Guy Lewin e3101b7aa8 Update README.md 2020-02-10 19:01:23 +02:00
Guy Lewin c747f160aa TlsOnly - only accept TLS connections if enabled 2020-02-10 18:56:41 +02:00
fatedier c8748a2948 update .travis.yml 2020-02-04 22:24:07 +08:00
fatedier 69fa7ed16e bump version to v0.31.2 2020-02-04 21:43:37 +08:00
fatedier 5336155365
Merge pull request #1636 from fatedier/new 
send closeProxy msg to server then client start proxy error
 2020-02-04 21:39:26 +08:00
fatedier 4feb74cb89 doc typo 2020-02-04 21:34:46 +08:00
fatedier 4a4cf552af send closeProxy msg to server then client start proxy error, fix #1606 2020-02-04 19:41:39 +08:00
Joe Cloud 0f59b8f329 English grammar fix. (#1619) 2020-01-15 12:11:12 +08:00
fatedier 4832a2a1e9 bump version 2020-01-06 15:44:18 +08:00
fatedier 52ecd84d8a fix panic if set meta in proxy config, fix #1595 2020-01-06 15:43:25 +08:00
fatedier 42014eea23 improve xtcp, fix #1585 2020-01-03 11:39:44 +08:00
fatedier c2da396230
Merge pull request #1587 from fatedier/doc 
add server manage plugin doc
 2020-01-03 11:37:52 +08:00
fatedier e91c9473be add server manage plugin doc 2020-01-03 11:35:12 +08:00
fatedier 13e48c6ca0
Merge pull request #1575 from fatedier/new 
support server plugin feature
 2019-12-31 14:12:30 +08:00
fatedier 31e2cb76bb bump version 2019-12-23 20:00:59 +08:00
fatedier 91e46a2c53 support server plugin feature 2019-12-23 20:00:04 +08:00
fatedier a57679f837 support meta info for client and proxy 2019-12-08 21:01:58 +08:00
fatedier df18375308
Merge pull request #1537 from fatedier/new 
bump version to v0.30.0
 2019-11-26 10:42:31 +08:00
fatedier c63737ab3e update doc for bandwith limit 2019-11-26 10:23:37 +08:00
fatedier 1cdceee347 bump version to v0.30.0 2019-11-26 09:15:24 +08:00
fatedier 694c434b9e
Merge pull request #1529 from kingjcy/20191118 
plugin http2https
 2019-11-22 15:25:01 +08:00
kingjcy 62af5c8844 handle close 2019-11-22 15:18:20 +08:00
kingjcy 56c53909aa plugin http2https 
plugin http2https
 2019-11-22 11:12:48 +08:00
fatedier 21a126e4e4
Merge pull request #1510 from CallanTaylor/close-file 
Close file
 2019-11-12 14:02:49 +08:00
CallanTaylor 8affab1a2b Close file 2019-11-12 11:38:55 +13:00
fatedier 12cc53d699 update bandwidth_limit 2019-11-09 01:13:30 +08:00
fatedier 2ab832bb89
Merge pull request #1495 from fatedier/new 
support bandwith limit for one proxy
 2019-11-08 21:05:13 +08:00
fatedier 42425d8218 update vendor files 2019-11-03 01:21:47 +08:00
fatedier 6da093a402 support bandwith limit for one proxy 2019-11-03 01:20:49 +08:00
fatedier 22a79710d8 bump version to v0.29.1 2019-11-02 21:05:37 +08:00
fatedier 0927553fe4
Merge pull request #1465 from lzhfromustc/dev_dup_mis_unlock 
dev:udp: Add an Unlock before a continue, to fix a double lock bug
 2019-10-16 00:51:26 +08:00
fatedier 858d8f0ba7
Merge pull request #1460 from weisi/dev 
Fix typos in English Readme.
 2019-10-15 13:52:13 +08:00
lzhfromustc 8eb945ee9b dev:udp: Add an Unlock before a continue, to fix a double lock bug 2019-10-14 23:35:08 -04:00
Weisi Dai dc0fd60d30 frp: Fix typos in English Readme. 2019-10-13 14:46:08 -07:00
fatedier cd44c9f55c
Merge pull request #1459 from fatedier/new 
change log method
 2019-10-12 20:19:01 +08:00
fatedier 649f47c345 change log method 2019-10-12 20:13:12 +08:00
fatedier 6ca3160b33
Merge pull request #1451 from GuyLewin/dev 
Grammer fixes
 2019-10-10 10:54:09 +08:00
Guy Lewin 5f8ed4fc60 Fix CR 2019-10-09 13:41:05 -07:00
Guy Lewin bf0993d2a6 Grammer fixes 2019-10-01 15:58:35 -04:00
fatedier 5dc8175fc8
Merge pull request #1420 from Hurricanezwf/fix-bad-xtcp-encryption 
fix #1347:  bad encryption and compression when use xtcp
 2019-09-01 20:49:13 +08:00
zhouwenfeng dc6a5a29c1 fix bad encryption and compression when use xtcp 2019-08-31 21:24:20 +08:00
fatedier 94212ac8b8
Merge pull request #1414 from fatedier/new 
let max_pool_count valid
 2019-08-29 21:17:30 +08:00
fatedier e9e86fccf0 let max_pool_count valid 2019-08-29 21:13:21 +08:00
fatedier 58745992ef typo 2019-08-27 14:10:53 +08:00
fatedier 234d634bfe
Merge pull request #1411 from fatedier/new 
proxy protocol: fix detect method for IPV4 and IPV6, fix #1410
 2019-08-26 15:30:26 +08:00