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

Author: bossmc

.github/workflows/CI.yml

@@ -23,6 +23,7 @@ jobs:
       - features
       - ffi
       - ffi-header
+      - ffi-cargo-c
       - doc
       - check-external-types
       - udeps
@@ -104,9 +105,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - uses: dtolnay/rust-toolchain@stable
+
+      - name: Resolve MSRV aware dependencies
+        run: cargo update
+        env:
+          CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
+
       - name: Get MSRV from package metadata
         id: msrv
-        run: grep rust-version Cargo.toml | cut -d'"' -f2 | sed 's/^/version=/' >> $GITHUB_OUTPUT
+        run: echo "version=$(yq '.package.rust-version' Cargo.toml)" >> $GITHUB_OUTPUT
 
       - name: Install Rust (${{ steps.msrv.outputs.version }})
         uses: dtolnay/rust-toolchain@master
@@ -115,11 +123,6 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
-      - name: Pin some dependencies
-        run: |
-          cargo update -p tokio --precise 1.38.1
-          cargo update -p tokio-util --precise 0.7.11
-
       - name: Check
         run: cargo check --features full
 
@@ -225,6 +228,31 @@ jobs:
       - name: Ensure that hyper.h is up to date
         run: ./capi/gen_header.sh --verify
 
+  ffi-cargo-c:
+    name: Test cargo-c support (FFI)
+    needs: [style]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Install cargo-c
+        env:
+          LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
+          CARGO_C_FILE: cargo-c-x86_64-unknown-linux-musl.tar.gz
+        run: |
+          curl -L $LINK/$CARGO_C_FILE | tar xz -C ~/.cargo/bin
+
+      - name: Build with cargo-c
+        env:
+          RUSTFLAGS: --cfg hyper_unstable_ffi
+        run: cargo cbuild --features client,http1,http2,ffi
+
   doc:
     name: Build docs
     needs: [style, test]
@@ -252,7 +280,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2024-05-01  # 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@v2

CHANGELOG.md

@@ -1,3 +1,50 @@
+## v1.6.0 (2025-01-28)
+
+
+#### Bug Fixes
+
+* **server:**
+  * start http1 header read timeout when conn is idle (#3828) ([10b09ffc](https://github.com/hyperium/hyper/commit/10b09ffc04a97bbc96444172b7c5e02665827c67), closes [#3780](https://github.com/hyperium/hyper/issues/3780), [#3781](https://github.com/hyperium/hyper/issues/3781))
+  * change `max_local_error_reset_streams` function to `&mut self` (#3820) ([e981a91e](https://github.com/hyperium/hyper/commit/e981a91e68aa92b0dee771362de771daa31c713e))
+
+
+#### Features
+
+* **ext:** add `ext::on_informational()` callback extension (#3818) ([8ce1fcfa](https://github.com/hyperium/hyper/commit/8ce1fcfae97611ace027b9e26717ae957b323f24), closes [#2565](https://github.com/hyperium/hyper/issues/2565))
+* **server:** add `http1::Builder::ignore_invalid_headers(bool)` option (#3824) ([3817a79b](https://github.com/hyperium/hyper/commit/3817a79b213f840302d7e27fac8508de9caada0f))
+
+
+#### Breaking Changes
+
+* `http2::Builder::max_local_error_reset_streams()` now takes `&mut self` and returns `&mut Self`. In practice, this shouldn't break almost anyone. It was the wrong receiver and return types.
+ ([e981a91e](https://github.com/hyperium/hyper/commit/e981a91e68aa92b0dee771362de771daa31c713e))
+
+
+### v1.5.2 (2024-12-16)
+
+
+#### Bug Fixes
+
+* **http1:**
+  * fix intermitent panic parsing partial headers (#3812) ([a131111f](https://github.com/hyperium/hyper/commit/a131111f9c3189bab36fed9f46872c88dc0d601e), closes [#3811](https://github.com/hyperium/hyper/issues/3811))
+  * skip debug assertion of content length for HEAD responses (#3795) ([eaf2267c](https://github.com/hyperium/hyper/commit/eaf2267cdc148604469fb09da22646f31710107a), closes [#3794](https://github.com/hyperium/hyper/issues/3794))
+
+
+#### Features
+
+* **ffi:** add cargo-c support (#3787) ([7f4a6826](https://github.com/hyperium/hyper/commit/7f4a68265cb897d15b04fc772639234554ba79e8), closes [#3786](https://github.com/hyperium/hyper/issues/3786))
+
+
+### v1.5.1 (2024-11-19)
+
+
+#### Bug Fixes
+
+* **http2:**
+  * pass proper value to h2 max_local_error_reset_streams ([4a20147a](https://github.com/hyperium/hyper/commit/4a20147a1b73003860a8391c4b89ccd8a78a832e))
+  * improve graceful shutdown during handshake (#3729) ([13b05943](https://github.com/hyperium/hyper/commit/13b0594348916b901ad7e1c838b9d90298db6af4))
+
+
 ## v1.5.0 (2024-10-15)
 
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "hyper"
-version = "1.5.0"
-description = "A fast and correct HTTP library."
+version = "1.6.0"
+description = "A protective and efficient HTTP library for all."
 readme = "README.md"
 homepage = "https://hyper.rs"
 documentation = "https://docs.rs/hyper"
@@ -31,10 +31,9 @@ futures-channel = { version = "0.3", optional = true }
 futures-util = { version = "0.3", default-features = false, optional = true }
 h2 = { version = "0.4.2", optional = true }
 http-body-util = { version = "0.1", optional = true }
-httparse = { version = "1.8", optional = true }
+httparse = { version = "1.9", 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 }
@@ -46,6 +45,7 @@ futures-channel = { version = "0.3", features = ["sink"] }
 futures-util = { version = "0.3", default-features = false, features = ["sink"] }
 http-body-util = "0.1"
 pretty_env_logger = "0.5"
+pin-project-lite = "0.2.4"
 spmc = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -80,7 +80,7 @@ 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", "futures-util?/alloc"]
+ffi = ["full", "dep:http-body-util", "futures-util?/alloc"]
 
 # Utilize tracing (currently unstable)
 tracing = ["dep:tracing"]
@@ -102,6 +102,13 @@ rustdoc-args = ["--cfg", "hyper_unstable_ffi", "--cfg", "hyper_unstable_tracing"
 [package.metadata.playground]
 features = ["full"]
 
+[package.metadata.capi.header]
+generation = false
+subdirectory = false
+
+[package.metadata.capi.install.include]
+asset = [{ from="capi/include/hyper.h" }]
+
 [profile.release]
 codegen-units = 1
 incremental = false

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2021 Sean McArthur
+Copyright (c) 2014-2025 Sean McArthur
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

benches/end_to_end.rs

@@ -82,7 +82,7 @@ fn http1_parallel_x10_req_10kb_100_chunks(b: &mut test::Bencher) {
 #[bench]
 #[ignore]
 fn http1_parallel_x10_res_1mb(b: &mut test::Bencher) {
-    let body = &[b'x'; 1024 * 1024 * 1];
+    let body = &[b'x'; 1024 * 1024];
     opts().parallel(10).response_body(body).bench(b)
 }
 
@@ -177,7 +177,7 @@ fn http2_parallel_x10_req_10kb_100_chunks_max_window(b: &mut test::Bencher) {
 
 #[bench]
 fn http2_parallel_x10_res_1mb(b: &mut test::Bencher) {
-    let body = &[b'x'; 1024 * 1024 * 1];
+    let body = &[b'x'; 1024 * 1024];
     opts()
         .http2()
         .parallel(10)

capi/README.md

@@ -15,3 +15,11 @@ The C API is part of the Rust library, but isn't compiled by default. Using `car
 ```
 RUSTFLAGS="--cfg hyper_unstable_ffi" cargo rustc --features client,http1,http2,ffi --crate-type cdylib
 ```
+
+### (Optional) With `cargo-c`
+
+If using `cargo-c`, you can build and install a shared library with the following command:
+
+```
+RUSTFLAGS="--cfg hyper_unstable_ffi" cargo cbuild --features client,http1,http2,ffi --release
+```

capi/gen_header.sh

@@ -11,11 +11,14 @@
 set -e
 
 CAPI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+header_file="$CAPI_DIR/include/hyper.h"
 header_file_backup="$CAPI_DIR/include/hyper.h.backup"
-
+verify_flag=$1
 function cleanup {
     rm -rf "$WORK_DIR" || true
-    rm "$header_file_backup" || true
+    if [[ "--verify" == "$verify_flag" ]]; then
+        rm "$header_file_backup" || true
+    fi
 }
 
 trap cleanup EXIT
@@ -28,7 +31,10 @@ if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then
     exit 1
 fi
 
-cp "$CAPI_DIR/include/hyper.h" "$header_file_backup"
+# backup hyper.h
+if [[ "--verify" == "$verify_flag" ]]; then
+    cp "$header_file" "$header_file_backup"
+fi
 
 # Expand just the ffi module
 if ! RUSTFLAGS='--cfg hyper_unstable_ffi' cargo expand --features ffi,server,client,http1,http2 ::ffi 2> $WORK_DIR/expand_stderr.err > $WORK_DIR/expanded.rs; then
@@ -39,13 +45,13 @@ fi
 if ! cbindgen \
     --config "$CAPI_DIR/cbindgen.toml" \
     --lockfile "$CAPI_DIR/../Cargo.lock" \
-    --output "$CAPI_DIR/include/hyper.h" \
+    --output "$header_file" \
     "${@}"\
     $WORK_DIR/expanded.rs 2> $WORK_DIR/cbindgen_stderr.err; then
     bindgen_exit_code=$?
-    if [[ "--verify" == "$1" ]]; then
+    if [[ "--verify" == "$verify_flag" ]]; then
         echo "Changes from previous header (old < > new)"
-        diff -u "$header_file_backup" "$CAPI_DIR/include/hyper.h"
+        diff -u "$header_file_backup" "$header_file"
     else
         echo "cbindgen failed:"
         cat $WORK_DIR/cbindgen_stderr.err