Skip to content

Commit 27737d6

Browse files
committed
enable support for HTTP/2
1 parent a1e5706 commit 27737d6

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

Sources/HTTPServer/Channels/HTTPServerDelegate.swift

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import HTTP
22
import NIOCore
33
import NIOPosix
4-
import NIOHTTP1
4+
import NIOHTTP2
55
import NIOSSL
66

77
public
@@ -30,19 +30,14 @@ extension HTTPServerDelegate
3030
{
3131
(channel:any Channel) -> EventLoopFuture<Void> in
3232

33-
let endpoint:ServerInterfaceHandler<Authority, Self> = .init(
34-
address: channel.remoteAddress,
35-
server: self)
36-
37-
38-
return channel.pipeline.addHandler(NIOSSLServerHandler.init(
39-
context: authority.tls))
40-
.flatMap
33+
channel.pipeline.addHandler(NIOSSLServerHandler.init(context: authority.tls))
34+
.flatMap
4135
{
42-
channel.pipeline.configureHTTPServerPipeline(withErrorHandling: true)
43-
.flatMap
36+
channel.configureCommonHTTPServerPipeline
4437
{
45-
channel.pipeline.addHandler(endpoint)
38+
$0.pipeline.addHandler(ServerInterfaceHandler<Authority, Self>.init(
39+
address: channel.remoteAddress,
40+
server: self))
4641
}
4742
}
4843
}

Sources/UnidocServer/Server/Server.CertificateError.swift

Lines changed: 0 additions & 7 deletions
This file was deleted.

Sources/UnidocServer/Server/Server.Options.Authority.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@ extension Server.Options.Authority
2929
let privateKey:NIOSSLPrivateKey =
3030
try .init(file: "\(directory)/privkey.pem", format: .pem)
3131

32-
let niossl:NIOSSLContext = try .init(configuration: .makeServerConfiguration(
32+
var configuration:TLSConfiguration = .makeServerConfiguration(
3333
certificateChain: certificates.map(NIOSSLCertificateSource.certificate(_:)),
34-
privateKey: .privateKey(privateKey)))
34+
privateKey: .privateKey(privateKey))
35+
36+
configuration.applicationProtocols = ["h2", "http/1.1"]
37+
38+
let niossl:NIOSSLContext = try .init(configuration: configuration)
3539

3640
switch self
3741
{

0 commit comments

Comments
 (0)