From: Christian Couder Date: Tue, 19 May 2026 15:38:03 GMT Subject: [PATCH v3 3/8] urlmatch: add url_normalize_pattern() helper Message-ID: <20260519153808.494105-4-christian.couder@gmail.com> In-Reply-To: <20260519153808.494105-1-christian.couder@gmail.com> In a following commit, we will need to normalize a URL glob pattern (which may contain '*' in the host portion) and extract its component offsets (host, path, etc.) for separate matching. Let's export a dedicated helper function url_normalize_pattern() for that purpose. It works like url_normalize(), but passes allow_globs=true to the internal url_normalize_1(), so that '*' characters in the host are accepted rather than rejected. Signed-off-by: Christian Couder --- urlmatch.c | 5 +++++ urlmatch.h | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/urlmatch.c b/urlmatch.c index 989bc7eb8b..7e734e2660 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -440,6 +440,11 @@ char *url_normalize(const char *url, struct url_info *out_info) return url_normalize_1(url, out_info, false); } +char *url_normalize_pattern(const char *url, struct url_info *out_info) +{ + return url_normalize_1(url, out_info, true); +} + static size_t url_match_prefix(const char *url, const char *url_prefix, size_t url_prefix_len) diff --git a/urlmatch.h b/urlmatch.h index 5ba85cea13..32c5067f9b 100644 --- a/urlmatch.h +++ b/urlmatch.h @@ -36,6 +36,18 @@ struct url_info { char *url_normalize(const char *, struct url_info *); +/* + * Like url_normalize(), but also allows '*' glob characters in the host + * portion. Use this when normalizing URL patterns from user configuration. + * + * Note that '*' is a valid path character per RFC 3986 (as a sub-delim), + * so glob patterns using '*' in the path are also accepted. + * + * Returns a newly allocated normalized string and fills out_info if + * non-NULL, or NULL if the pattern is invalid. + */ +char *url_normalize_pattern(const char *url, struct url_info *out_info); + struct urlmatch_item { size_t hostmatch_len; size_t pathmatch_len; -- 2.54.0.134.gbbe8e27878.dirty