diff options
author | Luboš Uhliarik <luhliari@redhat.com> | 2017-03-30 15:32:35 +0200 |
---|---|---|
committer | Luboš Uhliarik <luhliari@redhat.com> | 2017-03-30 15:32:35 +0200 |
commit | c58fda3be9f940c95777808718708cf2b1601502 (patch) | |
tree | afb76595121c098e8f8c5b22406a371a46daa04b /httpd.spec | |
parent | c79ba20a8d846af5f884ec33930d234bab667899 (diff) | |
download | httpd-c58fda3be9f940c95777808718708cf2b1601502.tar.gz httpd-c58fda3be9f940c95777808718708cf2b1601502.tar.xz httpd-c58fda3be9f940c95777808718708cf2b1601502.zip |
Resolves: #1397243 - Backport Apache Bug 53098 - mod_proxy_ajp:
patch to set worker secret passed to tomcat
Diffstat (limited to 'httpd.spec')
-rw-r--r-- | httpd.spec | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.25 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -68,6 +68,8 @@ Patch57: httpd-2.4.10-sigint.patch Patch58: httpd-2.4.25-r1778319+.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1434916 Patch59: httpd-2.4.25-r1787141.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1397243 +Patch60: httpd-2.4.25-r1738878.patch # Security fixes License: ASL 2.0 @@ -215,7 +217,8 @@ interface for storing and accessing per-user session data. %patch56 -p1 -b .uniqueid %patch57 -p1 -b .sigint %patch58 -p1 -b .r1778319+ -%patch59 -p1 -b .č1787141 +%patch59 -p1 -b .r1787141 +%patch60 -p1 -b .r1738878 # Patch in the vendor string sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h @@ -687,6 +690,10 @@ rm -rf $RPM_BUILD_ROOT %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed Mar 29 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-7 +- Resolves: #1397243 - Backport Apache Bug 53098 - mod_proxy_ajp: + patch to set worker secret passed to tomcat + * Tue Mar 28 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-6 - Resolves: #1434916 - httpd.service: Failed with result timeout |