From 9c5d9117f56d16b1481d52ed9c9915762422f559 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 3 Oct 2017 10:05:16 +0100 Subject: [PATCH] Fix mismerge. --- httpd.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/httpd.spec b/httpd.spec index f03a98f..b845611 100644 --- a/httpd.spec +++ b/httpd.spec @@ -711,14 +711,14 @@ rm -rf $RPM_BUILD_ROOT - document httpd-init.service in httpd-init.service(8) * Wed Sep 20 2017 Stephen Gallagher - 2.4.27-8.1 -- Generate SSL certificates on service start, not %posttrans - -* Tue Sep 19 2017 Joe Orton - 2.4.27-8.1 -- move httpd.service.d, httpd.socket.d dirs to -filesystem +- Generate SSL certificates on service start, not %%posttrans * Thu Sep 21 2017 Jeroen van Meeuwen - 2.4.27-8 - Address CVE-2017-9798 by applying patch from upstream (#1490344) +* Tue Sep 19 2017 Joe Orton - 2.4.27-8.1 +- move httpd.service.d, httpd.socket.d dirs to -filesystem + * Wed Sep 13 2017 Joe Orton - 2.4.27-7 - add new content-length filter (upstream PR 61222)