From f61dfedf8a250220f23a8f50f7a8197c73e613a4 Mon Sep 17 00:00:00 2001
From: aegorenk <aegorenk@redhat.com>
Date: Wed, 20 Jan 2021 15:46:18 +0100
Subject: [PATCH] prevent htcacheclean from while break when first file
 processed

---
 httpd-2.4.46-htcacheclean-dont-break.patch | 13 +++++++++++++
 httpd.spec                                 |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 httpd-2.4.46-htcacheclean-dont-break.patch

diff --git a/httpd-2.4.46-htcacheclean-dont-break.patch b/httpd-2.4.46-htcacheclean-dont-break.patch
new file mode 100644
index 0000000..e52318a
--- /dev/null
+++ b/httpd-2.4.46-htcacheclean-dont-break.patch
@@ -0,0 +1,13 @@
+diff --git a/support/htcacheclean.c b/support/htcacheclean.c
+index 958ba6d..0a7fe3c 100644
+--- a/support/htcacheclean.c
++++ b/support/htcacheclean.c
+@@ -557,8 +557,6 @@ static int list_urls(char *path, apr_pool_t *pool, apr_off_t round)
+                                         }
+                                     }
+                                 }
+-
+-                                break;
+                             }
+                         }
+                     }
diff --git a/httpd.spec b/httpd.spec
index 7828a0d..dd13440 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.46
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@@ -89,6 +89,7 @@ Patch44: httpd-2.4.46-lua-resume.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
 Patch60: httpd-2.4.43-enable-sslv3.patch
 Patch62: httpd-2.4.43-r1870095+.patch
+Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
 
 # Security fixes
 
@@ -238,6 +239,7 @@ written in the Lua programming language.
 
 %patch60 -p1 -b .enable-sslv3
 %patch62 -p1 -b .r1870095
+%patch63 -p1 -b .htcacheclean-dont-break
 
 # Patch in the vendor string
 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@@ -775,6 +777,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Wed Jan 20 2021 Artem Egorenkov <aegorenk@redhat.com> - 2.4.46-7
+- prevent htcacheclean from while break when first file processed
+
 * Thu Dec 17 2020 Joe Orton <jorton@redhat.com> - 2.4.46-6
 - move mod_lua to a subpackage
 - Recommends: both mod_lua and mod_http2