Skip to content

Fix ** not matching single path segment #504

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
michaelenger wants to merge 2 commits into from
Closed

Fix ** not matching single path segment #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24ad9df
Fix ** not matching single path element
michaelenger Sep 29, 2021
d93dbda
Update CHANGELOG
michaelenger Sep 29, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ All notable changes to this project will be documented in this file. Changes not
- Fix misspell `serialise`. ([#473](https://github.com/httpswift/swifter/pull/473)) by [@mtgto](https://github.com/mtgto)
- Fix an issue causing Danger was not working properly. ([#486](https://github.com/httpswift/swifter/pull/486)) by [@Vkt0r](https://github.com/Vkt0r)
- Set Swift version to 5.0 in podspec. ([#475](https://github.com/httpswift/swifter/pull/475)) by [@p-krasnobrovkin-tcs](https://github.com/p-krasnobrovkin-tcs)
- Fix \*\* not matching against a single path segment. ([#504](https://github.com/httpswift/swifter/pull/504)) by [@michaelenger](https://github.com/michaelenger)

## Changed

Expand Down
1 change: 0 additions & 1 deletion Xcode/Sources/HttpRouter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ open class HttpRouter {
}

let startStarNodeKeys = startStarNode.nodes.keys
currentIndex += 1
while currentIndex < count, let pathToken = pattern[currentIndex].removingPercentEncoding {
currentIndex += 1
if startStarNodeKeys.contains(pathToken) {
Expand Down
2 changes: 2 additions & 0 deletions Xcode/Tests/SwifterTestsHttpRouter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ class SwifterTestsHttpRouter: XCTestCase {
XCTAssertNil(router.route(nil, path: "/"))
XCTAssertNil(router.route(nil, path: "/a"))
XCTAssertNotNil(router.route(nil, path: "/a/b/c/d/e/f/g"))
XCTAssertNotNil(router.route(nil, path: "/a/b/e/f/g"))
XCTAssertNil(router.route(nil, path: "/a/e/f/g"))
XCTAssertNil(router.route(nil, path: "/a/b/c/f/g"))
}

func testHttpRouterMultiplePathSegmentWildcardTail() {
Expand Down