Changeset 2625

Timestamp:

Oct 9, 2014, 3:41:05 AM (10 years ago)

Author:

andersk

Message:

Patch httpd crash when using SSL variables on non-SSL connections

https://issues.apache.org/bugzilla/show_bug.cgi?id=57070

Location:

trunk/server

Files:

• common/patches/httpd-bug57070.patch (added)
• fedora/specs/httpd.spec.patch (modified) (8 diffs)

trunk/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- rpmbuild/SPECS/httpd.spec.~1~       2014-07-23 06:24:15.000000000 -0400
-+++ httpd.spec  2014-08-26 21:10:34.994027237 -0400
+--- httpd.spec.~1~      2014-07-23 06:24:15.000000000 -0400
++++ httpd.spec  2014-10-09 03:26:23.922059553 -0400
 @@ -15,7 +15,7 @@
  Summary: Apache HTTP Server
@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -65,6 +65,14 @@
+@@ -65,6 +65,15 @@
  # Bug fixes
  Patch55: httpd-2.4.4-malformed-host.patch
@@ -21 +21 @@
 +Patch1005: httpd-allow-null-user.patch
 +Patch1006: httpd-suexec-journald.patch
++Patch1007: httpd-bug57070.patch
 +
  License: ASL 2.0
  Group: System Environment/Daemons
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-@@ -77,6 +84,7 @@
+@@ -77,6 +86,7 @@
  Provides: webserver
  Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
@@ -33 +34 @@
  Requires(pre): /usr/sbin/useradd
  Requires(preun): systemd-units
-@@ -94,6 +102,7 @@
+@@ -94,6 +104,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -41 +42 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -132,6 +141,7 @@
+@@ -132,6 +143,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -49 +50 @@
  
  %description -n mod_ssl
-@@ -190,6 +200,13 @@
+@@ -190,6 +202,14 @@
  %patch55 -p1 -b .malformedhost
  %patch56 -p1 -b .uniqueid
@@ -59 +60 @@
 +%patch1005 -p1 -b .allow-null-user
 +%patch1006 -p1 -b .journald
++%patch1007 -p0 -b .bug57070
 +
  # Patch in the vendor string
  sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
  
-@@ -242,11 +258,13 @@
+@@ -242,11 +262,13 @@
         --enable-suexec --with-suexec \
          --enable-suexec-capabilities \
@@ -81 +83 @@
          --with-pcre \
          --enable-mods-shared=all \
-@@ -542,7 +560,8 @@
+@@ -542,7 +564,8 @@
  %{_sbindir}/fcgistarter
  %{_sbindir}/apachectl