From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 8 Oct 2021 09:02:30 +0000 (+0000)
Subject: * Optimize performance by moving calculation of loop invariant out of the loop
X-Git-Tag: 2.5.0-alpha2-ci-test-only~760
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=861c15e03c41851de1157c15b9a4f737967cd5fc;p=thirdparty%2Fapache%2Fhttpd.git

* Optimize performance by moving calculation of loop invariant out of the loop

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894021 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/util.c b/server/util.c
index 6d0b67a3ed8..d3f3ac63c06 100644
--- a/server/util.c
+++ b/server/util.c
@@ -505,6 +505,7 @@ AP_DECLARE(int) ap_normalize_path(char *path, unsigned int flags)
     int ret = 1;
     apr_size_t l = 1, w = 1, n;
     int decode_unreserved = (flags & AP_NORMALIZE_DECODE_UNRESERVED) != 0;
+    int merge_slashes = (flags & AP_NORMALIZE_MERGE_SLASHES) != 0;
 
     if (!IS_SLASH(path[0])) {
         /* Besides "OPTIONS *", a request-target should start with '/'
@@ -549,7 +550,7 @@ AP_DECLARE(int) ap_normalize_path(char *path, unsigned int flags)
 
         if (w == 0 || IS_SLASH(path[w - 1])) {
             /* Collapse ///// sequences to / */
-            if ((flags & AP_NORMALIZE_MERGE_SLASHES) && IS_SLASH(path[l])) {
+            if (merge_slashes && IS_SLASH(path[l])) {
                 do {
                     l++;
                 } while (IS_SLASH(path[l]));