From e7a848a3dbca276fc439833e5e6ed62aac023e1a Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 20 Jul 2018 11:22:10 +0100
Subject: [PATCH] mod_ssl: fix OCSP regression (upstream r1555631)

---
 httpd-2.4.34-r1555631.patch | 14 ++++++++++++++
 httpd.spec                  |  7 ++++++-
 pullrev.sh                  |  4 ++--
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 httpd-2.4.34-r1555631.patch

diff --git a/httpd-2.4.34-r1555631.patch b/httpd-2.4.34-r1555631.patch
new file mode 100644
index 0000000..7ca9478
--- /dev/null
+++ b/httpd-2.4.34-r1555631.patch
@@ -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 {
diff --git a/httpd.spec b/httpd.spec
index e2e8e86..c90d5c5 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.34
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -78,6 +78,7 @@ Patch36: httpd-2.4.33-r1830819+.patch
 # Bug fixes
 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
 Patch58: httpd-2.4.34-r1738878.patch
+Patch59: httpd-2.4.34-r1555631.patch
 
 # Security fixes
 
@@ -235,6 +236,7 @@ interface for storing and accessing per-user session data.
 %patch36 -p1 -b .r1830819+
 
 %patch58 -p1 -b .r1738878
+%patch59 -p1 -b .r1555631
 
 # Patch in the vendor string
 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@@ -723,6 +725,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %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
 - update Obsoletes for mod_proxy_uswgi (#1599113)
 
diff --git a/pullrev.sh b/pullrev.sh
index e389b56..dbb97a5 100755
--- a/pullrev.sh
+++ b/pullrev.sh
@@ -6,8 +6,8 @@ if [ $# -lt 1 ]; then
 fi
 
 repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk"
-repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
-ver=2.4.33
+#repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
+ver=2.4.34
 prefix="httpd-${ver}"
 suffix="r$1${2:++}"
 fn="${prefix}-${suffix}.patch"