From: Joe Orton <jorton@apache.org>
Date: Tue, 5 Mar 2024 13:11:54 +0000 (+0000)
Subject: Merge r1915508 from trunk:
X-Git-Tag: 2.4.59-rc1-candidate~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c74ab99d6be465a0999df06db4c7478f2bb92973;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1915508 from trunk:

* support/htcacheclean.c (list_urls): Continue rather than stopping
  after listing a file for each subdirectory.

PR: 65091
Submitted by: Artem Egorenkov <aegorenkov.91 gmail.com>
Reviewed by: jorton, ylavic, jfclere



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916131 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/changes-entries/pr65091.txt b/changes-entries/pr65091.txt
new file mode 100644
index 00000000000..097077aa57a
--- /dev/null
+++ b/changes-entries/pr65091.txt
@@ -0,0 +1,4 @@
+  *) htcacheclean: In -a/-A mode, list all files per subdirectory
+     rather than only one. PR 65091.
+     [Artem Egorenkov <aegorenkov.91 gmail.com>]
+
diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index b4eabbf3488..57c5c5b7aff 100644
--- a/support/htcacheclean.c
+++ b/support/htcacheclean.c
@@ -558,8 +558,6 @@ static int list_urls(char *path, apr_pool_t *pool, apr_off_t round)
                                         }
                                     }
                                 }
-
-                                break;
                             }
                         }
                     }