rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

mod_ssl: fix OCSP regression (upstream r1555631)

Browse Source
This commit is contained in:
Joe Orton 2018-07-20 11:22:10 +01:00
parent 84d2251c2d
commit e7a848a3db
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
httpd-2.4.34-r1555631.patch Normal file
View File

@ -0,0 +1,14 @@
# ./pullrev.sh 1555631
http://svn.apache.org/viewvc?view=revision&revision=1555631
--- httpd-2.4.34/modules/ssl/ssl_engine_ocsp.c
+++ httpd-2.4.34/modules/ssl/ssl_engine_ocsp.c
@@ -61,7 +61,7 @@
/* Use default responder URL if forced by configuration, else use
* certificate-specified responder, falling back to default if
* necessary and possible. */
- if (sc->server->ocsp_force_default) {
+ if (sc->server->ocsp_force_default == TRUE) {
s = sc->server->ocsp_responder;
}
else {

7
httpd.spec
View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.34 Version: 2.4.34
Release: 2%{?dist} Release: 3%{?dist}
URL: https://httpd.apache.org/ URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -78,6 +78,7 @@ Patch36: httpd-2.4.33-r1830819+.patch
# Bug fixes # Bug fixes
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
Patch58: httpd-2.4.34-r1738878.patch Patch58: httpd-2.4.34-r1738878.patch
Patch59: httpd-2.4.34-r1555631.patch
# Security fixes # Security fixes
@ -235,6 +236,7 @@ interface for storing and accessing per-user session data.
%patch36 -p1 -b .r1830819+ %patch36 -p1 -b .r1830819+
%patch58 -p1 -b .r1738878 %patch58 -p1 -b .r1738878
%patch59 -p1 -b .r1555631
# Patch in the vendor string # Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@ -723,6 +725,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Fri Jul 20 2018 Joe Orton <jorton@redhat.com> - 2.4.34-3
- mod_ssl: fix OCSP regression (upstream r1555631)
* Wed Jul 18 2018 Joe Orton <jorton@redhat.com> - 2.4.34-2 * Wed Jul 18 2018 Joe Orton <jorton@redhat.com> - 2.4.34-2
- update Obsoletes for mod_proxy_uswgi (#1599113) - update Obsoletes for mod_proxy_uswgi (#1599113)

4
pullrev.sh
View File

@ -6,8 +6,8 @@ if [ $# -lt 1 ]; then
fi fi
repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk" repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk"
repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x" #repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
ver=2.4.33 ver=2.4.34
prefix="httpd-${ver}" prefix="httpd-${ver}"
suffix="r$1${2:++}" suffix="r$1${2:++}"
fn="${prefix}-${suffix}.patch" fn="${prefix}-${suffix}.patch"