Merge branch 'main' into jw-nfs3

apple · Jan 27, 2023 · 3df654b · 3df654b
2 parents 55d7b4a + 98378d1
commit 3df654b
Show file tree

Hide file tree

Showing 13 changed files with 860 additions and 137 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -32,3 +32,14 @@ This product contains a derivation of the Tony Stone's 'process_test_files.rb'.
     * https://www.apache.org/licenses/LICENSE-2.0
   * HOMEPAGE:
     * https://codegists.com/snippet/ruby/generate_xctest_linux_runnerrb_tonystone_ruby
+
+---
+
+This product contains a derivation of "HTTP1ProxyConnectHandler.swift" and accompanying tests from AsyncHTTPClient.
+
+  * LICENSE (Apache License 2.0):
+    * https://www.apache.org/licenses/LICENSE-2.0
+  * HOMEPAGE:
+    * https://github.com/swift-server/async-http-client
+
+---
diff --git a/Package.swift b/Package.swift
@@ -21,6 +21,7 @@ var targets: [PackageDescription.Target] = [
         dependencies: [
             .product(name: "NIO", package: "swift-nio"),
             .product(name: "NIOCore", package: "swift-nio"),
+            .product(name: "NIOHTTP1", package: "swift-nio"),
         ]),
     .target(
         name: "NIOHTTPCompression",

diff --git a/[email protected] b/[email protected]
@@ -21,6 +21,7 @@ var targets: [PackageDescription.Target] = [
         dependencies: [
             .product(name: "NIO", package: "swift-nio"),
             .product(name: "NIOCore", package: "swift-nio"),
+            .product(name: "NIOHTTP1", package: "swift-nio")
         ]),
     .target(
         name: "NIOHTTPCompression",