Merge remote-tracking branch 'upstream/master' into server-ffi

Author: bossmc

.github/workflows/CI.yml

@@ -45,8 +45,8 @@ jobs:
 
       - name: cargo fmt --check
         run: |
-          if ! rustfmt --check --edition 2018 $(git ls-files '*.rs'); then
-            printf "Please run \`rustfmt --edition 2018 \$(git ls-files '*.rs')\` to fix rustfmt errors.\nSee CONTRIBUTING.md for more details.\n" >&2
+          if ! rustfmt --check --edition 2021 $(git ls-files '*.rs'); then
+            printf "Please run \`rustfmt --edition 2021 \$(git ls-files '*.rs')\` to fix rustfmt errors.\nSee docs/CODE_STYLE.md for more details.\n" >&2
             exit 1
           fi
 
@@ -115,6 +115,10 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
+      - name: Pin some dependencies
+        run: |
+          cargo update -p tokio --precise 1.38.1
+
       - name: Check
         run: cargo check --features full
 
@@ -201,12 +205,12 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Install cbindgen
-        uses: taiki-e/cache-cargo-install-action@v1
+        uses: taiki-e/cache-cargo-install-action@v2
         with:
           tool: cbindgen
 
       - name: Install cargo-expand
-        uses: taiki-e/cache-cargo-install-action@v1
+        uses: taiki-e/cache-cargo-install-action@v2
         with:
           tool: cargo-expand
 
@@ -247,12 +251,12 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-10-10  # Compatible version for cargo-check-external-types
+          toolchain: nightly-2024-05-01  # Compatible version for cargo-check-external-types
 
       - name: Install cargo-check-external-types
-        uses: taiki-e/cache-cargo-install-action@v1
+        uses: taiki-e/cache-cargo-install-action@v2
         with:
-          tool: [email protected].9
+          tool: [email protected].12
 
       - uses: Swatinem/rust-cache@v2
 

CHANGELOG.md

@@ -1,3 +1,89 @@
+### v1.4.1 (2024-07-09)
+
+
+#### Bug Fixes
+
+* **http1:** reject final chunked if missing 0 ([8e5de1bb](https://github.com/hyperium/hyper/commit/8e5de1bb57e10b5bd9e70ab22489da787517238a))
+
+
+## v1.4.0 (2024-07-01)
+
+
+#### Bug Fixes
+
+* **http2:** stop removing "Trailer" header in HTTP/2 responses as per RFC 9110 (#3648) ([a3269f7a](https://github.com/hyperium/hyper/commit/a3269f7ab285dbeb44a3a7dbc163fcadd65087f9))
+* **server:** start header read timeout immediately (#3185) ([0eb1b6cf](https://github.com/hyperium/hyper/commit/0eb1b6cf4d914ce9c3f8e92a8b43754eba27a327))
+
+
+#### Features
+
+* **client:**
+  * add `SendRequest::try_send_request()` method (#3691) ([4ffaad53](https://github.com/hyperium/hyper/commit/4ffaad53c78572c500584e0cb5d76ae6ffc6adb6))
+  * remove `Send +Sync` bounds requirement of `http2::Connection` executor (#3682) ([56c3cd56](https://github.com/hyperium/hyper/commit/56c3cd560bc10671d3d8b638f3f17a304f920c6b))
+  * remove `'static` lifetime bound on http1/2 client IO (#3667) ([9580b357](https://github.com/hyperium/hyper/commit/9580b357635031f3d631303f3afffc2afae77933))
+* **http1:** add support for receiving trailer fields (#3637) ([ac84af6b](https://github.com/hyperium/hyper/commit/ac84af6b32a5d37d9343013ace088aaae47587b6), closes [#2703](https://github.com/hyperium/hyper/issues/2703))
+* **server:** add `Builder::auto_date_header(bool)` to allow disabling Date headers ([721785ef](https://github.com/hyperium/hyper/commit/721785efad8537513e48d900a85c05ce79483018))
+* **service:** implement Service for reference types (#3607) ([eade122d](https://github.com/hyperium/hyper/commit/eade122db25f51619aee5db845de2a61b7ff2f74))
+
+
+### v1.3.1 (2024-04-16)
+
+#### Bug Fixes
+
+* **client:** revert auto content-length header for some requests (#3633)
+
+
+## v1.3.0 (2024-04-15)
+
+
+#### Bug Fixes
+
+* **client:** send content-length even with no body ([172fdfaf](https://github.com/hyperium/hyper/commit/172fdfaf0e0d9222917f271a83339238082e2657))
+* **http2:**
+  * `max_header_list_size(num)` defaults to 16kb ([203d1b09](https://github.com/hyperium/hyper/commit/203d1b090d0d0349c7e373e881ac4ddba72129be))
+  * `initial_max_send_streams` defaults to 100 ([2d1bd708](https://github.com/hyperium/hyper/commit/2d1bd7085e37a55ed6393f0e3f1b9a0b06db4d5d))
+* **server:**
+  * avoid unwrapping for the `Future` impl of HTTP/1 `UpgradeableConnection` (#3627) ([b79be911](https://github.com/hyperium/hyper/commit/b79be911696f6a93e8d408080ebbf558b612ce3c), closes [#3621](https://github.com/hyperium/hyper/issues/3621))
+  * avoid  `graceful_shutdown` panic on upgraded H1 connection (#3616) ([6ecf8521](https://github.com/hyperium/hyper/commit/6ecf85218fb24531184c53d5ed0eb7caf13cdcef))
+
+
+#### Features
+
+* **client:**
+  * add `max_header_list_size(num)` to `http2::Builder`. ([1c5b1b87](https://github.com/hyperium/hyper/commit/1c5b1b87ae1497a702e30ea82a486fb61a3f8133))
+  * add `max_pending_accept_reset_streams` HTTP2 option (#3617) ([330ddf1d](https://github.com/hyperium/hyper/commit/330ddf1de1ca2841469d30d24143902e5ff06365))
+* **ext:** implement From ReasonPhrase for Bytes ([dc27043a](https://github.com/hyperium/hyper/commit/dc27043aa319c0e630b7385a36aca0f3bee70670))
+* **service:** expose Service and HttpService trait unconditionally ([6aee2e6e](https://github.com/hyperium/hyper/commit/6aee2e6e260e7d407256d6b7da6a0d90c1bb9c67))
+* **server:** relax `'static` from connection IO trait bounds  (#3595) ([0013bdda](https://github.com/hyperium/hyper/commit/0013bdda5cd34ed6fca089eceb0133395b7be041))
+
+
+## v1.2.0 (2024-02-21)
+
+
+#### Bug Fixes
+
+* **http2:** typo in trace logging (#3536) ([79862ec2](https://github.com/hyperium/hyper/commit/79862ec2e84c32122c820958ceec06d8b7701ff7))
+* **rt:** `Sleep::downcast_mut_pin()` no longer extend lifetime ([7206fe30](https://github.com/hyperium/hyper/commit/7206fe30302937075c51c16a69d1eb3bbce6a671), closes [#3556](https://github.com/hyperium/hyper/issues/3556))
+
+
+#### Features
+
+* **http1:** support configurable `max_headers(num)` to client and server (#3523) ([b1142448](https://github.com/hyperium/hyper/commit/b114244898828e9fb254bea1f0bbdd24850b2f3f))
+* **http2:**
+  * add config for `max_local_error_reset_streams` in server (#3530) ([d7680e30](https://github.com/hyperium/hyper/commit/d7680e30e48926a5a3f94a0986d39181d5ab2218))
+  * add `initial_max_send_streams` method to HTTP/2 client builder (#3524) ([fdfa60d9](https://github.com/hyperium/hyper/commit/fdfa60d9fafb8a6bfb40acc4042ee54a2b9aad32))
+  * add `max_pending_accept_reset_streams(num)` back to HTTP/2 server builder (#3507 ([a9fa893f](https://github.com/hyperium/hyper/commit/a9fa893f18c6409abae2e1dcbba0f4487df54d4f))
+
+
+#### Breaking Changes
+
+* The returned lifetime from `Sleep::downcast_mut_pin()`
+  is no longer `'static`. This shouldn't affect most usage. This sort of
+  breaking change is needed because it is _wrong_.
+
+ ([7206fe30](https://github.com/hyperium/hyper/commit/7206fe30302937075c51c16a69d1eb3bbce6a671))
+
+
 ## v1.1.0 (2023-12-18)
 
 

CONTRIBUTING.md

@@ -1,10 +1,41 @@
 # Contributing to Hyper
 
-You want to contribute? You're awesome! Don't know where to start? Check the [list of easy issues](https://github.com/hyperium/hyper/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy).
+You want to contribute? You're awesome!
+
+Contributions come in all shapes and sizes. Let's take a tour of some of the different wants you could contribute.
+
+## [Code of Conduct](./docs/CODE_OF_CONDUCT.md)
+
+Firstly, all interactions with the project need to abide by the code of conduct. This is to make sure everyone is treated kindly.
+
+## [Issues](./docs/ISSUES.md)
+
+- **Filing an issue** is a contribution. We appreciate you letting us know about bugs you've found, and any information that you can provide that we can use to make hyper better. Without your filing it, we may not be aware of the bug.
+- [Triaging issues](./docs/ISSUES.md#triaging) is a huge help. By your helping make issues better, the reporters can get answers sooner, and others can fix them with less effort. You can also volunteer as a frequent [triager](./docs/MAINTAINERS.md#triagers).
+- Discuss [feature requests][feat] (especially those marked [request-for-comment][b-rfc]).
+
+[feat]: https://github.com/hyperium/hyper/issues?q=is%3Aissue+is%3Aopen+label%3AC-feature
+[b-rfc]: https://github.com/hyperium/hyper/issues?q=is%3Aissue+is%3Aopen+label%3AB-rfc
 
-[easy tag]: https://github.com/hyperium/hyper/issues?q=label%3AE-easy+is%3Aopen
 
 ## [Pull Requests](./docs/PULL_REQUESTS.md)
 
+By the way, consider checking the [list of easy issues](https://github.com/hyperium/hyper/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy) if you want to submit something.
+
 - [Submitting a Pull Request](./docs/PULL_REQUESTS.md#submitting-a-pull-request)
 - [Commit Guidelines](./docs/COMMITS.md)
+
+## Documentation
+
+Improving hyper's documentation is a huge help for everyone who is trying to _use_ hyper.
+
+- The API documentation (rendered at https://docs.rs/hyper) is stored as rustdoc comments directly in the source.
+- The main website has [tutorial-style guides](https://hyper.rs/guides). As of v1, they are currently in a [revamp](https://github.com/hyperium/hyper/issues/3411), and would greatly benefit from being filled out.
+
+## Help
+
+Helping others use hyper in their specific workflows is a very valuable way to contribute.
+
+- Answer questions asked directly in hyper's [Discussions](https://github.com/hyperium/hyper/discussions).
+- Join our [Discord](https://discord.gg/kkwpueZ) and help those who show up with questions.
+- **Blog about hyper.** You writing a blog post about how you use hyper to do something specific, or how you contributed a new feature, or debugged something in it, is a great idea. Not all examples can fit in the hyper repo. Search engines will help people find their use cases on your blog. And you can describe processes in more depth or from a different perspective.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hyper"
-version = "1.1.0"
+version = "1.4.1"
 description = "A fast and correct HTTP library."
 readme = "README.md"
 homepage = "https://hyper.rs"
@@ -10,7 +10,7 @@ license = "MIT"
 authors = ["Sean McArthur <[email protected]>"]
 keywords = ["http", "hyper", "hyperium"]
 categories = ["network-programming", "web-programming::http-client", "web-programming::http-server"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.63" # keep in sync with MSRV.md dev doc
 
 include = [
@@ -20,10 +20,9 @@ include = [
 ]
 
 [dependencies]
-bytes = "1"
+bytes = "1.2"
 http = "1"
 http-body = "1"
-pin-project-lite = "0.2.4"
 tokio = { version = "1", features = ["sync"] }
 
 # Optional
@@ -36,6 +35,8 @@ httparse = { version = "1.8", optional = true }
 httpdate = { version = "1.0", optional = true }
 itoa = { version = "1", optional = true }
 libc = { version = "0.2", optional = true }
+pin-project-lite = { version = "0.2.4", optional = true }
+smallvec = { version = "1.12", features = ["const_generics", "const_new"], optional = true }
 tracing = { version = "0.1", default-features = false, features = ["std"], optional = true }
 want = { version = "0.3", optional = true }
 
@@ -68,28 +69,35 @@ tokio-util = "0.7.10"
 default = []
 
 # Easily turn it all on
-full = ["client", "http1", "http2", "server"]
+full = ["client", "http1", "http2", "server", "futures-util?/alloc"]
 
 # HTTP versions
 http1 = ["dep:futures-channel", "dep:futures-util", "dep:httparse", "dep:itoa"]
 http2 = ["dep:futures-channel", "dep:futures-util", "dep:h2"]
 
 # Client/Server
-client = ["dep:want"]
-server = ["dep:httpdate"]
+client = ["dep:want", "dep:pin-project-lite", "dep:smallvec"]
+server = ["dep:httpdate", "dep:pin-project-lite", "dep:smallvec"]
 
 # C-API support (currently unstable (no semver))
-ffi = ["dep:libc", "full", "dep:http-body-util"]
+ffi = ["dep:libc", "full", "dep:http-body-util", "futures-util?/alloc"]
 
 # Utilize tracing (currently unstable)
 tracing = ["dep:tracing"]
 
 # internal features used in CI
 nightly = []
 
+[lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = [
+    'cfg(hyper_unstable_tracing)',
+    'cfg(hyper_unstable_ffi)'
+]
+
 [package.metadata.docs.rs]
 features = ["ffi", "full", "tracing"]
-rustdoc-args = ["--cfg", "docsrs", "--cfg", "hyper_unstable_ffi", "--cfg", "hyper_unstable_tracing"]
+rustdoc-args = ["--cfg", "hyper_unstable_ffi", "--cfg", "hyper_unstable_tracing"]
 
 [package.metadata.playground]
 features = ["full"]

benches/end_to_end.rs

@@ -413,6 +413,7 @@ fn spawn_server(rt: &tokio::runtime::Runtime, opts: &Opts) -> SocketAddr {
     let body = opts.response_body;
     let opts = opts.clone();
     rt.spawn(async move {
+        let _ = &opts;
         while let Ok((sock, _)) = listener.accept().await {
             let io = support::TokioIo::new(sock);
             if opts.http2 {

benches/support/tokiort.rs

@@ -1,7 +1,6 @@
 #![allow(dead_code)]
 //! Various runtimes for hyper
 use std::{
-    future::Future,
     pin::Pin,
     task::{Context, Poll},
     time::{Duration, Instant},
@@ -24,7 +23,6 @@ where
 }
 
 /// A Timer that uses the tokio runtime.
-
 #[derive(Clone, Debug)]
 pub struct TokioTimer;
 
@@ -44,18 +42,10 @@ impl Timer for TokioTimer {
     }
 }
 
-struct TokioTimeout<T> {
-    inner: Pin<Box<tokio::time::Timeout<T>>>,
-}
-
-impl<T> Future for TokioTimeout<T>
-where
-    T: Future,
-{
-    type Output = Result<T::Output, tokio::time::error::Elapsed>;
-
-    fn poll(mut self: Pin<&mut Self>, context: &mut Context<'_>) -> Poll<Self::Output> {
-        self.inner.as_mut().poll(context)
+impl TokioTimer {
+    /// Create a new TokioTimer
+    pub fn new() -> Self {
+        Self {}
     }
 }
 

capi/include/hyper.h

@@ -807,5 +807,5 @@ void hyper_waker_free(struct hyper_waker *waker);
 void hyper_waker_wake(struct hyper_waker *waker);
 
 #ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
+}  // extern "C"
+#endif  // __cplusplus

docs/CODE_STYLE.md

@@ -8,10 +8,10 @@ hyper uses the default configuration of `rustfmt`.
 
 ```txt
 # Mac or Linux
-rustfmt --check --edition 2018 $(git ls-files '*.rs')
+rustfmt --check --edition 2021 $(git ls-files '*.rs')
 
 # Powershell
-Get-ChildItem . -Filter "*.rs" -Recurse | foreach { rustfmt --check --edition 2018 $_.FullName }
+Get-ChildItem . -Filter "*.rs" -Recurse | foreach { rustfmt --check --edition 2021 $_.FullName }
 ```
 
 > **NOTE**: If you are using `rust-analyzer`, you can add the following two lines in your `settings.json` to make sure the features get taken into account when checking the project:

docs/MAINTAINERS.md

@@ -6,9 +6,6 @@ To see what these roles do, and how to become one, look at [GOVERNANCE](./GOVERN
 
 - Eray Karatay (@programatik29)
 - Oddbjørn Grødem (@oddgrd)
-- Noah Kennedy (@Noah-Kennedy)
-- tottoto (@tottoto)
-- dswij (@dswij)
 
 ## Collaborators
 
@@ -20,6 +17,9 @@ To see what these roles do, and how to become one, look at [GOVERNANCE](./GOVERN
 - Anthony Ramine (@nox)
 - David Pedersen (@davidpdrsn)
 - Adam Foltzer (@acfoltzer)
+- Noah Kennedy (@Noah-Kennedy)
+- dswij (@dswij)
+- tottoto (@tottoto)
 
 <details>
 <summary>Emeriti</summary>

examples/hello.rs

@@ -53,7 +53,7 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
             // Handle the connection from the client using HTTP1 and pass any
             // HTTP requests received on that connection to the `hello` function
             if let Err(err) = http1::Builder::new()
-                .timer(TokioTimer)
+                .timer(TokioTimer::new())
                 .serve_connection(io, service_fn(hello))
                 .await
             {

examples/send_file.rs

@@ -49,7 +49,7 @@ async fn response_examples(
     match (req.method(), req.uri().path()) {
         (&Method::GET, "/") | (&Method::GET, "/index.html") => simple_file_send(INDEX).await,
         (&Method::GET, "/no_file.html") => {
-            // Test what happens when file cannot be be found
+            // Test what happens when file cannot be found
             simple_file_send("this_file_should_not_exist.html").await
         }
         _ => Ok(not_found()),

examples/service_struct_impl.rs

@@ -65,8 +65,7 @@ impl Service<Request<IncomingBody>> for Svc {
                 "authors extraordinare! counter = {:?}",
                 self.counter
             )),
-            // Return the 404 Not Found for other routes, and don't increment counter.
-            _ => return Box::pin(async { mk_response("oh no! not found".into()) }),
+            _ => mk_response("oh no! not found".into()),
         };
 
         Box::pin(async { res })