Skip to content

Add definitions for the new HTTP QUERY method per RFC 10008 #3654

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

Open
gwynne wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add definitions for the new HTTP QUERY method per RFC 10008 #3654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Sources/NIOHTTP1/HTTPDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,8 @@ extension HTTPMethod {
return .UNSUBSCRIBE
case HTTP_PATCH:
return .PATCH
case HTTP_QUERY:
return .QUERY
case HTTP_PURGE:
return .PURGE
case HTTP_MKCALENDAR:
Expand Down
2 changes: 2 additions & 0 deletions Sources/NIOHTTP1/HTTPEncoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,8 @@ extension ByteBuffer {
self.writeStaticString("LINK")
case .PATCH:
self.writeStaticString("PATCH")
case .QUERY:
self.writeStaticString("QUERY")
case .TRACE:
self.writeStaticString("TRACE")
case .MKCOL:
Expand Down
1 change: 1 addition & 0 deletions Sources/NIOHTTP1/HTTPHeaderValidator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ extension HTTPMethod {
.BIND,
.LINK,
.PATCH,
.QUERY,
.TRACE,
.MKCOL,
.MERGE,
Expand Down
7 changes: 6 additions & 1 deletion Sources/NIOHTTP1/HTTPTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,7 @@ public enum HTTPMethod: Equatable, Sendable {
case MKCOL
case MERGE
case PURGE
case QUERY
case NOTIFY
case SEARCH
case UNLOCK
Expand All @@ -675,7 +676,7 @@ public enum HTTPMethod: Equatable, Sendable {
switch self {
case .TRACE:
return .no
case .POST, .PUT, .PATCH:
case .POST, .PUT, .PATCH, .QUERY:
return .yes
case .GET, .CONNECT, .OPTIONS, .HEAD, .DELETE:
fallthrough
Expand Down Expand Up @@ -1389,6 +1390,8 @@ extension HTTPMethod: RawRepresentable {
return "LINK"
case .PATCH:
return "PATCH"
case .QUERY:
return "QUERY"
case .TRACE:
return "TRACE"
case .MKCOL:
Expand Down Expand Up @@ -1464,6 +1467,8 @@ extension HTTPMethod: RawRepresentable {
self = .LINK
case "PATCH":
self = .PATCH
case "QUERY":
self = .QUERY
case "TRACE":
self = .TRACE
case "MKCOL":
Expand Down
2 changes: 2 additions & 0 deletions Tests/NIOHTTP1Tests/HTTPTypesTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ final class HTTPTypesTest: XCTestCase {
XCTAssertEqual(HTTPMethod.BIND.rawValue, "BIND")
XCTAssertEqual(HTTPMethod.LINK.rawValue, "LINK")
XCTAssertEqual(HTTPMethod.PATCH.rawValue, "PATCH")
XCTAssertEqual(HTTPMethod.QUERY.rawValue, "QUERY")
XCTAssertEqual(HTTPMethod.TRACE.rawValue, "TRACE")
XCTAssertEqual(HTTPMethod.MKCOL.rawValue, "MKCOL")
XCTAssertEqual(HTTPMethod.MERGE.rawValue, "MERGE")
Expand Down Expand Up @@ -67,6 +68,7 @@ final class HTTPTypesTest: XCTestCase {
XCTAssertEqual(HTTPMethod(rawValue: "BIND"), .BIND)
XCTAssertEqual(HTTPMethod(rawValue: "LINK"), .LINK)
XCTAssertEqual(HTTPMethod(rawValue: "PATCH"), .PATCH)
XCTAssertEqual(HTTPMethod(rawValue: "QUERY"), .QUERY)
XCTAssertEqual(HTTPMethod(rawValue: "TRACE"), .TRACE)
XCTAssertEqual(HTTPMethod(rawValue: "MKCOL"), .MKCOL)
XCTAssertEqual(HTTPMethod(rawValue: "MERGE"), .MERGE)
Expand Down