Changeset 2469 for branches/fc19-dev/server/common/patches/httpd-mod_status-security.patch

Timestamp:

Sep 22, 2013, 7:05:37 PM (11 years ago)

Author:

glasgall

Message:

update httpd patches for 2.4.6

File:

• branches/fc19-dev/server/common/patches/httpd-mod_status-security.patch (modified) (4 diffs)

branches/fc19-dev/server/common/patches/httpd-mod_status-security.patch

@@ -1 @@
-From 6fc43320aab74560a5aad10f6602309f9de9b762 Mon Sep 17 00:00:00 2001
+From c9e5769ec7163cadd44a1b1a75a12a75a5a1db58 Mon Sep 17 00:00:00 2001
 From: Alexander Chernyakhovsky <achernya@mit.edu>
 Date: Fri, 3 May 2013 21:39:17 -0400
-Subject: [PATCH 2/4] Prevent mod_status from taking effect in .htaccess files
+Subject: [PATCH] Prevent mod_status from taking effect in .htaccess files
 
 Introduce a directive to the Apache configuration that is only
@@ -11 +11 @@
 Signed-off-by: Geoffrey Thomas <geofft@mit.edu>
 ---
- modules/generators/mod_status.c |   33 +++++++++++++++++++++++++++++----
+ modules/generators/mod_status.c | 33 +++++++++++++++++++++++++++++----
  1 file changed, 29 insertions(+), 4 deletions(-)
 
 diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
-index 0237f1d..5a9ea7b 100644
+index fe832b3..92a6f69 100644
 --- a/modules/generators/mod_status.c
 +++ b/modules/generators/mod_status.c
@@ -61 +61 @@
      }
  
-@@ -974,11 +999,11 @@ static void register_hooks(apr_pool_t *p)
+@@ -948,10 +973,10 @@ static void register_hooks(apr_pool_t *p)
  AP_DECLARE_MODULE(status) =
  {
@@ -74 +74 @@
      register_hooks              /* register_hooks */
  };
- 
 -- 
-1.7.9.6 (Apple Git-31.1)
+1.8.1.2