From: Ben Laurie <ben@apache.org>
Date: Sun, 9 Dec 2001 17:48:52 +0000 (+0000)
Subject: Reduce magic levels.
X-Git-Tag: 2.0.30~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56fcba71d3240f7b08bc07ac42e83c1b340acbaa;p=apache

Reduce magic levels.


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

diff --git a/server/request.c b/server/request.c
index 75c1e6fb06..fe9ae3a845 100644
--- a/server/request.c
+++ b/server/request.c
@@ -618,12 +618,14 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r)
             int res;
             char *seg_name;
             char *delim;
+	    int temp_slash=0;
         
             /* We have no trailing slash, but we sure would appreciate one...
              */
             if (sec_idx && r->filename[filename_len-1] != '/') {
                 r->filename[filename_len++] = '/';
                 r->filename[filename_len] = 0;
+		temp_slash=1;
             }
 
             /* Begin *this* level by looking for matching <Directory> sections
@@ -791,7 +793,7 @@ minimerge2:
 
             /* That temporary trailing slash was useful, now drop it.
              */
-            if (seg > startseg) {
+            if (temp_slash) {
                 r->filename[--filename_len] = '\0';
             }