Skip to content

Commit 55849b5

Browse files
committed
Merge branch 'dn-large-header-tests-http2' into dn-fix-large-header-request
2 parents 183f75e + 1ddafda commit 55849b5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Sources/AsyncHTTPClient/ConnectionPool/HTTP1/HTTP1ClientChannelHandler.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ final class HTTP1ClientChannelHandler: ChannelDuplexHandler {
6262
private let eventLoop: EventLoop
6363
private let connectionIdLoggerMetadata: Logger.MetadataValue
6464

65-
var onRequestCompleted: () -> Void = {}
65+
var onConnectionIdle: () -> Void = {}
6666
init(eventLoop: EventLoop, backgroundLogger: Logger, connectionIdLoggerMetadata: Logger.MetadataValue) {
6767
self.eventLoop = eventLoop
6868
self.backgroundLogger = backgroundLogger
@@ -285,7 +285,7 @@ final class HTTP1ClientChannelHandler: ChannelDuplexHandler {
285285
if shouldClose {
286286
context.close(promise: nil)
287287
} else {
288-
self.onRequestCompleted()
288+
self.onConnectionIdle()
289289
}
290290

291291
oldRequest.succeedRequest(buffer)
@@ -297,7 +297,7 @@ final class HTTP1ClientChannelHandler: ChannelDuplexHandler {
297297

298298
context.writeAndFlush(self.wrapOutboundOut(.end(nil)), promise: writePromise)
299299
case .informConnectionIsIdle:
300-
self.onRequestCompleted()
300+
self.onConnectionIdle()
301301
oldRequest.succeedRequest(buffer)
302302
}
303303

@@ -314,7 +314,7 @@ final class HTTP1ClientChannelHandler: ChannelDuplexHandler {
314314
oldRequest.fail(error)
315315

316316
case .informConnectionIsIdle:
317-
self.onRequestCompleted()
317+
self.onConnectionIdle()
318318
oldRequest.fail(error)
319319

320320
case .failWritePromise(let writePromise):

Sources/AsyncHTTPClient/ConnectionPool/HTTP1/HTTP1Connection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ final class HTTP1Connection {
137137
backgroundLogger: logger,
138138
connectionIdLoggerMetadata: "\(self.id)"
139139
)
140-
channelHandler.onRequestCompleted = {
140+
channelHandler.onConnectionIdle = {
141141
self.taskCompleted()
142142
}
143143

Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ internal final class HTTPBin<RequestHandler: ChannelInboundHandler> where
348348
switch self {
349349
case .http1_1, .http2(_, nil), .refuse:
350350
return [
351-
HTTP2Setting(parameter: .maxConcurrentStreams, value: 100),
351+
HTTP2Setting(parameter: .maxConcurrentStreams, value: 10),
352352
HTTP2Setting(parameter: .maxHeaderListSize, value: HPACKDecoder.defaultMaxHeaderListSize),
353353
]
354354
case .http2(_, .some(let customSettings)):

0 commit comments

Comments
 (0)