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

Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/httpd

Browse Source
This commit is contained in:
Lubos Uhliarik 2019-06-13 17:40:20 +02:00
commit 16a6314f81
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
httpd-2.4.39-r1861269.patch Normal file
View File

@ -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);

9
httpd.spec
View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.39 Version: 2.4.39
Release: 6%{?dist} Release: 7%{?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
@ -75,6 +75,7 @@ Patch34: httpd-2.4.17-socket-activation.patch
Patch36: httpd-2.4.38-r1830819+.patch Patch36: httpd-2.4.38-r1830819+.patch
Patch38: httpd-2.4.34-sslciphdefault.patch Patch38: httpd-2.4.34-sslciphdefault.patch
Patch39: httpd-2.4.37-sslprotdefault.patch Patch39: httpd-2.4.37-sslprotdefault.patch
Patch40: httpd-2.4.39-r1861269.patch
# Bug fixes # Bug fixes
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
@ -214,6 +215,7 @@ interface for storing and accessing per-user session data.
%patch36 -p1 -b .r1830819+ %patch36 -p1 -b .r1830819+
%patch38 -p1 -b .sslciphdefault %patch38 -p1 -b .sslciphdefault
%patch39 -p1 -b .sslprotdefault %patch39 -p1 -b .sslprotdefault
%patch40 -p1 -b .r1861269
%patch58 -p1 -b .r1738878 %patch58 -p1 -b .r1738878
%patch60 -p1 -b .enable-sslv3 %patch60 -p1 -b .enable-sslv3
@ -718,9 +720,12 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Thu Jun 13 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-6 * Thu Jun 13 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-7
- remove bundled mod_md module - remove bundled mod_md module
* Thu Jun 13 2019 Joe Orton <jorton@redhat.com> - 2.4.39-6
- mod_ssl: fix "httpd -L" (etc) before httpd-init.service runs
* Wed Jun 12 2019 Joe Orton <jorton@redhat.com> - 2.4.39-5 * Wed Jun 12 2019 Joe Orton <jorton@redhat.com> - 2.4.39-5
- fixes for StateDir directive (upstream r1857731, r1857731) - fixes for StateDir directive (upstream r1857731, r1857731)