Commit Graph

  • 83d80857fd
    Merge pull request #1644 from GuyLewin/feature/detailed-errors-to-client fatedier 2020-02-12 10:39:03 +0800
  • 98fa3855bd CR: export error string generation to a function Guy Lewin 2020-02-11 16:57:38 +0200
  • 9440bc5d72 Merge branch 'dev' into feature/detailed-errors-to-client Guy Lewin 2020-02-11 11:25:04 +0200
  • 95753ebf1c
    Merge pull request #1643 from GuyLewin/feature/tls-only fatedier 2020-02-11 13:57:03 +0800
  • f8c6795119 DetailedErrorsToClient - only send detailed error info if this is on Guy Lewin 2020-02-10 19:29:57 +0200
  • 7033f3e72b Test TlsOnly Guy Lewin 2020-02-10 19:14:07 +0200
  • e3101b7aa8 Update README.md Guy Lewin 2020-02-10 19:01:23 +0200
  • c747f160aa TlsOnly - only accept TLS connections if enabled Guy Lewin 2020-02-10 18:56:41 +0200
  • c8748a2948 update .travis.yml fatedier 2020-02-04 22:24:07 +0800
  • 487c8d7c29
    Merge pull request #1637 from fatedier/dev v0.31.2 fatedier 2020-02-04 21:54:28 +0800
  • 69fa7ed16e bump version to v0.31.2 fatedier 2020-02-04 21:43:37 +0800
  • 5336155365
    Merge pull request #1636 from fatedier/new fatedier 2020-02-04 21:39:26 +0800
  • 4feb74cb89 doc typo fatedier 2020-02-04 21:34:46 +0800
  • 4a4cf552af send closeProxy msg to server then client start proxy error, fix #1606 fatedier 2020-02-04 19:41:39 +0800
  • 0f59b8f329 English grammar fix. (#1619) Joe Cloud 2020-01-14 22:11:12 -0600
  • 2a753c36f4
    English grammar fix. Joe Cloud 2020-01-14 21:04:02 -0600
  • 717b640b72
    Merge pull request #2 from fatedier/dev Joe Cloud 2020-01-14 20:58:06 -0600
  • 3c19d73f8f Update travis Raoul1996 2020-01-09 12:24:35 +0800
  • 4527cafc42 re generate assets Raoul1996 2020-01-09 11:39:12 +0800
  • 70e7ce442d Update Makefile: support go mod vendor Raoul1996 2020-01-09 11:39:58 +0800
  • f71ecd53dc Update go vendor Raoul1996 2020-01-09 12:08:52 +0800
  • c52ae5a939 Upgrade vue cli version in frp web dashboard Raoul1996 2020-01-09 11:38:41 +0800
  • 39aea5ddb0
    Create go.yml gibran160 2020-01-07 03:26:58 +0700
  • f480160e2d
    Merge pull request #1596 from fatedier/dev v0.31.1 fatedier 2020-01-06 15:55:44 +0800
  • 4832a2a1e9 bump version fatedier 2020-01-06 15:44:18 +0800
  • 52ecd84d8a fix panic if set meta in proxy config, fix #1595 fatedier 2020-01-06 15:43:25 +0800
  • 8d83a91574
    Merge pull request #1 from fatedier/master keal2067297213 2020-01-04 17:35:37 +0800
  • 2477dc08ec implement API /metrics (#1357) zhangyifa 2020-01-03 15:52:41 +0800
  • 30c246c488
    Merge pull request #1588 from fatedier/dev v0.31.0 fatedier 2020-01-03 11:45:22 +0800
  • 42014eea23 improve xtcp, fix #1585 fatedier 2020-01-03 11:39:44 +0800
  • c2da396230
    Merge pull request #1587 from fatedier/doc fatedier 2020-01-03 11:37:52 +0800
  • e91c9473be add server manage plugin doc fatedier 2020-01-03 11:35:12 +0800
  • 13e48c6ca0
    Merge pull request #1575 from fatedier/new fatedier 2019-12-31 14:12:30 +0800
  • 31e2cb76bb bump version fatedier 2019-12-23 20:00:59 +0800
  • 91e46a2c53 support server plugin feature fatedier 2019-12-20 20:28:28 +0800
  • 2c1eaf2faf Merge branch 'frp/master' haidy 2019-12-18 22:01:34 +0800
  • a57679f837 support meta info for client and proxy fatedier 2019-12-08 21:01:58 +0800
  • 306009178a prometheus monitor kingjcy 2019-12-08 20:16:03 +0800
  • e9b85f586b test2 handshake fail Your Name 2019-08-14 16:41:53 +0800
  • 9c1b9a5a74 test stl0755 2019-08-14 15:02:53 +0800
  • c26c9432b1 protocol = wss stl0755 2019-08-14 10:58:39 +0800
  • 75f3bce04d
    Merge pull request #1542 from fatedier/dev v0.30.0 fatedier 2019-11-28 14:21:27 +0800
  • 4fa62b57ac
    Update version.go laijinman 2019-11-26 13:29:57 +0800
  • df18375308
    Merge pull request #1537 from fatedier/new fatedier 2019-11-26 10:42:31 +0800
  • c63737ab3e update doc for bandwith limit fatedier 2019-11-26 10:23:37 +0800
  • 1cdceee347 bump version to v0.30.0 fatedier 2019-11-26 09:15:24 +0800
  • 694c434b9e
    Merge pull request #1529 from kingjcy/20191118 fatedier 2019-11-22 15:25:01 +0800
  • 62af5c8844 handle close kingjcy 2019-11-22 15:18:20 +0800
  • 56c53909aa plugin http2https kingjcy 2019-11-20 20:56:55 +0800
  • 6459c45b5c Update systemd unit files iBug 2019-11-17 14:18:23 +0800
  • 21a126e4e4
    Merge pull request #1510 from CallanTaylor/close-file fatedier 2019-11-12 14:02:49 +0800
  • 8affab1a2b Close file CallanTaylor 2019-11-12 11:38:55 +1300
  • 12cc53d699 update bandwidth_limit fatedier 2019-11-09 01:13:30 +0800
  • 2ab832bb89
    Merge pull request #1495 from fatedier/new fatedier 2019-11-08 21:05:13 +0800
  • 1865bb07a1 Close unclosed file CallanTaylor 2019-11-04 14:43:34 +1300
  • 42425d8218 update vendor files fatedier 2019-11-03 01:21:47 +0800
  • 6da093a402 support bandwith limit for one proxy fatedier 2019-11-03 01:20:49 +0800
  • adc3adc13b
    Merge pull request #1494 from fatedier/dev v0.29.1 fatedier 2019-11-02 21:14:50 +0800
  • 22a79710d8 bump version to v0.29.1 fatedier 2019-11-02 21:05:37 +0800
  • 4538c5cdd4
    Update README.md to fix typo Jonathan Hult 2019-10-24 12:41:05 -0400
  • 0927553fe4
    Merge pull request #1465 from lzhfromustc/dev_dup_mis_unlock fatedier 2019-10-16 00:51:26 +0800
  • 858d8f0ba7
    Merge pull request #1460 from weisi/dev fatedier 2019-10-15 13:52:13 +0800
  • 8eb945ee9b dev:udp: Add an Unlock before a continue, to fix a double lock bug lzhfromustc 2019-10-14 23:35:08 -0400
  • 63ac850601 Merge branch 'dev' of github.com:lzhfromustc/frp into udp_mis_unlock lzhfromustc 2019-10-14 23:19:45 -0400
  • e48fe27cad udp: Add an Unlock before a continue, to fix a double lock bug lzhfromustc 2019-10-14 20:54:18 -0400
  • b5db1840e9 udp: Add an Unlock before a continue, to fix a double lock bug lzhfromustc 2019-10-14 20:54:18 -0400
  • dc0fd60d30 frp: Fix typos in English Readme. Weisi Dai 2019-10-13 14:46:08 -0700
  • cd44c9f55c
    Merge pull request #1459 from fatedier/new fatedier 2019-10-12 20:19:01 +0800
  • 649f47c345 change log method fatedier 2019-10-12 20:13:12 +0800
  • 8bd2e67a9c add process open files limit number,If not,when frp too much connection,report an error:“accept4: too many open files”,then crash. 倾城 2019-10-11 14:31:54 +0800
  • 6ca3160b33
    Merge pull request #1451 from GuyLewin/dev fatedier 2019-10-10 10:54:09 +0800
  • 5f8ed4fc60 Fix CR Guy Lewin 2019-10-09 13:41:05 -0700
  • 4bd1448490 fixed Two-Way-SSL error laijinman 2019-10-07 15:09:22 +0800
  • 6e819501d9 frp 0.29.0 haidy 2019-10-06 13:27:45 +0800
  • 59aa7cd710 Merge branch 'frp/master' haidy 2019-10-03 14:19:23 +0800
  • 64427f8e38 cmd haidy 2019-10-03 14:09:46 +0800
  • bf0993d2a6 Grammer fixes Guy Lewin 2019-10-01 15:58:35 -0400
  • f60fbde9ee Fix speed limit kasuganosoras 2019-09-09 12:57:40 +0800
  • fb65a33047 test kasuganosoras 2019-09-08 20:49:26 +0800
  • 6a34c73071
    Update api.go Akkariin Meiko 2019-09-08 18:32:21 +0800
  • 3df9338222
    Update control.go Akkariin Meiko 2019-09-08 18:08:36 +0800
  • 23d36090a0
    Merge pull request #2 from ma6254/master Akkariin Meiko 2019-09-07 01:06:23 +0800
  • f49348f34c add: proxy limit 马嘉聪 2019-09-07 00:24:20 +0800
  • 8701fa4375 update dashboard url fatih 2019-09-04 17:29:15 +0800
  • 149ea92e8b add dashboard url fatih 2019-09-04 11:57:53 +0800
  • 5dc8175fc8
    Merge pull request #1420 from Hurricanezwf/fix-bad-xtcp-encryption fatedier 2019-09-01 20:49:13 +0800
  • dc6a5a29c1 fix bad encryption and compression when use xtcp zhouwenfeng 2019-08-31 21:24:20 +0800
  • 6add3e3b9d fix: encryption and compression didn't work in xtcp zhouwenfeng 2019-08-31 13:30:39 +0800
  • 24f0d78f7b
    update readme Recolic Keghart 2019-08-30 20:50:18 +0800
  • e62d9a5242
    Merge pull request #1415 from fatedier/dev v0.29.0 fatedier 2019-08-29 21:22:30 +0800
  • 94212ac8b8
    Merge pull request #1414 from fatedier/new fatedier 2019-08-29 21:17:30 +0800
  • e9e86fccf0 let max_pool_count valid fatedier 2019-08-29 21:13:21 +0800
  • 58745992ef typo fatedier 2019-08-27 11:17:43 +0800
  • 234d634bfe
    Merge pull request #1411 from fatedier/new fatedier 2019-08-26 15:30:26 +0800
  • fdc6902a90 proxy protocol: fix detect method for IPV4 and IPV6 fatedier 2019-08-26 11:13:33 +0800
  • d8d587fd93
    Merge pull request #1408 from velovix/issue-1387_api-documentation fatedier 2019-08-25 21:15:32 +0800
  • 92791260a7 Add documentation for base proxy config Tyler Compton 2019-08-24 15:25:52 -0700
  • 4dfd851c46 Add docs for common config fields & sessions Tyler Compton 2019-08-24 15:20:34 -0700
  • bc4df74b5e
    Merge pull request #1401 from velovix/issue-1387_client-conf-as-argument fatedier 2019-08-22 00:14:56 +0800
  • 24b71f987c Add api feature Akkariin 2019-08-21 15:37:33 +0800