Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions http/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# unreleased 0.7.1
## Change
- update `socket2` to `0.6.0`
- update `tokio` to `1.47.1`
- update `h3` to `0.0.7`
- update `h3-quinn` to `0.0.9`

Expand Down
4 changes: 2 additions & 2 deletions http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ h3 = { version = "0.0.7", optional = true }
h3-quinn = { version = "0.0.9", optional = true }

# async runtime support.
tokio = { version = "1.30", features = ["rt", "time"], optional = true }
tokio = { version = "1.47.1", features = ["rt", "time"], optional = true }

# util service support
xitca-router = { version = "0.3.0", optional = true }
Expand All @@ -77,7 +77,7 @@ xitca-router = { version = "0.3.0", optional = true }
tokio-uring = { version = "0.5.0", features = ["bytes"], optional = true }

[target.'cfg(not(target_family = "wasm"))'.dependencies]
socket2 = { version = "0.5.1", features = ["all"] }
socket2 = { version = "0.6.0", features = ["all"] }

[dev-dependencies]
criterion = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion http/src/util/middleware/socket_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ impl<S> SocketConfigService<S> {
fn apply_config<'s>(&self, stream: impl Into<SockRef<'s>>) -> io::Result<()> {
let stream_ref = stream.into();

stream_ref.set_nodelay(self.config.nodelay)?;
stream_ref.set_tcp_nodelay(self.config.nodelay)?;

if let Some(ka) = self.config.ka.as_ref() {
stream_ref.set_tcp_keepalive(ka)?;
Expand Down
3 changes: 3 additions & 0 deletions server/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# unreleased
## Change
- update `socket2` to `0.6.0`
- update `tokio` to `1.47.1`

# 0.5.0
## Add
Expand Down
10 changes: 5 additions & 5 deletions server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ xitca-io = { version = "0.4.0", features = ["runtime"] }
xitca-service = { version = "0.3.0", features = ["alloc"] }
xitca-unsafe-collection = "0.2.0"

tokio = { version = "1.30", features = ["sync", "time"] }
tokio = { version = "1.47.1", features = ["sync", "time"] }
tracing = { version = "0.1.40", default-features = false }

# io-uring support
tokio-uring = { version = "0.5", optional = true }

[target.'cfg(not(target_family = "wasm"))'.dependencies]
socket2 = { version = "0.5.1" }
tokio = { version = "1.30", features = ["rt-multi-thread", "signal"] }
socket2 = { version = "0.6.0" }
tokio = { version = "1.47.1", features = ["rt-multi-thread", "signal"] }

[target.'cfg(target_family = "wasm")'.dependencies]
tokio = { version = "1.30", features = ["rt"] }
tokio = { version = "1.47.1", features = ["rt"] }

[dev-dependencies]
bytes = "1.4"
tokio = { version = "1.30", features = ["io-util", "macros"] }
tokio = { version = "1.47.1", features = ["io-util", "macros"] }