1364 Commits

This Branch

This Branch

All Branches

• CR: export error string generation to a function
  Guy Lewin · 2020-02-11 16:57:38 +02:00
  98fa3855bd
• Merge branch 'dev' into feature/detailed-errors-to-client

  # Conflicts:
  #	models/config/server_common.go

  Guy Lewin · 2020-02-11 11:25:04 +02:00
  9440bc5d72
• Merge pull request #1643 from GuyLewin/feature/tls-only

  Feature/tls only

  fatedier · 2020-02-11 13:57:03 +08:00
  95753ebf1c
• DetailedErrorsToClient - only send detailed error info if this is on
  Guy Lewin · 2020-02-10 19:29:57 +02:00
  f8c6795119
• Test TlsOnly
  Guy Lewin · 2020-02-10 19:14:07 +02:00
  7033f3e72b
• Update README.md
  Guy Lewin · 2020-02-10 19:01:23 +02:00
  e3101b7aa8
• TlsOnly - only accept TLS connections if enabled
  Guy Lewin · 2020-02-10 18:56:41 +02:00
  c747f160aa
• update .travis.yml
  fatedier · 2020-02-04 22:24:07 +08:00
  c8748a2948
• Merge pull request #1637 from fatedier/dev

  bump version to v0.31.2

  fatedier · 2020-02-04 21:54:28 +08:00
  487c8d7c29
• bump version to v0.31.2
  fatedier · 2020-02-04 21:43:37 +08:00
  69fa7ed16e
• Merge pull request #1636 from fatedier/new

  send closeProxy msg to server then client start proxy error

  fatedier · 2020-02-04 21:39:26 +08:00
  5336155365
• doc typo
  fatedier · 2020-02-04 21:34:46 +08:00
  4feb74cb89
• send closeProxy msg to server then client start proxy error, fix #1606
  fatedier · 2020-02-04 19:41:39 +08:00
  4a4cf552af
• English grammar fix. (#1619)
  Joe Cloud · 2020-01-15 12:11:12 +08:00
  0f59b8f329
• Merge pull request #1596 from fatedier/dev

  v0.31.1, fix bugs

  fatedier · 2020-01-06 15:55:44 +08:00
  f480160e2d
• bump version
  fatedier · 2020-01-06 15:44:18 +08:00
  4832a2a1e9
• fix panic if set meta in proxy config, fix #1595
  fatedier · 2020-01-06 15:43:25 +08:00
  52ecd84d8a
• Merge pull request #1588 from fatedier/dev

  bump version to v0.31.0

  fatedier · 2020-01-03 11:45:22 +08:00
  30c246c488
• improve xtcp, fix #1585
  fatedier · 2020-01-03 11:39:44 +08:00
  42014eea23
• Merge pull request #1587 from fatedier/doc

  add server manage plugin doc

  fatedier · 2020-01-03 11:37:52 +08:00
  c2da396230
• add server manage plugin doc
  fatedier · 2020-01-03 11:35:12 +08:00
  e91c9473be
• Merge pull request #1575 from fatedier/new

  support server plugin feature

  fatedier · 2019-12-31 14:12:30 +08:00
  13e48c6ca0
• bump version
  fatedier · 2019-12-23 20:00:59 +08:00
  31e2cb76bb
• support server plugin feature
  fatedier · 2019-12-23 20:00:04 +08:00
  91e46a2c53
• support meta info for client and proxy
  fatedier · 2019-12-08 21:01:58 +08:00
  a57679f837
• Merge pull request #1542 from fatedier/dev

  bump version to v0.30.0

  fatedier · 2019-11-28 14:21:27 +08:00
  75f3bce04d
• Merge pull request #1537 from fatedier/new

  bump version to v0.30.0

  fatedier · 2019-11-26 10:42:31 +08:00
  df18375308
• update doc for bandwith limit
  fatedier · 2019-11-26 10:23:37 +08:00
  c63737ab3e
• bump version to v0.30.0
  fatedier · 2019-11-26 09:15:24 +08:00
  1cdceee347
• Merge pull request #1529 from kingjcy/20191118

  plugin http2https

  fatedier · 2019-11-22 15:25:01 +08:00
  694c434b9e
• handle close
  kingjcy · 2019-11-22 15:18:20 +08:00
  62af5c8844
• plugin http2https

  plugin http2https

  kingjcy · 2019-11-22 11:12:48 +08:00
  56c53909aa
• Merge pull request #1510 from CallanTaylor/close-file

  Close file

  fatedier · 2019-11-12 14:02:49 +08:00
  21a126e4e4
• Close file
  CallanTaylor · 2019-11-12 11:38:55 +13:00
  8affab1a2b
• update bandwidth_limit
  fatedier · 2019-11-09 01:13:30 +08:00
  12cc53d699
• Merge pull request #1495 from fatedier/new

  support bandwith limit for one proxy

  fatedier · 2019-11-08 21:05:13 +08:00
  2ab832bb89
• update vendor files
  fatedier · 2019-11-03 01:21:47 +08:00
  42425d8218
• support bandwith limit for one proxy
  fatedier · 2019-11-03 01:20:49 +08:00
  6da093a402
• Merge pull request #1494 from fatedier/dev

  bump version to v0.29.1

  fatedier · 2019-11-02 21:14:50 +08:00
  adc3adc13b
• bump version to v0.29.1
  fatedier · 2019-11-02 21:05:37 +08:00
  22a79710d8
• Merge pull request #1465 from lzhfromustc/dev_dup_mis_unlock

  dev:udp: Add an Unlock before a continue, to fix a double lock bug

  fatedier · 2019-10-16 00:51:26 +08:00
  0927553fe4
• Merge pull request #1460 from weisi/dev

  Fix typos in English Readme.

  fatedier · 2019-10-15 13:52:13 +08:00
  858d8f0ba7
• dev:udp: Add an Unlock before a continue, to fix a double lock bug
  lzhfromustc · 2019-10-14 23:35:08 -04:00
  8eb945ee9b
• frp: Fix typos in English Readme.
  Weisi Dai · 2019-10-13 14:46:08 -07:00
  dc0fd60d30
• Merge pull request #1459 from fatedier/new

  change log method

  fatedier · 2019-10-12 20:19:01 +08:00
  cd44c9f55c
• change log method
  fatedier · 2019-10-12 20:13:12 +08:00
  649f47c345
• Merge pull request #1451 from GuyLewin/dev

  Grammer fixes

  fatedier · 2019-10-10 10:54:09 +08:00
  6ca3160b33
• Fix CR
  Guy Lewin · 2019-10-09 13:41:05 -07:00
  5f8ed4fc60
• Grammer fixes
  Guy Lewin · 2019-10-01 15:58:35 -04:00
  bf0993d2a6
• Merge pull request #1420 from Hurricanezwf/fix-bad-xtcp-encryption

  fix #1347:  bad encryption and compression when use xtcp

  fatedier · 2019-09-01 20:49:13 +08:00
  5dc8175fc8