Skip to content

Commit 243ca99

Browse files
authored
Merge pull request #4324 from fatedier/dev
bump version
2 parents e649692 + b4d5d8c commit 243ca99

File tree

17 files changed

+283
-15
lines changed

17 files changed

+283
-15
lines changed

README.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,24 @@
99

1010
<h3 align="center">Gold Sponsors</h3>
1111
<!--gold sponsors start-->
12+
<p align="center">
13+
<a href="https://lokal.so/?utm_campaign=github_repo&utm_medium=referral&utm_content=frp&utm_source=github" target="_blank">
14+
<img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_lokal.png">
15+
</a>
16+
</p>
1217
<p align="center">
1318
<a href="https://workos.com/?utm_campaign=github_repo&utm_medium=referral&utm_content=frp&utm_source=github" target="_blank">
14-
<img width="350px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_workos.png">
19+
<img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_workos.png">
1520
</a>
16-
<a>&nbsp</a>
21+
</p>
22+
<p align="center">
1723
<a href="https://github.com/daytonaio/daytona" target="_blank">
18-
<img width="360px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_daytona.png">
24+
<img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_daytona.png">
25+
</a>
26+
</p>
27+
<p align="center">
28+
<a href="https://github.com/beclab/terminus" target="_blank">
29+
<img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_terminusos.jpeg">
1930
</a>
2031
</p>
2132
<!--gold sponsors end-->

README_zh.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,24 @@ frp 是一个专注于内网穿透的高性能的反向代理应用,支持 TCP
1111

1212
<h3 align="center">Gold Sponsors</h3>
1313
<!--gold sponsors start-->
14+
<p align="center">
15+
<a href="https://lokal.so/?utm_campaign=github_repo&utm_medium=referral&utm_content=frp&utm_source=github" target="_blank">
16+
<img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_lokal.png">
17+
</a>
18+
</p>
1419
<p align="center">
1520
<a href="https://workos.com/?utm_campaign=github_repo&utm_medium=referral&utm_content=frp&utm_source=github" target="_blank">
16-
<img width="350px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_workos.png">
21+
<img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_workos.png">
1722
</a>
18-
<a>&nbsp</a>
23+
</p>
24+
<p align="center">
1925
<a href="https://github.com/daytonaio/daytona" target="_blank">
20-
<img width="360px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_daytona.png">
26+
<img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_daytona.png">
27+
</a>
28+
</p>
29+
<p align="center">
30+
<a href="https://github.com/beclab/terminus" target="_blank">
31+
<img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_terminusos.jpeg">
2132
</a>
2233
</p>
2334
<!--gold sponsors end-->

Release.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
### Fixes
1+
### Features
22

3-
* Fixed an issue where HTTP/2 was not enabled for https2http and https2https plugins.
4-
* Fixed the issue where the default values of INI configuration parameters are inconsistent with other configuration formats.
3+
* Added a new plugin "http2http" which allows forwarding HTTP requests to another HTTP server, supporting options like local address binding, host header rewrite, and custom request headers.
4+
* Added `enableHTTP2` option to control whether to enable HTTP/2 in plugin https2http and https2https, default is true.
55

66
### Changes
77

8-
* Updated the default value of `transport.tcpMuxKeepaliveInterval` from 60 to 30.
9-
* On the Android platform, the Google DNS server is used only when the default DNS server cannot be obtained.
8+
* Plugin https2http & https2https: return 421 `Misdirected Request` if host not match sni.

conf/frpc_full_example.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,16 @@ localAddr = "127.0.0.1:443"
315315
hostHeaderRewrite = "127.0.0.1"
316316
requestHeaders.set.x-from-where = "frp"
317317

318+
[[proxies]]
319+
name = "plugin_http2http"
320+
type = "tcp"
321+
remotePort = 6007
322+
[proxies.plugin]
323+
type = "http2http"
324+
localAddr = "127.0.0.1:80"
325+
hostHeaderRewrite = "127.0.0.1"
326+
requestHeaders.set.x-from-where = "frp"
327+
318328
[[proxies]]
319329
name = "secret_tcp"
320330
# If the type is secret tcp, remotePort is useless

doc/pic/donate-wechatpay.png

-26.9 KB
Binary file not shown.

doc/pic/sponsor_daytona.png

-14.6 KB
Loading

doc/pic/sponsor_doppler.png

-40.9 KB
Binary file not shown.

doc/pic/sponsor_lokal.png

55.1 KB
Loading

doc/pic/sponsor_nango.png

-11.8 KB
Binary file not shown.

doc/pic/sponsor_terminusos.jpeg

30.7 KB
Loading

0 commit comments

Comments
 (0)