Skip to content

Avoid FoundationNetworking and libcurl on non-Darwin platforms #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Avoid FoundationNetworking and libcurl on non-Darwin platforms #681

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
66353a1
Replace uses of `Data(contentsOf:)` with `FileHandle`
MaxDesiatov Aug 2, 2023
0db65fa
Remove remaining `import FoundationNetworking` lines
MaxDesiatov Aug 2, 2023
c1b5529
Clean up uses of `URLRequest` and `URLResponse`
MaxDesiatov Aug 2, 2023
992d221
Fix needlessly prepending request path
MaxDesiatov Aug 2, 2023
58a5d0e
Fix default content type test failure
MaxDesiatov Aug 2, 2023
f042a68
Use throwing `readToEnd` for debugging and error handling
MaxDesiatov Aug 2, 2023
71fe790
Bump swift-http-types to 0.2.1
MaxDesiatov Aug 2, 2023
8c4e6d0
Apply suggestions from code review
MaxDesiatov Aug 2, 2023
fb38bef
Update copyright year, refine error handling
MaxDesiatov Aug 2, 2023
f2b5908
Check for uses of `FoundationNetworking` in `./bin/test`
MaxDesiatov Aug 2, 2023
ea5bccb
Replace `FileSystemError` with `CocoaError`
MaxDesiatov Aug 2, 2023
98561ac
Remove broken import from `FilesAndFolders.swift`
MaxDesiatov Aug 2, 2023
30500a0
Merge branch 'main' into maxd/avoid-foundationnetworking
MaxDesiatov Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix default content type test failure
  • Loading branch information
@MaxDesiatov
MaxDesiatov committed Aug 2, 2023
commit 58a5d0ee746095232f7e5a2c897f76f0ea82dfef
2 changes: 1 addition & 1 deletion Sources/SwiftDocC/Servers/FileServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class FileServer {
if let data = data {
response = .init(status: .ok, headerFields: [.contentType: mimeType, .contentLength: "\(data.count)"])
} else {
response = .init(status: .ok, headerFields: [.contentType: mimeType])
response = .init(status: .ok, headerFields: [.contentType: "application/octet-stream"])
}

return (response, data)
Expand Down
7 changes: 0 additions & 7 deletions Tests/SwiftDocCTests/Servers/FileServerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,7 @@ class FileServerTests: XCTestCase {

let failingRequest = HTTPRequest(path: "/not/found.jpg")
(response, data) = fileServer.response(to: failingRequest)
XCTAssertNil(data)
// Initializing a URLResponse with `nil` as MIME type in Linux returns nil
#if os(Linux) || os(Android) || os(Windows)
XCTAssertNil(response.mimeType)
#else
// Doing the same in macOS or iOS returns the default MIME type
XCTAssertEqual(response.mimeType, "application/octet-stream")
#endif
}

func testRedirectToHome() {
Expand Down