Skip to content

Commit 1aa60bb

Browse files
committedDec 13, 2023
fix ci
1 parent 8ef8830 commit 1aa60bb

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed
 

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ salvo-cache = { version = "0.62.0", path = "crates/cache", default-features = fa
2727
salvo-cors = { version = "0.62.0", path = "crates/cors", default-features = false }
2828
salvo-csrf = { version = "0.62.0", path = "crates/csrf", default-features = false }
2929
salvo-flash = { version = "0.62.0", path = "crates/flash", default-features = false }
30-
salvo-http3 = { version = "0.0.5", default-features = false }
30+
salvo-http3 = { version = "0.0.7", default-features = false }
3131
salvo-jwt-auth = { version = "0.62.0", path = "crates/jwt-auth", default-features = false }
3232
salvo-oapi = { version = "0.62.0", path = "./crates/oapi", default-features = false }
3333
salvo-oapi-macros = { version = "0.62.0", path = "crates/oapi-macros", default-features = false }

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Salvo is an extremely simple and powerful Rust web backend framework. Only basic
3737

3838
## 🎯 Features
3939

40-
- Built with [Hyper](https://crates.io/crates/hyper) and [Tokio](https://crates.io/crates/tokio);
40+
- Built with [Hyper 1.0](https://crates.io/crates/hyper) and [Tokio](https://crates.io/crates/tokio);
4141
- HTTP1, HTTP2 and **HTTP3**;
4242
- Unified middleware and handle interface;
4343
- Router can be nested infinitely, and multiple middlewares can be attached to any router;
@@ -49,7 +49,8 @@ Salvo is an extremely simple and powerful Rust web backend framework. Only basic
4949

5050
## ⚡️ Quick Start
5151
You can view samples [here](https://github.com/salvo-rs/salvo/tree/main/examples), or view [official website](https://salvo.rs).
52-
### 🛠️ Salvo-cli
52+
53+
### 🛠️ Salvo CLI
5354
Salvo CLI is a command-line tool that simplifies the creation of new Salvo projects, supporting templates for web APIs, websites, databases (including SQLite, PostgreSQL, and MySQL via SQLx, SeaORM, Diesel, Rbatis), and basic middleware.
5455
You can use [salvo-cli](https://github.com/salvo-rs/salvo-cli) to create a new Salvo project:
5556
#### install
@@ -294,8 +295,7 @@ Benchmark testing result can be found from here:
294295

295296
[https://web-frameworks-benchmark.netlify.app/result?l=rust](https://web-frameworks-benchmark.netlify.app/result?l=rust)
296297

297-
[https://www.techempower.com/benchmarks/#section=data-r21](https://www.techempower.com/benchmarks/#section=data-r21)
298-
![techempower](assets/tp.jpg)
298+
[https://www.techempower.com/benchmarks/#section=data-r22](https://www.techempower.com/benchmarks/#section=data-r22)
299299

300300
## 🩸 Contributing
301301

‎README.zh-hans.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Salvo(赛风) 是一个极其简单且功能强大的 Rust Web 后端框架. 仅
3939
4040
## 🎯 功能特色
4141

42-
- 基于 [Hyper](https://crates.io/crates/hyper), [Tokio](https://crates.io/crates/tokio) 开发;
42+
- 基于 [Hyper 1.0](https://crates.io/crates/hyper), [Tokio](https://crates.io/crates/tokio) 开发;
4343
- 支持 HTTP1, HTTP2 和 **HTTP3**;
4444
- 统一的中间件和句柄接口;
4545
- 路由可以无限嵌套,并且可以在任何路由是附加多个中间件;
@@ -53,7 +53,7 @@ Salvo(赛风) 是一个极其简单且功能强大的 Rust Web 后端框架. 仅
5353

5454
你可以查看[实例代码](https://github.com/salvo-rs/salvo/tree/main/examples), 或者访问[官网](https://salvo.rs).
5555

56-
### 🛠️ Salvo-cli
56+
### 🛠️ Salvo CLI
5757
Salvo CLI是一个命令行工具,可以简化创建新的Salvo项目的过程,支持Web API、网站、数据库(包括通过SQLx、SeaORM、Diesel、Rbatis支持的SQLite、PostgreSQL、MySQL)和基本的中间件的模板。
5858
你可以使用 [salvo-cli](https://github.com/salvo-rs/salvo-cli) 来创建一个新的 Salvo 项目:
5959
#### 安装
@@ -302,8 +302,7 @@ Benchmark 测试结果可以从这里查看:
302302

303303
[https://web-frameworks-benchmark.netlify.app/result?l=rust](https://web-frameworks-benchmark.netlify.app/result?l=rust)
304304

305-
[https://www.techempower.com/benchmarks/#section=data-r21](https://www.techempower.com/benchmarks/#section=data-r21)
306-
![techempower](assets/tp.jpg)
305+
[https://www.techempower.com/benchmarks/#section=data-r22](https://www.techempower.com/benchmarks/#section=data-r22)
307306

308307
## 🩸 贡献
309308

‎README.zh-hant.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Salvo(賽風) 是一個極其簡單且功能強大的 Rust Web 後端框架. 僅
3939
4040
## 🎯 功能特色
4141

42-
- 基於 [Hyper](https://crates.io/crates/hyper), [Tokio](https://crates.io/crates/tokio) 開發;
42+
- 基於 [Hyper 1.0](https://crates.io/crates/hyper), [Tokio](https://crates.io/crates/tokio) 開發;
4343
- 統一的中間件和句柄接口;
4444
- 支持 HTTP1, HTTP2 和 **HTTP3**;
4545
- 路由可以無限嵌套,並且可以在任何路由是附加多個中間件;
@@ -52,7 +52,7 @@ Salvo(賽風) 是一個極其簡單且功能強大的 Rust Web 後端框架. 僅
5252
## ⚡️ 快速開始
5353

5454
你可以查看[實例代碼](https://github.com/salvo-rs/salvo/tree/main/examples), 或者訪問[官網](https://salvo.rs).
55-
### 🛠️ Salvo-cli
55+
### 🛠️ Salvo CLI
5656
Salvo CLI是一個命令行工具,可以簡化創建新的Salvo項目的過程,支援Web API、網站、資料庫(包括透過SQLx、SeaORM、Diesel、Rbatis支援的SQLite、PostgreSQL、MySQL)和基本的中介軟體的模板。
5757
你可以使用 [salvo-cli](https://github.com/salvo-rs/salvo-cli) 来來創建一個新的 Salvo 項目:
5858
#### 安裝
@@ -300,8 +300,7 @@ Benchmark 測試結果可以從這裏查看:
300300

301301
[https://web-frameworks-benchmark.netlify.app/result?l=rust](https://web-frameworks-benchmark.netlify.app/result?l=rust)
302302

303-
[https://www.techempower.com/benchmarks/#section=data-r21](https://www.techempower.com/benchmarks/#section=data-r21)
304-
![techempower](assets/tp.jpg)
303+
[https://www.techempower.com/benchmarks/#section=data-r22](https://www.techempower.com/benchmarks/#section=data-r22)
305304

306305
## 🩸 貢獻
307306

‎assets/tp.jpg

-145 KB
Binary file not shown.

‎crates/core/src/conn/acme/resolver.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cfg_feature! {
1212
use tokio_rustls_old::rustls::{
1313
server::{
1414
ClientHello as OldClientHello,
15-
ResolvesServerCert as OldResolvesServerCert,
15+
ResolvesServerCert as ResolvesServerCertOld,
1616
},
1717
sign::{CertifiedKey as CertifiedKeyOld},
1818
};
@@ -78,7 +78,8 @@ pub(crate) struct ResolveServerCertOld {
7878
pub(crate) cert: RwLock<Option<Arc<CertifiedKeyOld>>>,
7979
pub(crate) acme_keys: RwLock<HashMap<String, Arc<CertifiedKeyOld>>>,
8080
}
81-
impl OldResolvesServerCert for ResolveServerCertOld {
81+
#[cfg(feature = "quinn")]
82+
impl ResolvesServerCertOld for ResolveServerCertOld {
8283
#[inline]
8384
fn resolve(&self, client_hello: OldClientHello) -> Option<Arc<CertifiedKeyOld>> {
8485
if client_hello

0 commit comments

Comments
 (0)
Please sign in to comment.