From 720c6f392bad265bb6f9b8be05d2a8de536b3289 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 13 Jun 2019 16:37:06 +0100 Subject: [PATCH] mod_ssl: fix "httpd -L" (etc) before httpd-init.service runs --- httpd-2.4.39-r1861269.patch | 24 ++++++++++++++++++++++++ httpd.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 httpd-2.4.39-r1861269.patch diff --git a/httpd-2.4.39-r1861269.patch b/httpd-2.4.39-r1861269.patch new file mode 100644 index 0000000..4142e3c --- /dev/null +++ b/httpd-2.4.39-r1861269.patch @@ -0,0 +1,24 @@ +# ./pullrev.sh r1861269 +http://svn.apache.org/viewvc?view=revision&revision=r1861269 + +Allows "httpd -L" etc to work before httpd-init.service has run, +if mod_ssl is installed. + +--- httpd-2.4.37/modules/ssl/ssl_engine_config.c ++++ httpd-2.4.37/modules/ssl/ssl_engine_config.c +@@ -904,8 +904,14 @@ + static const char *ssl_cmd_check_file(cmd_parms *parms, + const char **file) + { +- const char *filepath = ap_server_root_relative(parms->pool, *file); ++ const char *filepath; + ++ /* If only dumping the config, don't verify the paths */ ++ if (ap_state_query(AP_SQ_RUN_MODE) == AP_SQ_RM_CONFIG_DUMP) { ++ return NULL; ++ } ++ ++ filepath = ap_server_root_relative(parms->pool, *file); + if (!filepath) { + return apr_pstrcat(parms->pool, parms->cmd->name, + ": Invalid file path ", *file, NULL); diff --git a/httpd.spec b/httpd.spec index 9351fde..ab05228 100644 --- a/httpd.spec +++ b/httpd.spec @@ -13,7 +13,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.39 -Release: 5%{?dist} +Release: 6%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -76,6 +76,7 @@ Patch34: httpd-2.4.17-socket-activation.patch Patch36: httpd-2.4.38-r1830819+.patch Patch38: httpd-2.4.34-sslciphdefault.patch Patch39: httpd-2.4.37-sslprotdefault.patch +Patch40: httpd-2.4.39-r1861269.patch # Bug fixes # https://bugzilla.redhat.com/show_bug.cgi?id=1397243 @@ -227,6 +228,7 @@ interface for storing and accessing per-user session data. %patch36 -p1 -b .r1830819+ %patch38 -p1 -b .sslciphdefault %patch39 -p1 -b .sslprotdefault +%patch40 -p1 -b .r1861269 %patch58 -p1 -b .r1738878 %patch60 -p1 -b .enable-sslv3 @@ -737,6 +739,9 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Thu Jun 13 2019 Joe Orton - 2.4.39-6 +- mod_ssl: fix "httpd -L" (etc) before httpd-init.service runs + * Wed Jun 12 2019 Joe Orton - 2.4.39-5 - fixes for StateDir directive (upstream r1857731, r1857731)