Merge branch 'main' into jw-more-pcap

apple · Mar 22, 2023 · db4625a · db4625a
2 parents 8b63363 + 4569c69
commit db4625a
Show file tree

Hide file tree

Showing 52 changed files with 5,913 additions and 210 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
@@ -22,6 +22,7 @@ var targets: [PackageDescription.Target] = [
             "NIOPCAP",
             .product(name: "NIO", package: "swift-nio"),
             .product(name: "NIOCore", package: "swift-nio"),
+            .product(name: "NIOHTTP1", package: "swift-nio"),
         ]),
     .target(
         name: "NIOHTTPCompression",
@@ -116,6 +117,18 @@ var targets: [PackageDescription.Target] = [
             .product(name: "NIOCore", package: "swift-nio"),
             .product(name: "NIOPosix", package: "swift-nio"),
         ]),
+        name: "NIONFS3",
+        dependencies: [
+            .product(name: "NIOCore", package: "swift-nio"),
+        ]),
+    .testTarget(
+        name: "NIONFS3Tests",
+        dependencies: [
+            "NIONFS3",
+            .product(name: "NIOCore", package: "swift-nio"),
+            .product(name: "NIOEmbedded", package: "swift-nio"),
+            .product(name: "NIOTestUtils", package: "swift-nio"),
+        ]),
 ]
 
 let package = Package(

diff --git a/[email protected] b/[email protected]
@@ -22,6 +22,7 @@ var targets: [PackageDescription.Target] = [
             "NIOPCAP",
             .product(name: "NIO", package: "swift-nio"),
             .product(name: "NIOCore", package: "swift-nio"),
+            .product(name: "NIOHTTP1", package: "swift-nio")
         ]),
     .target(
         name: "NIOHTTPCompression",
@@ -116,6 +117,17 @@ var targets: [PackageDescription.Target] = [
             .product(name: "NIOCore", package: "swift-nio"),
             .product(name: "NIOPosix", package: "swift-nio"),
         ]),
+        name: "NIONFS3",
+        dependencies: [
+            .product(name: "NIOCore", package: "swift-nio"),
+        ]),
+    .testTarget(
+        name: "NIONFS3Tests",
+        dependencies: [
+            "NIONFS3",
+            .product(name: "NIOCore", package: "swift-nio"),
+            .product(name: "NIOTestUtils", package: "swift-nio"),
+        ]),
 ]
 
 let package = Package(