Changeset 795 for server/fedora

Timestamp:

Aug 6, 2008, 4:48:09 AM (16 years ago)

Author:

geofft

Message:

httpd: Commit quentin's mod_status patch, which disallows server-status in
.htaccess files

File:

• server/fedora/specs/httpd.spec.patch (modified) (3 diffs)

server/fedora/specs/httpd.spec.patch

@@ -1 +1 @@
 --- httpd.spec.orig     2008-02-19 02:05:36.000000000 -0500
 +++ httpd.spec  2008-05-20 19:39:59.000000000 -0400
-@@ -54,6 +54,10 @@
+@@ -54,6 +54,11 @@
  Conflicts: pcre < 4.0
  Requires: httpd-tools = %{version}-%{release}
@@ -8 +8 @@
 +Patch1001: httpd-2.2.8-sni.patch
 +Patch1002: httpd-2.2.x-broken-ldap-caching.patch
++Patch1003: httpd-2.2.x-mod_status-security.patch
 +
  %description
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -127,6 +131,10 @@
+@@ -127,6 +132,11 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -19 +20 @@
 +%patch1001 -p1 -b .sni
 +%patch1002 -p1 -b .broken-ldap
++%patch1003 -p1 -b .permitstatus
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +183,11 @@
+@@ -175,10 +184,11 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \