Commit Graph

Select branches

Hide Pull Requests

dev

master

new

#1

#10

#10

#1000

#1006

#1007

#1008

#101

#1014

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1048

#1049

#1050

#1051

#1060

#1061

#1067

#1068

#1069

#1080

#1081

#1082

#1083

#1084

#1085

#1086

#1087

#1088

#1089

#11

#1107

#1112

#112

#1121

#1122

#1127

#1128

#1137

#1138

#1140

#1147

#1156

#1157

#1160

#1166

#1169

#1190

#1191

#12

#1206

#1209

#1215

#1216

#1242

#1269

#1271

#1273

#1274

#1275

#1281

#1291

#13

#1300

#1316

#1317

#1320

#1322

#1323

#1331

#1344

#1349

#1358

#1364

#1368

#1369

#1373

#1379

#1382

#1384

#1385

#1390

#1391

#1395

#1396

#1397

#1398

#1399

#1401

#1402

#1408

#1411

#1414

#1415

#1417

#1419

#1420

#1427

#1451

#1458

#1459

#1460

#1464

#1465

#1467

#1481

#1494

#1495

#1496

#15

#1503

#1510

#1519

#152

#1529

#1537

#1538

#1542

#1556

#1575

#1577

#1587

#1588

#1589

#1596

#1597

#16

#1603

#1604

#1605

#1617

#1618

#1619

#1636

#1637

#1638

#1643

#1644

#1661

#1663

#1664

#1666

#1668

#1679

#1690

#1695

#1696

#1697

#17

#1700

#1702

#1707

#1710

#1711

#1714

#1722

#1728

#1730

#1740

#1743

#1750

#1757

#1762

#1765

#1768

#1780

#1787

#1794

#1798

#1799

#1803

#1805

#1806

#1807

#181

#181

#1811

#182

#1820

#1821

#1822

#1826

#183

#1830

#1835

#184

#1845

#185

#185

#1850

#1851

#1852

#1855

#186

#187

#188

#1888

#1904

#1914

#1918

#1919

#192

#1946

#1956

#1961

#1962

#1971

#1973

#1974

#1990

#1993

#1998

#2

#200

#2001

#2002

#2004

#2005

#2008

#201

#2013

#2014

#2018

#2023

#2051

#2057

#2058

#2060

#2061

#207

#2073

#2078

#2087

#2088

#2089

#2096

#2098

#2100

#2101

#2103

#2113

#2129

#2136

#2148

#215

#2163

#2165

#2167

#217

#2178

#2182

#2184

#2198

#2199

#22

#22

#2201

#2205

#2206

#2215

#2216

#2218

#2220

#2221

#2222

#2237

#2240

#2249

#2251

#2253

#2255

#2256

#2265

#2273

#2278

#2279

#228

#228

#2288

#2289

#229

#229

#2295

#230

#230

#2301

#2302

#2303

#2304

#2308

#231

#2310

#2314

#2316

#2323

#2324

#2334

#2347

#2350

#2362

#2363

#2376

#2376

#238

#2383

#2385

#2389

#24

#2400

#2401

#2416

#2421

#2424

#2425

#2426

#2429

#2438

#2442

#2442

#2444

#2447

#2448

#2450

#2452

#2457

#2458

#2467

#2472

#2473

#2475

#2483

#25

#2502

#2504

#2505

#2507

#2508

#2511

#2520

#2532

#2541

#2558

#2563

#2592

#2601

#2609

#2609

#2614

#2616

#2617

#2618

#2621

#2630

#2638

#2648

#265

#2656

#266

#2672

#2676

#2677

#269

#269

#2695

#27

#2704

#2719

#2720

#2729

#2731

#2743

#2751

#2758

#2767

#2774

#2782

#2783

#2784

#2785

#2791

#2792

#2802

#2805

#2814

#2816

#2823

#2832

#2833

#2834

#2836

#2844

#2846

#2849

#2853

#2856

#2858

#2863

#2864

#2867

#2868

#2869

#2873

#2878

#2878

#2882

#2886

#2891

#2892

#2894

#29

#2901

#2903

#2906

#2913

#2916

#2925

#2932

#2954

#2955

#2958

#2966

#2968

#2978

#2980

#2982

#299

#299

#2996

#3

#3010

#3012

#3016

#3030

#3041

#3062

#3068

#3071

#3080

#3081

#3094

#311

#311

#3110

#3117

#3118

#3121

#3131

#3136

#3146

#3147

#3148

#3150

#3155

#316

#319

#319

#3192

#3198

#32

#320

#3202

#3205

#3209

#321

#3211

#3217

#3218

#3219

#322

#3224

#323

#323

#3244

#3245

#3246

#3247

#3248

#325

#3251

#3252

#3254

#3266

#3271

#3275

#328

#3282

#3286

#3287

#3292

#3295

#3296

#3299

#33

#3300

#3310

#3322

#3326

#3327

#3330

#3334

#3335

#334

#3345

#3346

#3347

#3348

#335

#3351

#3352

#336

#3363

#3365

#3380

#3381

#3382

#3383

#3390

#3395

#3399

#340

#3404

#3413

#3416

#3434

#344

#3447

#3449

#3451

#3452

#3453

#3454

#3455

#3460

#3463

#3464

#3465

#347

#347

#3472

#3474

#348

#348

#3488

#3489

#3494

#3498

#3499

#3503

#3504

#351

#3511

#3512

#3516

#3517

#3520

#3528

#3532

#3536

#3537

#3538

#3539

#3540

#3547

#3549

#3550

#3573

#3574

#3580

#3582

#3593

#3594

#3599

#360

#3608

#3610

#3614

#3620

#3624

#3625

#363

#3641

#3642

#3642

#3644

#3647

#3650

#3651

#3654

#3655

#3660

#3662

#3664

#3667

#3668

#3670

#3671

#3682

#3683

#3694

#3701

#371

#371

#3713

#3714

#3719

#372

#3721

#3722

#3723

#3728

#3734

#3735

#3737

#3738

#374

#374

#3740

#3745

#375

#3757

#3767

#3773

#3779

#3783

#3784

#3793

#38

#380

#3801

#3802

#3805

#3809

#3813

#3816

#3821

#3822

#3823

#3833

#3841

#3843

#3844

#3845

#3848

#3857

#3869

#3871

#3873

#3875

#3877

#3878

#3879

#3880

#3881

#3882

#3885

#3887

#3895

#3896

#3898

#39

#390

#3900

#3904

#3921

#3938

#3942

#3949

#3950

#3952

#3958

#3962

#3963

#3966

#3967

#3968

#3971

#3976

#3979

#3996

#3999

#4

#40

#4000

#4001

#4002

#4003

#4005

#4006

#4007

#4008

#4009

#401

#4013

#4018

#4019

#402

#4020

#4028

#403

#4038

#4040

#4043

#4045

#4054

#4055

#4056

#4057

#4059

#4060

#4063

#4065

#4066

#4069

#4073

#4074

#4081

#4084

#4085

#4086

#4087

#4091

#4092

#4094

#41

#4107

#4110

#4111

#4119

#4133

#4136

#4137

#4139

#4142

#4144

#4149

#4151

#4152

#4153

#4154

#4161

#4167

#4176

#4181

#4182

#4186

#4190

#4191

#4192

#4197

#4204

#4205

#4206

#4230

#4231

#4235

#4236

#4250

#4253

#4256

#4265

#4275

#4290

#4303

#4305

#4306

#4311

#4323

#4324

#4329

#4341

#4354

#4359

#4365

#4367

#4373

#4384

#4388

#4392

#4416

#4417

#4421

#4422

#4426

#4430

#4431

#4457

#4468

#4468

#4470

#4475

#4477

#4486

#4490

#4494

#4495

#4496

#4499

#45

#450

#450

#4500

#4504

#4519

#4526

#4527

#453

#454

#4545

#4547

#455

#455

#4561

#4565

#4566

#4569

#4577

#4582

#4587

#4589

#4590

#46

#4600

#4604

#4605

#4606

#4607

#461

#4611

#4612

#4615

#4623

#4628

#4638

#4652

#4656

#4660

#4662

#4666

#4667

#4668

#4669

#4681

#4690

#4694

#4695

#4698

#4699

#47

#470

#470

#4700

#4719

#472

#472

#4720

#4722

#473

#4733

#4733

#4751

#4752

#4753

#4755

#48

#486

#49

#496

#5

#50

#505

#505

#51

#51

#516

#516

#52

#539

#54

#548

#549

#55

#561

#563

#563

#564

#569

#569

#572

#572

#576

#595

#595

#596

#6

#603

#604

#606

#607

#608

#615

#616

#617

#617

#629

#63

#630

#64

#646

#65

#66

#661

#661

#670

#672

#685

#686

#686

#687

#687

#688

#698

#698

#7

#703

#703

#71

#718

#719

#720

#724

#725

#725

#726

#73

#73

#734

#735

#74

#740

#744

#746

#750

#755

#76

#760

#765

#765

#766

#77

#77

#772

#773

#78

#781

#783

#786

#787

#795

#8

#800

#800

#801

#807

#814

#825

#825

#873

#875

#878

#878

#879

#879

#88

#882

#886

#89

#890

#891

#9

#9

#90

#91

#912

#912

#917

#917

#918

#918

#919

#935

#935

#936

#936

#94

#947

#95

#955

#966

#967

#968

#974

#975

#978

#981

#983

#984

#987

#988

#998

v0.1.0

v0.10.0

v0.11.0

v0.12.0

v0.13.0

v0.14.0

v0.14.1

v0.15.0

v0.15.1

v0.16.0

v0.16.1

v0.17.0

v0.18.0

v0.19.0

v0.19.1

v0.2.0

v0.20.0

v0.21.0

v0.22.0

v0.23.0

v0.23.1

v0.23.2

v0.23.3

v0.24.0

v0.24.1

v0.25.0

v0.25.1

v0.25.2

v0.25.3

v0.26.0

v0.27.0

v0.27.1

v0.28.0

v0.28.1

v0.28.2

v0.29.0

v0.29.1

v0.3.0

v0.30.0

v0.31.0

v0.31.1

v0.31.2

v0.32.0

v0.32.1

v0.33.0

v0.34.0

v0.34.1

v0.34.2

v0.34.3

v0.35.0

v0.35.1

v0.36.0

v0.36.1

v0.36.2

v0.37.0

v0.37.1

v0.38.0

v0.39.0

v0.39.1

v0.40.0

v0.41.0

v0.42.0

v0.43.0

v0.44.0

v0.45.0

v0.46.0

v0.46.1

v0.47.0

v0.48.0

v0.49.0

v0.5.0

v0.50.0

v0.51.0

v0.51.1

v0.51.2

v0.51.3

v0.52.0

v0.52.1

v0.52.2

v0.52.3

v0.53.0

v0.53.1

v0.53.2

v0.54.0

v0.55.0

v0.55.1

v0.56.0

v0.57.0

v0.58.0

v0.58.1

v0.59.0

v0.6.0

v0.60.0

v0.61.0

v0.61.1

v0.61.2

v0.62.0

v0.7.0

v0.8.0

v0.8.1

v0.9.0

v0.9.1

v0.9.2

v0.9.3

Mono Color

• a8efaee1f3
  Improve basic examples for newbies (#1711) xcffl 2020-03-26 09:41:18 +00:00
• 4c2afb5c28
  doc: add plugin repo link (#1710) fatedier 2020-03-20 20:54:22 +08:00
• 809f517db8
  server plugin: set version and op in http request query (#1707) fatedier 2020-03-20 20:53:14 +08:00
• a4b105dedb
  [Feature] Server Plugin - Ping and NewWorkConn RPC (#1702) Guy Lewin 2020-03-17 13:52:44 -04:00
• 10acf638f8
  [Feature] Include RunId in FRP Server Plugin NewProxy message (#1700) Guy Lewin 2020-03-14 11:26:35 -04:00
• ea62bc5a34
  remove vendor (#1697) v0.32.0 fatedier 2020-03-11 14:39:43 +08:00
• f65ffe2812 remove vendor fatedier 2020-03-11 14:34:17 +08:00
• 23bb76397a
  Merge pull request #1696 from fatedier/dev fatedier 2020-03-11 14:30:47 +08:00
• 859a330e6c
  Merge pull request #1695 from fatedier/doc fatedier 2020-03-11 14:18:12 +08:00
• 86ac511763 bump version to v0.32.0 fatedier 2020-03-11 14:13:49 +08:00
• f2e98ef8a4 update doc fatedier 2020-03-11 14:13:16 +08:00
• 495d999b6c
  refactoring monitor code, support prometheus (#1668) fatedier 2020-03-11 13:20:26 +08:00
• 6d1af85e80
  fix: send server plugin request as json (#1690) Guy Lewin 2020-03-10 03:23:37 -04:00
• 1db091b381
  tcp multiplexing over http connect tunnel fatedier 2020-03-05 21:47:49 +08:00
• 0b9124d4fd
  Fix bandwidth compare (#1679) glzjin 2020-03-02 11:20:08 +08:00
• 6c6607ae68
  feat: add multiple authentication methods, token and oidc. Guy Lewin 2020-02-29 21:57:01 -05:00
• 83d80857fd
  Merge pull request #1644 from GuyLewin/feature/detailed-errors-to-client fatedier 2020-02-12 10:39:03 +08:00
• 98fa3855bd CR: export error string generation to a function Guy Lewin 2020-02-11 16:57:38 +02:00
• 9440bc5d72 Merge branch 'dev' into feature/detailed-errors-to-client Guy Lewin 2020-02-11 11:25:04 +02:00
• 95753ebf1c
  Merge pull request #1643 from GuyLewin/feature/tls-only fatedier 2020-02-11 13:57:03 +08:00
• f8c6795119 DetailedErrorsToClient - only send detailed error info if this is on Guy Lewin 2020-02-10 19:29:57 +02:00
• 7033f3e72b Test TlsOnly Guy Lewin 2020-02-10 19:14:07 +02:00
• e3101b7aa8 Update README.md Guy Lewin 2020-02-10 19:01:23 +02:00
• c747f160aa TlsOnly - only accept TLS connections if enabled Guy Lewin 2020-02-10 18:56:41 +02:00
• c8748a2948 update .travis.yml fatedier 2020-02-04 22:24:07 +08:00
• 487c8d7c29
  Merge pull request #1637 from fatedier/dev v0.31.2 fatedier 2020-02-04 21:54:28 +08:00
• 69fa7ed16e bump version to v0.31.2 fatedier 2020-02-04 21:43:37 +08:00
• 5336155365
  Merge pull request #1636 from fatedier/new fatedier 2020-02-04 21:39:26 +08:00
• 4feb74cb89 doc typo fatedier 2020-02-04 21:34:46 +08:00
• 4a4cf552af send closeProxy msg to server then client start proxy error, fix #1606 fatedier 2020-02-04 19:41:39 +08:00
• 0f59b8f329 English grammar fix. (#1619) Joe Cloud 2020-01-14 22:11:12 -06:00
• f480160e2d
  Merge pull request #1596 from fatedier/dev v0.31.1 fatedier 2020-01-06 15:55:44 +08:00
• 4832a2a1e9 bump version fatedier 2020-01-06 15:44:18 +08:00
• 52ecd84d8a fix panic if set meta in proxy config, fix #1595 fatedier 2020-01-06 15:43:25 +08:00
• 30c246c488
  Merge pull request #1588 from fatedier/dev v0.31.0 fatedier 2020-01-03 11:45:22 +08:00
• 42014eea23 improve xtcp, fix #1585 fatedier 2020-01-03 11:39:44 +08:00
• c2da396230
  Merge pull request #1587 from fatedier/doc fatedier 2020-01-03 11:37:52 +08:00
• e91c9473be add server manage plugin doc fatedier 2020-01-03 11:35:12 +08:00
• 13e48c6ca0
  Merge pull request #1575 from fatedier/new fatedier 2019-12-31 14:12:30 +08:00
• 31e2cb76bb bump version fatedier 2019-12-23 20:00:59 +08:00
• 91e46a2c53 support server plugin feature fatedier 2019-12-20 20:28:28 +08:00
• a57679f837 support meta info for client and proxy fatedier 2019-12-08 21:01:58 +08:00
• 75f3bce04d
  Merge pull request #1542 from fatedier/dev v0.30.0 fatedier 2019-11-28 14:21:27 +08:00
• df18375308
  Merge pull request #1537 from fatedier/new fatedier 2019-11-26 10:42:31 +08:00
• c63737ab3e update doc for bandwith limit fatedier 2019-11-26 10:23:37 +08:00
• 1cdceee347 bump version to v0.30.0 fatedier 2019-11-26 09:15:24 +08:00
• 694c434b9e
  Merge pull request #1529 from kingjcy/20191118 fatedier 2019-11-22 15:25:01 +08:00
• 62af5c8844 handle close kingjcy 2019-11-22 15:18:20 +08:00
• 56c53909aa plugin http2https kingjcy 2019-11-20 20:56:55 +08:00
• 21a126e4e4
  Merge pull request #1510 from CallanTaylor/close-file fatedier 2019-11-12 14:02:49 +08:00
• 8affab1a2b Close file CallanTaylor 2019-11-12 11:38:55 +13:00
• 12cc53d699 update bandwidth_limit fatedier 2019-11-09 01:13:30 +08:00
• 2ab832bb89
  Merge pull request #1495 from fatedier/new fatedier 2019-11-08 21:05:13 +08:00
• 42425d8218 update vendor files fatedier 2019-11-03 01:21:47 +08:00
• 6da093a402 support bandwith limit for one proxy fatedier 2019-11-03 01:20:49 +08:00
• adc3adc13b
  Merge pull request #1494 from fatedier/dev v0.29.1 fatedier 2019-11-02 21:14:50 +08:00
• 22a79710d8 bump version to v0.29.1 fatedier 2019-11-02 21:05:37 +08:00
• 0927553fe4
  Merge pull request #1465 from lzhfromustc/dev_dup_mis_unlock fatedier 2019-10-16 00:51:26 +08:00
• 858d8f0ba7
  Merge pull request #1460 from weisi/dev fatedier 2019-10-15 13:52:13 +08:00
• 8eb945ee9b dev:udp: Add an Unlock before a continue, to fix a double lock bug lzhfromustc 2019-10-14 23:35:08 -04:00
• dc0fd60d30 frp: Fix typos in English Readme. Weisi Dai 2019-10-13 14:46:08 -07:00
• cd44c9f55c
  Merge pull request #1459 from fatedier/new fatedier 2019-10-12 20:19:01 +08:00
• 649f47c345 change log method fatedier 2019-10-12 20:13:12 +08:00
• 6ca3160b33
  Merge pull request #1451 from GuyLewin/dev fatedier 2019-10-10 10:54:09 +08:00
• 5f8ed4fc60 Fix CR Guy Lewin 2019-10-09 13:41:05 -07:00
• bf0993d2a6 Grammer fixes Guy Lewin 2019-10-01 15:58:35 -04:00
• 5dc8175fc8
  Merge pull request #1420 from Hurricanezwf/fix-bad-xtcp-encryption fatedier 2019-09-01 20:49:13 +08:00
• dc6a5a29c1 fix bad encryption and compression when use xtcp zhouwenfeng 2019-08-31 21:24:20 +08:00
• e62d9a5242
  Merge pull request #1415 from fatedier/dev v0.29.0 fatedier 2019-08-29 21:22:30 +08:00
• 94212ac8b8
  Merge pull request #1414 from fatedier/new fatedier 2019-08-29 21:17:30 +08:00
• e9e86fccf0 let max_pool_count valid fatedier 2019-08-29 21:13:21 +08:00
• 58745992ef typo fatedier 2019-08-27 11:17:43 +08:00
• 234d634bfe
  Merge pull request #1411 from fatedier/new fatedier 2019-08-26 15:30:26 +08:00
• fdc6902a90 proxy protocol: fix detect method for IPV4 and IPV6 fatedier 2019-08-26 11:13:33 +08:00
• d8d587fd93
  Merge pull request #1408 from velovix/issue-1387_api-documentation fatedier 2019-08-25 21:15:32 +08:00
• 92791260a7 Add documentation for base proxy config Tyler Compton 2019-08-24 15:25:52 -07:00
• 4dfd851c46 Add docs for common config fields & sessions Tyler Compton 2019-08-24 15:20:34 -07:00
• bc4df74b5e
  Merge pull request #1401 from velovix/issue-1387_client-conf-as-argument fatedier 2019-08-22 00:14:56 +08:00
• 666f122a72 Pass client configuration as an argument Tyler Compton 2019-08-20 13:53:27 -07:00
• f999c8a87e
  Merge pull request #1396 from velovix/issue-1387_server-conf-as-argument fatedier 2019-08-21 00:30:01 +08:00
• 90a32ab75d
  Merge pull request #1399 from renmu123/dev fatedier 2019-08-20 17:24:05 +08:00
• 0713fd28da
  fix one punctuation in Chinese docs renmu123 2019-08-20 17:17:17 +08:00
• f5b33e6de8
  Merge pull request #1397 from velovix/issue-1387_client-assets-dir fatedier 2019-08-20 11:06:12 +08:00
• fc6043bb4d
  Merge pull request #1395 from velovix/issue-1387_load-assets-on-demand fatedier 2019-08-20 11:03:05 +08:00
• bc46e3330a Add an "assets_dir" option for frpc Tyler Compton 2019-08-19 16:51:03 -07:00
• 5fc7b3ceb5 Remove global ServerService variable Tyler Compton 2019-08-19 16:23:33 -07:00
• 6277af4790 Pass server configuration as an argument Tyler Compton 2019-08-19 11:07:37 -07:00
• 00bd0a8af4 Load assets for dashboard/admin panel on demand Tyler Compton 2019-08-16 11:02:00 -07:00
• a415573e45
  Merge pull request #1390 from fatedier/new fatedier 2019-08-15 23:50:17 +08:00
• e68012858e ci: add http load balancing test cases fatedier 2019-08-15 23:36:05 +08:00
• ca8a5b753c
  Merge pull request #1382 from Hurricanezwf/feature/add-httpstohttp-header fatedier 2019-08-14 21:00:16 +08:00
• d1f4ac0f2d add README for this feature zhouwenfeng 2019-08-14 20:44:44 +08:00
• ff357882ac use Set() instead of Add() when attaching additional headers zhouwenfeng 2019-08-14 20:36:10 +08:00
• 934ac2b836 add support for add http header when using https2http plugin zhouwenfeng 2019-08-13 21:14:06 +08:00
• 1ad50d5982 bump version to v0.29.0 fatedier 2019-08-12 00:48:50 +08:00
• 388b016842 support disable_log_color for console mode fatedier 2019-08-12 00:47:35 +08:00
• 134a46c00b
  Merge pull request #1369 from fatedier/dev v0.28.2 fatedier 2019-08-09 12:59:13 +08:00
• 50796643fb
  Merge pull request #1368 from fatedier/new fatedier 2019-08-09 12:52:46 +08:00
• b1838b1d5e bump version to v0.28.2 fatedier 2019-08-09 12:50:33 +08:00
• 757b3613fe fix health check bug, fix #1367 fatedier 2019-08-09 12:47:27 +08:00