Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New configuration parameter for HTTP2 maxFrameSize. #1253

Merged
merged 1 commit into from
Sep 8, 2021
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
4 changes: 4 additions & 0 deletions Sources/GRPC/GRPCServerPipelineConfigurator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ final class GRPCServerPipelineConfigurator: ChannelInboundHandler, RemovableChan
parameter: .maxHeaderListSize,
value: HPACKDecoder.defaultMaxHeaderListSize
),
HTTP2Setting(
parameter: .maxFrameSize,
value: self.configuration.httpMaxFrameSize
),
]
)
}
Expand Down
14 changes: 14 additions & 0 deletions Sources/GRPC/Server.swift
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,14 @@ extension Server {
}
}

/// The HTTP/2 max frame size. Defaults to 16384. Value is clamped between 2^14 and 2^24-1
/// octets inclusive (the minimum and maximum allowable values - HTTP/2 RFC 7540 4.2).
public var httpMaxFrameSize: Int = 16384 {
didSet(httpMaxFrameSize) {
self.httpMaxFrameSize = httpMaxFrameSize.clamped(to: 16384 ... 16_777_215)
}
}

/// The root server logger. Accepted connections will branch from this logger and RPCs on
/// each connection will use a logger branched from the connections logger. This logger is made
/// available to service providers via `context`. Defaults to a no-op logger.
Expand Down Expand Up @@ -447,3 +455,9 @@ private extension ServerBootstrapProtocol {
}
}
}

extension Comparable {
fileprivate func clamped(to range: ClosedRange<Self>) -> Self {
return min(max(self, range.lowerBound), range.upperBound)
}
}
8 changes: 8 additions & 0 deletions Sources/GRPC/ServerBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,14 @@ extension Server.Builder {
}
}

extension Server.Builder {
@discardableResult
public func withHTTPMaxFrameSize(_ httpMaxFrameSize: Int) -> Self {
self.configuration.httpMaxFrameSize = httpMaxFrameSize
return self
}
}

extension Server.Builder {
/// Sets the root server logger. Accepted connections will branch from this logger and RPCs on
/// each connection will use a logger branched from the connections logger. This logger is made
Expand Down