Skip to content

Keep request paths with dots inside segments on the fast path when extracting the path prefix #927

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

Merged
ok2c merged 1 commit into from
Nov 4, 2026
Merged

Keep request paths with dots inside segments on the fast path when extracting the path prefix #927

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
3 changes: 2 additions & 1 deletion httpclient5/src/main/java/org/apache/hc/client5/http/impl/RequestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ public static String extractPathPrefix(final HttpRequest request) {
requiresOptimization = true;
}
}
if (ch == '.' || ch != '/' && !UNRESERVED.get(ch)) {
// Only a dot at the start of a segment can begin a dot segment
if (ch == '.' && previous == '/' || ch != '/' && !UNRESERVED.get(ch)) {
requiresOptimization = true;
}
previous = ch;
Expand Down
14 changes: 14 additions & 0 deletions httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestRequestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,18 @@ void testPathPrefixExtraction() {
Assertions.assertEquals("/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "")));
}

@Test
void testPathPrefixExtractionDots() {
Assertions.assertEquals("/aaaa/b.b/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "/aaaa/b.b/cccc")));
Assertions.assertEquals("/aaaa/bbbb/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "/aaaa/bbbb/cc.cc")));
Assertions.assertEquals("/a.a/b..b/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "/a.a/b..b/c.")));
Assertions.assertEquals("/aaaa/.bbbb/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "/aaaa/.bbbb/cccc")));
Assertions.assertEquals("/aaaa/.../", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "/aaaa/.../cccc")));
Assertions.assertEquals("/aaaa/bbbb/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "/aaaa/./bbbb/cccc")));
Assertions.assertEquals("/aaaa/bbbb/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "/aaaa/bbbb/.")));
Assertions.assertEquals("/cccc/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "/aaaa/%2E%2E/cccc/dddd")));
Assertions.assertEquals("/aaaa/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "../aaaa/bbbb")));
Assertions.assertEquals("/foo.bar/", RequestSupport.extractPathPrefix(new BasicHttpRequest("GET", "foo.bar/baz")));
}

}
Loading