Changeset 2439 for branches/fc19-dev

Timestamp:

Jun 21, 2013, 12:36:29 AM (11 years ago)

Author:

achernya

Message:

Fix mod_status-security to actually work

Upstream changed the semantics of this module, and the initial rebase
mistakenly included too much upstream code.

Location:

branches/fc19-dev/server/common/patches

Files:

• httpd-304s.patch (modified) (1 diff)
• httpd-fixup-vhost.patch (modified) (2 diffs)
• httpd-mod_status-security.patch (modified) (7 diffs)

branches/fc19-dev/server/common/patches/httpd-304s.patch

@@ -1 @@
-From 1ee367569729f9cf153cd1df87e15e05e00d7645 Mon Sep 17 00:00:00 2001
+From 8211f350ce390b8b426b817e0fb7892c91c12c63 Mon Sep 17 00:00:00 2001
 From: Alexander Chernyakhovsky <achernya@mit.edu>
 Date: Fri, 3 May 2013 21:40:07 -0400

branches/fc19-dev/server/common/patches/httpd-fixup-vhost.patch

@@ -1 @@
-From 2e62dad3d91280032b2130f02553c968d306edf5 Mon Sep 17 00:00:00 2001
+From 373eb8f72153417173d8ecdf11223fba0a740c19 Mon Sep 17 00:00:00 2001
 From: Alexander Chernyakhovsky <achernya@mit.edu>
 Date: Fri, 3 May 2013 22:43:28 -0400
@@ -37 +37 @@
   * Reserve some modules slots for modules loaded by other means than
 diff --git a/server/config.c b/server/config.c
-index bc0804a..488954d 100644
+index bc0804a..22a131e 100644
 --- a/server/config.c
 +++ b/server/config.c

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

@@ -1 @@
-From 0c2aac95f8df4e7c243ea00d54d4050e32f7868b Mon Sep 17 00:00:00 2001
+From 6fc43320aab74560a5aad10f6602309f9de9b762 Mon Sep 17 00:00:00 2001
 From: Alexander Chernyakhovsky <achernya@mit.edu>
 Date: Fri, 3 May 2013 21:39:17 -0400
@@ -11 +11 @@
 Signed-off-by: Geoffrey Thomas <geofft@mit.edu>
 ---
- modules/generators/mod_status.c |   60 +++++++++++++++++++++++++++++++++++++--
- 1 file changed, 57 insertions(+), 3 deletions(-)
+ 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..c7fd0e0 100644
+index 0237f1d..5a9ea7b 100644
 --- a/modules/generators/mod_status.c
 +++ b/modules/generators/mod_status.c
-@@ -103,6 +103,56 @@ APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap, STATUS, int, status_hook,
+@@ -103,6 +103,27 @@ APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap, STATUS, int, status_hook,
  static pid_t child_pid;
  #endif
@@ -25 +25 @@
 +  int permit_status_handler;
 +} status_config_rec;
-+
-+/*
-+ * command-related code. This is here to prevent use of ExtendedStatus
-+ * without status_module included.
-+ */
-+static const char *set_extended_status(cmd_parms *cmd, void *dummy, int arg)
-+{
-+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-+    if (err != NULL) {
-+        return err;
-+    }
-+    ap_extended_status = arg;
-+    return NULL;
-+}
-+
-+static const char *set_reqtail(cmd_parms *cmd, void *dummy, int arg)
-+{
-+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-+    if (err != NULL) {
-+        return err;
-+    }
-+    ap_mod_status_reqtail = arg;
-+    return NULL;
-+}
 +
 +static void *create_status_dir_config(apr_pool_t *p, char *d)
@@ -59 +35 @@
 +static const command_rec status_module_cmds[] =
 +{
-+    AP_INIT_FLAG("ExtendedStatus", set_extended_status, NULL, RSRC_CONF,
-+      "\"On\" to enable extended status information, \"Off\" to disable"),
-+    AP_INIT_FLAG("SeeRequestTail", set_reqtail, NULL, RSRC_CONF,
-+      "For verbose requests, \"On\" to see the last 63 chars of the request, "
-+      "\"Off\" (default) to see the first 63 in extended status display"),
 +    AP_INIT_FLAG("PermitStatusHandler", ap_set_flag_slot,
 +                (void *)APR_OFFSETOF(status_config_rec, permit_status_handler),
@@ -75 +46 @@
  static void format_byte_out(request_rec *r, apr_off_t bytes)
  {
-@@ -207,8 +257,12 @@ static int status_handler(request_rec *r)
+@@ -207,8 +228,12 @@ static int status_handler(request_rec *r)
      int times_per_thread;
  #endif
@@ -90 +61 @@
      }
  
-@@ -974,7 +1028,7 @@ static void register_hooks(apr_pool_t *p)
+@@ -974,11 +999,11 @@ static void register_hooks(apr_pool_t *p)
  AP_DECLARE_MODULE(status) =
  {
@@ -99 +70 @@
      NULL,                       /* server config */
      NULL,                       /* merge server config */
+-    NULL,                       /* command table */
++    status_module_cmds,         /* command table */
+     register_hooks              /* register_hooks */
+ };
+ 
 -- 
 1.7.9.6 (Apple Git-31.1)