From: Eric Covener Date: Mon, 1 Dec 2025 12:05:45 +0000 (+0000) Subject: Merge r1930162 from trunk: X-Git-Tag: 2.4.66-rc1-candidate~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b636047ed46dd01cd4359fa29ef8dece108e3385;p=thirdparty%2Fapache%2Fhttpd.git Merge r1930162 from trunk: cover mixed slashes, simplify git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1930166 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/core.c b/server/core.c index fbda9b6dbe..925bb23018 100644 --- a/server/core.c +++ b/server/core.c @@ -5673,8 +5673,8 @@ static apr_status_t check_unc(const char *path, apr_pool_t *p) return APR_SUCCESS; /* this early, if we have a UNC, it's specified by an admin */ } - if (!path || (path != ap_strstr_c(path, "\\\\") && - path != ap_strstr_c(path, "//"))) { + if (!path || !((path[0] == '\\' || path[0] == '/') + && (path[1] == '\\' || path[1] == '/'))) { return APR_SUCCESS; /* not a UNC */ }