Changeset 2625 for trunk/server


Ignore:
Timestamp:
Oct 9, 2014, 3:41:05 AM (8 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:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/specs/httpd.spec.patch

    r2602 r2625  
    1 --- rpmbuild/SPECS/httpd.spec.~1~       2014-07-23 06:24:15.000000000 -0400
    2 +++ httpd.spec  2014-08-26 21:10:34.994027237 -0400
     1--- httpd.spec.~1~      2014-07-23 06:24:15.000000000 -0400
     2+++ httpd.spec  2014-10-09 03:26:23.922059553 -0400
    33@@ -15,7 +15,7 @@
    44 Summary: Apache HTTP Server
     
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -65,6 +65,14 @@
     12@@ -65,6 +65,15 @@
    1313 # Bug fixes
    1414 Patch55: httpd-2.4.4-malformed-host.patch
     
    2121+Patch1005: httpd-allow-null-user.patch
    2222+Patch1006: httpd-suexec-journald.patch
     23+Patch1007: httpd-bug57070.patch
    2324+
    2425 License: ASL 2.0
    2526 Group: System Environment/Daemons
    2627 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
    27 @@ -77,6 +84,7 @@
     28@@ -77,6 +86,7 @@
    2829 Provides: webserver
    2930 Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
     
    3334 Requires(pre): /usr/sbin/useradd
    3435 Requires(preun): systemd-units
    35 @@ -94,6 +102,7 @@
     36@@ -94,6 +104,7 @@
    3637 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    3738 Requires: apr-devel, apr-util-devel, pkgconfig
     
    4142 %description devel
    4243 The httpd-devel package contains the APXS binary and other files
    43 @@ -132,6 +141,7 @@
     44@@ -132,6 +143,7 @@
    4445 Requires(post): openssl, /bin/cat
    4546 Requires(pre): httpd
     
    4950 
    5051 %description -n mod_ssl
    51 @@ -190,6 +200,13 @@
     52@@ -190,6 +202,14 @@
    5253 %patch55 -p1 -b .malformedhost
    5354 %patch56 -p1 -b .uniqueid
     
    5960+%patch1005 -p1 -b .allow-null-user
    6061+%patch1006 -p1 -b .journald
     62+%patch1007 -p0 -b .bug57070
    6163+
    6264 # Patch in the vendor string
    6365 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
    6466 
    65 @@ -242,11 +258,13 @@
     67@@ -242,11 +262,13 @@
    6668        --enable-suexec --with-suexec \
    6769         --enable-suexec-capabilities \
     
    8183         --with-pcre \
    8284         --enable-mods-shared=all \
    83 @@ -542,7 +560,8 @@
     85@@ -542,7 +564,8 @@
    8486 %{_sbindir}/fcgistarter
    8587 %{_sbindir}/apachectl
Note: See TracChangeset for help on using the changeset viewer.