Merge r1930162 from trunk:

covener · covener · commit b636047ed46d · 2025-12-01T12:05:45.000Z
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
@@ -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 */
     }
 

Original file line number	Diff line number	Diff line change
`@@ -5673,8 +5673,8 @@ static apr_status_t check_unc(const char path, apr_pool_t p)`
`5673`	`5673`	`return APR_SUCCESS; /* this early, if we have a UNC, it's specified by an admin */`
`5674`	`5674`	`}`
`5675`	`5675`
`5676`		`- if (!path \|\| (path != ap_strstr_c(path, "\\\\") &&`
`5677`		`- path != ap_strstr_c(path, "//"))) {`
	`5676`	`+ if (!path \|\| !((path[0] == '\\' \|\| path[0] == '/')`
	`5677`	`+ && (path[1] == '\\' \|\| path[1] == '/'))) {`
`5678`	`5678`	`return APR_SUCCESS; /* not a UNC */`
`5679`	`5679`	`}`
`5680`	`5680`