[httpd/f19] update to 2.4.9
Jan Kaluža
jkaluza at fedoraproject.org
Wed Apr 9 07:16:24 UTC 2014
commit 2695ad3c432aa08ad33fb49dd53693f95ffa40fa
Author: Jan Kaluza <jkaluza at redhat.com>
Date: Wed Apr 9 09:16:10 2014 +0200
update to 2.4.9
- add support for SetHandler + proxy (#1078970)
- fix graceful restart using legacy actions
- conflict with pre-1.5.0 APR
.gitignore | 1 +
action-graceful.sh | 2 +-
httpd-2.4.4-dump-vhost-twice.patch | 45 ----
httpd-2.4.4-r1332643+.patch | 248 ----------------------
httpd-2.4.6-r1534321.patch | 15 --
httpd-2.4.7-sslsninotreq.patch | 76 -------
httpd-2.4.3-apxs.patch => httpd-2.4.9-apxs.patch | 8 +-
httpd-2.4.9-r1573626.patch | 29 +++
httpd.spec | 21 ++-
sources | 2 +-
10 files changed, 50 insertions(+), 397 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28521d6..dbc83cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ x86_64
/httpd-2.4.4.tar.bz2
/httpd-2.4.6.tar.bz2
/httpd-2.4.7.tar.bz2
+/httpd-2.4.9.tar.bz2
diff --git a/action-graceful.sh b/action-graceful.sh
index 3d28f0e..dc68b2e 100644
--- a/action-graceful.sh
+++ b/action-graceful.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /sbin/apachectl -k graceful "$@"
+exec /sbin/apachectl graceful "$@"
diff --git a/httpd-2.4.3-apxs.patch b/httpd-2.4.9-apxs.patch
similarity index 91%
rename from httpd-2.4.3-apxs.patch
rename to httpd-2.4.9-apxs.patch
index f4d2a87..7016dec 100644
--- a/httpd-2.4.3-apxs.patch
+++ b/httpd-2.4.9-apxs.patch
@@ -1,5 +1,7 @@
---- httpd-2.4.3/support/apxs.in.apxs
-+++ httpd-2.4.3/support/apxs.in
+diff --git a/support/apxs.in b/support/apxs.in
+index ad1287f..efcfcf6 100644
+--- a/support/apxs.in
++++ b/support/apxs.in
@@ -25,7 +25,18 @@ package apxs;
my %config_vars = ();
@@ -53,4 +55,4 @@
+include %LIBDIR%/httpd/build/special.mk
# the used tools
- APXS=apxs
+ APACHECTL=apachectl
diff --git a/httpd-2.4.9-r1573626.patch b/httpd-2.4.9-r1573626.patch
new file mode 100644
index 0000000..58d116b
--- /dev/null
+++ b/httpd-2.4.9-r1573626.patch
@@ -0,0 +1,29 @@
+--- a/modules/proxy/mod_proxy.c 2014/03/03 17:28:10 1573625
++++ b/modules/proxy/mod_proxy.c 2014/03/03 17:28:17 1573626
+@@ -927,8 +927,25 @@
+ struct dirconn_entry *list = (struct dirconn_entry *)conf->dirconn->elts;
+
+ /* is this for us? */
+- if (!r->proxyreq || !r->filename || strncmp(r->filename, "proxy:", 6) != 0)
++ if (!r->filename) {
+ return DECLINED;
++ }
++
++ if (!r->proxyreq) {
++ /* We may have forced the proxy handler via config or .htaccess */
++ if (r->handler &&
++ strncmp(r->handler, "proxy:", 6) == 0 &&
++ strncmp(r->filename, "proxy:", 6) != 0) {
++ r->proxyreq = PROXYREQ_REVERSE;
++ r->filename = apr_pstrcat(r->pool, r->handler, r->filename, NULL);
++ apr_table_setn(r->notes, "rewrite-proxy", "1");
++ }
++ else {
++ return DECLINED;
++ }
++ } else if (strncmp(r->filename, "proxy:", 6) != 0) {
++ return DECLINED;
++ }
+
+ /* handle max-forwards / OPTIONS / TRACE */
+ if ((str = apr_table_get(r->headers_in, "Max-Forwards"))) {
diff --git a/httpd.spec b/httpd.spec
index 9c28e43..2f1ce08 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.4.7
+Version: 2.4.9
Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -48,7 +48,7 @@ Source40: htcacheclean.service
Source41: htcacheclean.sysconf
# build/scripts patches
Patch1: httpd-2.4.1-apctl.patch
-Patch2: httpd-2.4.3-apxs.patch
+Patch2: httpd-2.4.9-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch
Patch5: httpd-2.4.3-layout.patch
Patch6: httpd-2.4.3-apctl-systemd.patch
@@ -62,17 +62,16 @@ Patch29: httpd-2.4.3-mod_systemd.patch
Patch30: httpd-2.4.4-cachehardmax.patch
Patch31: httpd-2.4.6-sslmultiproxy.patch
Patch32: httpd-2.4.7-r1537535.patch
+Patch33: httpd-2.4.9-r1573626.patch
# Bug fixes
-Patch51: httpd-2.4.7-sslsninotreq.patch
Patch55: httpd-2.4.4-malformed-host.patch
Patch56: httpd-2.4.4-mod_unique_id.patch
-Patch58: httpd-2.4.6-r1534321.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
BuildRequires: zlib-devel, libselinux-devel, lua-devel
-BuildRequires: apr-devel >= 1.4.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
+BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
BuildRequires: systemd-devel
Requires: /etc/mime.types, system-logos >= 7.92.1-1
Obsoletes: httpd-suexec
@@ -84,6 +83,7 @@ Requires(pre): /usr/sbin/useradd
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(post): systemd-units
+Conflicts: apr < 1.5.0-1
%description
The Apache HTTP Server is a powerful, efficient, and extensible
@@ -188,11 +188,10 @@ interface for storing and accessing per-user session data.
%patch30 -p1 -b .cachehardmax
%patch31 -p1 -b .sslmultiproxy
%patch32 -p1 -b .r1537535
-
-%patch51 -p1 -b .sslsninotreq
+%patch33 -p1 -b .r1573626
+
%patch55 -p1 -b .malformedhost
%patch56 -p1 -b .uniqueid
-%patch58 -p1 -b .r1534321
# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@@ -619,6 +618,12 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Wed Apr 09 2014 Jan Kaluza <jkaluza at redhat.com> - 2.4.9-1
+- update to 2.4.9
+- add support for SetHandler + proxy (#1078970)
+- fix graceful restart using legacy actions
+- conflict with pre-1.5.0 APR
+
* Mon Jan 27 2014 Jan Kaluza <jkaluza at redhat.com> - 2.4.7-1
- update to 2.4.7 (#1034071)
- mod_ssl: allow SSLEngine to override Listen-based default (r1537535)
diff --git a/sources b/sources
index f460c94..43c32ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-170d7fb6fe5f28b87d1878020a9ab94e httpd-2.4.7.tar.bz2
+2ef4e65353497606b24fa9bb3e5a3c40 httpd-2.4.9.tar.bz2
More information about the scm-commits
mailing list