\r delimiter

swhitty · Nov 20, 2023 · 69896c8 · 69896c8
1 parent 5c1dd51
commit 69896c8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/FlyingFox/Sources/MultipartForm/DelimitedDataIterator.swift b/FlyingFox/Sources/MultipartForm/DelimitedDataIterator.swift
@@ -76,7 +76,7 @@ struct DelimitedDataIterator<I: AsyncIteratorProtocol> where I.Element == Data {
         let slice = Data(buffer[..<range.startIndex])
         buffer = Data(buffer[range.endIndex...])
 
-        return slice.isEmpty ? nil : slice
+        return slice
     }
 
     mutating func next() async throws -> Data? {

diff --git a/FlyingFox/Sources/MultipartForm/FormDataSequence.swift b/FlyingFox/Sources/MultipartForm/FormDataSequence.swift
@@ -53,11 +53,11 @@ public struct FormDataSequence<S: AsyncSequence & Sendable>: Sendable, AsyncSequ
     public static func make(body: S, boundary: String) async throws -> Self {
         var delimiter = DelimitedDataIterator(
             iterator: body.makeAsyncIterator(),
-            delimiter: "\n--\(boundary)".data(using: .utf8)!
+            delimiter: "\r\n--\(boundary)".data(using: .utf8)!
         )
         // consume first delimiter
         _ = try await delimiter.nextUntil("--\(boundary)".data(using: .utf8)!)
-        try await delimiter.consumeNext(of: "\n", "--")
+        try await delimiter.consumeNext(of: "\r\n", "--")
         return FormDataSequence(delimiter: delimiter)
     }
 
@@ -83,7 +83,7 @@ public struct FormDataSequence<S: AsyncSequence & Sendable>: Sendable, AsyncSequ
             }
 
             // todo `--` end sequence
-            try await iterator.consumeNext(of: "\n", "--")
+            try await iterator.consumeNext(of: "\r\n", "--")
 
             return FormData(
                 headers: headers,
@@ -105,7 +105,7 @@ extension DelimitedDataIterator {
     }
 
     mutating func nextLine() async throws -> String? {
-        guard let data = try await nextUntil("\n".data(using: .utf8)!) else {
+        guard let data = try await nextUntil("\r\n".data(using: .utf8)!) else {
             return nil
         }
         return String(data: data, encoding: .utf8)!

diff --git a/FlyingFox/Tests/MultipartForm/FormDataSequenceTests.swift b/FlyingFox/Tests/MultipartForm/FormDataSequenceTests.swift
@@ -41,20 +41,20 @@ final class FormDataSequenceTests: XCTestCase {
         let request = HTTPRequest.make(
             headers: [.contentType: "multipart/form-data; boundary=**ZZ"],
             body: #"""
-            --**ZZ
-            Content-Disposition: form-data; name="text1"
-            Content-Type: text/plain
-
-            Fish & Chips
-            --**ZZ
-            Content-Disposition: form-data; name="text2"
-
+            --**ZZ\#r
+            Content-Disposition: form-data; name="text1"\#r
+            Content-Type: text/plain\#r
+            \#r
+            Fish & Chips\#r
+            --**ZZ\#r
+            Content-Disposition: form-data; name="text2"\#r
+            \#r
             Shrimp
-            Scampi
-            --**ZZ
-            Content-Disposition: form-data; name="text3"
-
-            Ocean
+            Scampi\#r
+            --**ZZ\#r
+            Content-Disposition: form-data; name="text3"\#r
+            \#r
+            \#r
             --**ZZ--
             """#
         )
@@ -81,7 +81,7 @@ final class FormDataSequenceTests: XCTestCase {
                     headers: [
                         .contentDisposition: #"form-data; name="text3""#,
                     ],
-                    body: "Ocean"
+                    body: ""
                 )
             ]
         )