[httpd] load mod_macro by default (#998452)
jorton
jorton at fedoraproject.org
Mon Oct 21 19:17:50 UTC 2013
commit aa55b1c6dd6d51e5fdee1cdeca7e90fa04c66f29
Author: Joe Orton <jorton at redhat.com>
Date: Mon Oct 21 20:17:46 2013 +0100
load mod_macro by default (#998452)
- add README to conf.modules.d
- mod_proxy_http: add possible fix for threading issues (r1534321)
- core: add fix for truncated output with CGI scripts (r1530793)
Resolves: rhbz#998452
00-base.conf | 1 +
README.confmod | 9 +++++++++
httpd-2.4.6-r1530793.patch | 17 +++++++++++++++++
httpd-2.4.6-r1534321.patch | 15 +++++++++++++++
httpd.spec | 16 +++++++++++++++-
5 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/00-base.conf b/00-base.conf
index 31d979f..4242d12 100644
--- a/00-base.conf
+++ b/00-base.conf
@@ -40,6 +40,7 @@ LoadModule include_module modules/mod_include.so
LoadModule info_module modules/mod_info.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule logio_module modules/mod_logio.so
+LoadModule macro_module modules/mod_macro.so
LoadModule mime_magic_module modules/mod_mime_magic.so
LoadModule mime_module modules/mod_mime.so
LoadModule negotiation_module modules/mod_negotiation.so
diff --git a/README.confmod b/README.confmod
new file mode 100644
index 0000000..d33d1d4
--- /dev/null
+++ b/README.confmod
@@ -0,0 +1,9 @@
+
+This directory holds configuration files for the Apache HTTP Server;
+any files in this directory which have the ".conf" extension will be
+processed as httpd configuration files. This directory contains
+configuration fragments necessary only to load modules.
+Administrators should use the directory "/etc/httpd/conf.d" to modify
+the configuration of httpd, or any modules.
+
+Files are processed in alphanumeric order.
diff --git a/httpd-2.4.6-r1530793.patch b/httpd-2.4.6-r1530793.patch
new file mode 100644
index 0000000..6e6ad30
--- /dev/null
+++ b/httpd-2.4.6-r1530793.patch
@@ -0,0 +1,17 @@
+# ./pullrev.sh 1530793
+
+http://svn.apache.org/viewvc?view=revision&revision=1530793
+
+--- httpd-2.4.6/server/core_filters.c
++++ httpd-2.4.6/server/core_filters.c
+@@ -779,7 +779,9 @@
+ pollset.reqevents = APR_POLLOUT;
+ pollset.desc.s = s;
+ apr_socket_timeout_get(s, &timeout);
+- rv = apr_poll(&pollset, 1, &nsds, timeout);
++ do {
++ rv = apr_poll(&pollset, 1, &nsds, timeout);
++ } while (APR_STATUS_IS_EINTR(rv));
+ if (rv != APR_SUCCESS) {
+ break;
+ }
diff --git a/httpd-2.4.6-r1534321.patch b/httpd-2.4.6-r1534321.patch
new file mode 100644
index 0000000..f165838
--- /dev/null
+++ b/httpd-2.4.6-r1534321.patch
@@ -0,0 +1,15 @@
+# ./pullrev.sh 1534321
+
+http://svn.apache.org/viewvc?view=revision&revision=1534321
+
+--- httpd-2.4.6/modules/proxy/mod_proxy_http.c
++++ httpd-2.4.6/modules/proxy/mod_proxy_http.c
+@@ -710,7 +710,7 @@
+ force10 = 0;
+ }
+
+- header_brigade = apr_brigade_create(p, origin->bucket_alloc);
++ header_brigade = apr_brigade_create(p, bucket_alloc);
+ rv = ap_proxy_create_hdrbrgd(p, header_brigade, r, p_conn,
+ worker, conf, uri, url, server_portstr,
+ &old_cl_val, &old_te_val);
diff --git a/httpd.spec b/httpd.spec
index 8315ff6..6fdb368 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.6
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -43,6 +43,7 @@ Source24: 00-systemd.conf
Source25: 01-session.conf
# Documentation
Source30: README.confd
+Source31: README.confmod
Source40: htcacheclean.service
Source41: htcacheclean.sysconf
# build/scripts patches
@@ -65,6 +66,8 @@ Patch31: httpd-2.4.6-sslmultiproxy.patch
Patch51: httpd-2.4.3-sslsninotreq.patch
Patch55: httpd-2.4.4-malformed-host.patch
Patch56: httpd-2.4.4-mod_unique_id.patch
+Patch57: httpd-2.4.6-r1530793.patch
+Patch58: httpd-2.4.6-r1534321.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -190,6 +193,8 @@ interface for storing and accessing per-user session data.
%patch51 -p1 -b .sninotreq
%patch55 -p1 -b .malformedhost
%patch56 -p1 -b .uniqueid
+%patch57 -p1 -b .r1530793
+%patch58 -p1 -b .r1534321
# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@@ -279,6 +284,8 @@ mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d
install -m 644 $RPM_SOURCE_DIR/README.confd \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
+install -m 644 $RPM_SOURCE_DIR/README.confmod \
+ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README
for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
00-proxy.conf 00-ssl.conf 01-ldap.conf 00-proxyhtml.conf \
01-ldap.conf 00-systemd.conf 01-session.conf; do
@@ -505,6 +512,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/httpd/conf.d
%{_sysconfdir}/httpd/conf.d/README
+%{_sysconfdir}/httpd/conf.modules.d/README
%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
%exclude %{_sysconfdir}/httpd/conf.d/ssl.conf
%exclude %{_sysconfdir}/httpd/conf.d/manual.conf
@@ -613,6 +621,12 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Mon Oct 21 2013 Joe Orton <jorton at redhat.com> - 2.4.6-4
+- load mod_macro by default (#998452)
+- add README to conf.modules.d
+- mod_proxy_http: add possible fix for threading issues (r1534321)
+- core: add fix for truncated output with CGI scripts (r1530793)
+
* Thu Oct 10 2013 Jan Kaluza <jkaluza at redhat.com> - 2.4.6-3
- require fedora-logos-httpd (#1009162)
More information about the scm-commits
mailing list