Changed pools to contexts. Tested with prefork and pthread mpm's. I'll

check this out tomorrow and make sure everything was checked in correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83852 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 132 insertions, 132 deletions

diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c
index f2f2dc8b13..c3b2dfbe0b 100644
--- a/modules/mappers/mod_actions.c
+++ b/modules/mappers/mod_actions.c
@@ -87,13 +87,13 @@
 #include "util_script.h"
 
 typedef struct {
-    table *action_types;       /* Added with Action... */
+    ap_table_t *action_types;       /* Added with Action... */
     char *scripted[METHODS];   /* Added with Script... */
 } action_dir_config;
 
 module action_module;
 
-static void *create_action_dir_config(pool *p, char *dummy)
+static void *create_action_dir_config(ap_context_t *p, char *dummy)
 {
     action_dir_config *new =
     (action_dir_config *) ap_palloc(p, sizeof(action_dir_config));
@@ -104,7 +104,7 @@ static void *create_action_dir_config(pool *p, char *dummy)
     return new;
 }
 
-static void *merge_action_dir_configs(pool *p, void *basev, void *addv)
+static void *merge_action_dir_configs(ap_context_t *p, void *basev, void *addv)
 {
     action_dir_config *base = (action_dir_config *) basev;
     action_dir_config *add = (action_dir_config *) addv;
@@ -215,7 +215,7 @@ module action_module =
     merge_action_dir_configs,	/* dir merger --- default is to override */
     NULL,			/* server config */
     NULL,			/* merge server config */
-    action_cmds,		/* command table */
+    action_cmds,		/* command ap_table_t */
     action_handlers,		/* handlers */
     NULL			/* register hooks */
 };
diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index d6d5d0ac7c..825f5cc0ce 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -76,17 +76,17 @@ typedef struct {
 } alias_entry;
 
 typedef struct {
-    array_header *aliases;
-    array_header *redirects;
+    ap_array_header_t *aliases;
+    ap_array_header_t *redirects;
 } alias_server_conf;
 
 typedef struct {
-    array_header *redirects;
+    ap_array_header_t *redirects;
 } alias_dir_conf;
 
 module MODULE_VAR_EXPORT alias_module;
 
-static void *create_alias_config(pool *p, server_rec *s)
+static void *create_alias_config(ap_context_t *p, server_rec *s)
 {
     alias_server_conf *a =
     (alias_server_conf *) ap_pcalloc(p, sizeof(alias_server_conf));
@@ -96,7 +96,7 @@ static void *create_alias_config(pool *p, server_rec *s)
     return a;
 }
 
-static void *create_alias_dir_config(pool *p, char *d)
+static void *create_alias_dir_config(ap_context_t *p, char *d)
 {
     alias_dir_conf *a =
     (alias_dir_conf *) ap_pcalloc(p, sizeof(alias_dir_conf));
@@ -104,7 +104,7 @@ static void *create_alias_dir_config(pool *p, char *d)
     return a;
 }
 
-static void *merge_alias_config(pool *p, void *basev, void *overridesv)
+static void *merge_alias_config(ap_context_t *p, void *basev, void *overridesv)
 {
     alias_server_conf *a =
     (alias_server_conf *) ap_pcalloc(p, sizeof(alias_server_conf));
@@ -115,7 +115,7 @@ static void *merge_alias_config(pool *p, void *basev, void *overridesv)
     return a;
 }
 
-static void *merge_alias_dir_config(pool *p, void *basev, void *overridesv)
+static void *merge_alias_dir_config(ap_context_t *p, void *basev, void *overridesv)
 {
     alias_dir_conf *a =
     (alias_dir_conf *) ap_pcalloc(p, sizeof(alias_dir_conf));
@@ -289,7 +289,7 @@ static int alias_matches(const char *uri, const char *alias_fakename)
     return urip - uri;
 }
 
-static char *try_alias_list(request_rec *r, array_header *aliases, int doesc, int *status)
+static char *try_alias_list(request_rec *r, ap_array_header_t *aliases, int doesc, int *status)
 {
     alias_entry *entries = (alias_entry *) aliases->elts;
     regmatch_t regm[10];
@@ -410,7 +410,7 @@ module MODULE_VAR_EXPORT alias_module =
     merge_alias_dir_config,	/* dir merger --- default is to override */
     create_alias_config,	/* server config */
     merge_alias_config,		/* merge server configs */
-    alias_cmds,			/* command table */
+    alias_cmds,			/* command ap_table_t */
     NULL,			/* handlers */
     register_hooks		/* register hooks */
 };
diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 9ead891d85..515d2fab5c 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -71,7 +71,7 @@
 module MODULE_VAR_EXPORT dir_module;
 
 typedef struct dir_config_struct {
-    array_header *index_names;
+    ap_array_header_t *index_names;
 } dir_config_rec;
 
 #define DIR_CMD_PERMS OR_INDEXES
@@ -95,7 +95,7 @@ static const command_rec dir_cmds[] =
     {NULL}
 };
 
-static void *create_dir_config(pool *p, char *dummy)
+static void *create_dir_config(ap_context_t *p, char *dummy)
 {
     dir_config_rec *new =
     (dir_config_rec *) ap_pcalloc(p, sizeof(dir_config_rec));
@@ -104,7 +104,7 @@ static void *create_dir_config(pool *p, char *dummy)
     return (void *) new;
 }
 
-static void *merge_dir_configs(pool *p, void *basev, void *addv)
+static void *merge_dir_configs(ap_context_t *p, void *basev, void *addv)
 {
     dir_config_rec *new = (dir_config_rec *) ap_pcalloc(p, sizeof(dir_config_rec));
     dir_config_rec *base = (dir_config_rec *) basev;
@@ -228,7 +228,7 @@ module MODULE_VAR_EXPORT dir_module = {
     merge_dir_configs,		/* merge per-directory config structures */
     NULL,			/* create per-server config structure */
     NULL,			/* merge per-server config structures */
-    dir_cmds,			/* command table */
+    dir_cmds,			/* command ap_table_t */
     dir_handlers,		/* handlers */
     NULL			/* register hooks */
 };
diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c
index 1839d93264..f2bb73af9d 100644
--- a/modules/mappers/mod_imap.c
+++ b/modules/mappers/mod_imap.c
@@ -100,7 +100,7 @@
 #include "http_log.h"
 #include "util_script.h"
 
-#define IMAP_MAGIC_TYPE "application/x-httpd-imap"
+#define IMAP_MAGIC_TYPE "application/x-httpd ap_context_t map"
 #define MAXVERTS 100
 #define X 0
 #define Y 1
@@ -121,7 +121,7 @@ typedef struct {
     char *imap_base;
 } imap_conf_rec;
 
-static void *create_imap_dir_config(pool *p, char *dummy)
+static void *create_imap_dir_config(ap_context_t *p, char *dummy)
 {
     imap_conf_rec *icr =
     (imap_conf_rec *) ap_palloc(p, sizeof(imap_conf_rec));
@@ -133,7 +133,7 @@ static void *create_imap_dir_config(pool *p, char *dummy)
     return icr;
 }
 
-static void *merge_imap_dir_configs(pool *p, void *basev, void *addv)
+static void *merge_imap_dir_configs(ap_context_t *p, void *basev, void *addv)
 {
     imap_conf_rec *new = (imap_conf_rec *) ap_pcalloc(p, sizeof(imap_conf_rec));
     imap_conf_rec *base = (imap_conf_rec *) basev;
@@ -901,7 +901,7 @@ module MODULE_VAR_EXPORT imap_module =
     merge_imap_dir_configs,     /* dir merger --- default is to override */
     NULL,                       /* server config */
     NULL,                       /* merge server config */
-    imap_cmds,                  /* command table */
+    imap_cmds,                  /* command ap_table_t */
     imap_handlers,              /* handlers */
     NULL                        /* register hooks */
 };
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 2cfefc153f..71737c9b97 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -75,12 +75,12 @@
  */
 
 typedef struct {
-    array_header *language_priority;
+    ap_array_header_t *language_priority;
 } neg_dir_config;
 
 module MODULE_VAR_EXPORT negotiation_module;
 
-static void *create_neg_dir_config(pool *p, char *dummy)
+static void *create_neg_dir_config(ap_context_t *p, char *dummy)
 {
     neg_dir_config *new = (neg_dir_config *) ap_palloc(p, sizeof(neg_dir_config));
 
@@ -88,7 +88,7 @@ static void *create_neg_dir_config(pool *p, char *dummy)
     return new;
 }
 
-static void *merge_neg_dir_configs(pool *p, void *basev, void *addv)
+static void *merge_neg_dir_configs(ap_context_t *p, void *basev, void *addv)
 {
     neg_dir_config *base = (neg_dir_config *) basev;
     neg_dir_config *add = (neg_dir_config *) addv;
@@ -102,7 +102,7 @@ static void *merge_neg_dir_configs(pool *p, void *basev, void *addv)
 
 static const char *set_language_priority(cmd_parms *cmd, void *n, char *lang)
 {
-    array_header *arr = ((neg_dir_config *) n)->language_priority;
+    ap_array_header_t *arr = ((neg_dir_config *) n)->language_priority;
     char **langp = (char **) ap_push_array(arr);
 
     *langp = lang;
@@ -169,7 +169,7 @@ typedef struct var_rec {
     char *mime_type;            /* MUST be lowercase */
     char *file_name;
     const char *content_encoding;
-    array_header *content_languages;   /* list of languages for this variant */
+    ap_array_header_t *content_languages;   /* list of languages for this variant */
     char *content_charset;
     char *description;
 
@@ -208,7 +208,7 @@ typedef struct var_rec {
  */
 
 typedef struct {
-    pool *pool;
+    ap_context_t *pool;
     request_rec *r;
     char *dir_name;
     int accept_q;               /* 1 if an Accept item has a q= param */
@@ -217,12 +217,12 @@ typedef struct {
     /* the array pointers below are NULL if the corresponding accept
      * headers are not present
      */
-    array_header *accepts;            /* accept_recs */
-    array_header *accept_encodings;   /* accept_recs */
-    array_header *accept_charsets;    /* accept_recs */
-    array_header *accept_langs;       /* accept_recs */
+    ap_array_header_t *accepts;            /* accept_recs */
+    ap_array_header_t *accept_encodings;   /* accept_recs */
+    ap_array_header_t *accept_charsets;    /* accept_recs */
+    ap_array_header_t *accept_langs;       /* accept_recs */
 
-    array_header *avail_vars;         /* available variants */
+    ap_array_header_t *avail_vars;         /* available variants */
 
     int count_multiviews_variants;    /* number of variants found on disk */
 
@@ -310,7 +310,7 @@ static void set_vlist_validator(request_rec *r, request_rec *vlistr)
  * enter the values we recognize into the argument accept_rec
  */
 
-static const char *get_entry(pool *p, accept_rec *result,
+static const char *get_entry(ap_context_t *p, accept_rec *result,
                              const char *accept_line)
 {
     result->quality = 1.0f;
@@ -329,8 +329,8 @@ static const char *get_entry(pool *p, accept_rec *result,
      */
 
     result->name = ap_get_token(p, &accept_line, 0);
-    ap_str_tolower(result->name);     /* You want case-insensitive,
-                                       * you'll *get* case-insensitive.
+    ap_str_tolower(result->name);     /* You want case ap_context_t nsensitive,
+                                       * you'll *get* case ap_context_t nsensitive.
                                        */
 
     /* KLUDGE!!! Default HTML to level 2.0 unless the browser
@@ -417,9 +417,9 @@ static const char *get_entry(pool *p, accept_rec *result,
  * where charset is only valid in Accept.
  */
 
-static array_header *do_header_line(pool *p, const char *accept_line)
+static ap_array_header_t *do_header_line(ap_context_t *p, const char *accept_line)
 {
-    array_header *accept_recs;
+    ap_array_header_t *accept_recs;
 
     if (!accept_line) {
         return NULL;
@@ -439,9 +439,9 @@ static array_header *do_header_line(pool *p, const char *accept_line)
  * return an array containing the languages of this variant
  */
 
-static array_header *do_languages_line(pool *p, const char **lang_line)
+static ap_array_header_t *do_languages_line(ap_context_t *p, const char **lang_line)
 {
-    array_header *lang_recs = ap_make_array(p, 2, sizeof(char *));
+    ap_array_header_t *lang_recs = ap_make_array(p, 2, sizeof(char *));
 
     if (!lang_line) {
         return lang_recs;
@@ -469,7 +469,7 @@ static negotiation_state *parse_accept_headers(request_rec *r)
     negotiation_state *new =
         (negotiation_state *) ap_pcalloc(r->pool, sizeof(negotiation_state));
     accept_rec *elts;
-    table *hdrs = r->headers_in;
+    ap_table_t *hdrs = r->headers_in;
     int i;
 
     new->pool = r->pool;
@@ -1139,7 +1139,7 @@ static int level_cmp(var_rec *var1, var_rec *var2)
  * to set lang_index.  
  */
 
-static int find_lang_index(array_header *accept_langs, char *lang)
+static int find_lang_index(ap_array_header_t *accept_langs, char *lang)
 {
     accept_rec *accs;
     int i;
@@ -1166,7 +1166,7 @@ static int find_lang_index(array_header *accept_langs, char *lang)
 
 static int find_default_index(neg_dir_config *conf, char *lang)
 {
-    array_header *arr;
+    ap_array_header_t *arr;
     int nelts;
     char **elts;
     int i;
@@ -2030,7 +2030,7 @@ static int best_match(negotiation_state *neg, var_rec **pbest)
 static void set_neg_headers(request_rec *r, negotiation_state *neg,
                             int alg_result)
 {
-    table *hdrs;
+    ap_table_t *hdrs;
     var_rec *avail_recs = (var_rec *) neg->avail_vars->elts;
     const char *sample_type = NULL;
     const char *sample_language = NULL;
@@ -2040,7 +2040,7 @@ static void set_neg_headers(request_rec *r, negotiation_state *neg,
     char *qstr;
     char *lenstr;
     long len;
-    array_header *arr;
+    ap_array_header_t *arr;
     int max_vlist_array = (neg->avail_vars->nelts * 21);
     int first_variant = 1;
     int vary_by_type = 0;
@@ -2050,7 +2050,7 @@ static void set_neg_headers(request_rec *r, negotiation_state *neg,
     int j;
 
     /* In order to avoid O(n^2) memory copies in building Alternates,
-     * we preallocate a table with the maximum substrings possible,
+     * we preallocate a ap_table_t with the maximum substrings possible,
      * fill it with the variant list, and then concatenate the entire array.
      * Note that if you change the number of substrings pushed, you also
      * need to change the calculation of max_vlist_array above.
@@ -2216,12 +2216,12 @@ static void set_neg_headers(request_rec *r, negotiation_state *neg,
 
 static char *make_variant_list(request_rec *r, negotiation_state *neg)
 {
-    array_header *arr;
+    ap_array_header_t *arr;
     int i;
     int max_vlist_array = (neg->avail_vars->nelts * 15) + 2;
 
     /* In order to avoid O(n^2) memory copies in building the list,
-     * we preallocate a table with the maximum substrings possible,
+     * we preallocate a ap_table_t with the maximum substrings possible,
      * fill it with the variant list, and then concatenate the entire array.
      */
     arr = ap_make_array(r->pool, max_vlist_array, sizeof(char *));
@@ -2231,7 +2231,7 @@ static char *make_variant_list(request_rec *r, negotiation_state *neg)
     for (i = 0; i < neg->avail_vars->nelts; ++i) {
         var_rec *variant = &((var_rec *) neg->avail_vars->elts)[i];
         char *filename = variant->file_name ? variant->file_name : "";
-        array_header *languages = variant->content_languages;
+        ap_array_header_t *languages = variant->content_languages;
         char *description = variant->description ? variant->description : "";
 
         /* The format isn't very neat, and it would be nice to make
@@ -2677,7 +2677,7 @@ static int fix_encoding(request_rec *r)
 {
     const char *enc = r->content_encoding;
     char *x_enc = NULL;
-    array_header *accept_encodings;
+    ap_array_header_t *accept_encodings;
     accept_rec *accept_recs;
     int i;
 
@@ -2737,7 +2737,7 @@ module MODULE_VAR_EXPORT negotiation_module =
     merge_neg_dir_configs,      /* dir merger --- default is to override */
     NULL,                       /* server config */
     NULL,                       /* merge server config */
-    negotiation_cmds,           /* command table */
+    negotiation_cmds,           /* command ap_table_t */
     negotiation_handlers,       /* handlers */
     register_hooks              /* register hooks */
 };
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 4a036ddf3c..48839993cd 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -153,7 +153,7 @@
      * MODULE-DEFINITION-END
      */
 
-    /* the table of commands we provide */
+    /* the ap_table_t of commands we provide */
 static const command_rec command_table[] = {
     { "RewriteEngine",   cmd_rewriteengine,   NULL, OR_FILEINFO, FLAG,
       "On or Off to enable or disable (default) the whole rewriting engine" },
@@ -177,7 +177,7 @@ static const command_rec command_table[] = {
     { NULL }
 };
 
-    /* the table of content handlers we provide */
+    /* the ap_table_t of content handlers we provide */
 static const handler_rec handler_table[] = {
     { "redirect-handler", handler_redirect },
     { NULL }
@@ -191,7 +191,7 @@ module MODULE_VAR_EXPORT rewrite_module = {
    config_perdir_merge,         /* merge  per-dir    config structures */
    config_server_create,        /* create per-server config structures */
    config_server_merge,         /* merge  per-server config structures */
-   command_table,               /* table of config file commands       */
+   command_table,               /* ap_table_t of config file commands       */
    handler_table,               /* [#8] MIME-typed-dispatched handlers */
    hook_uri2file,               /* [#1] URI to filename translation    */
    NULL,                        /* [#4] validate user id from request  */
@@ -229,7 +229,7 @@ static int lockfd = -1;
 **
 */
 
-static void *config_server_create(pool *p, server_rec *s)
+static void *config_server_create(ap_context_t *p, server_rec *s)
 {
     rewrite_server_conf *a;
 
@@ -248,7 +248,7 @@ static void *config_server_create(pool *p, server_rec *s)
     return (void *)a;
 }
 
-static void *config_server_merge(pool *p, void *basev, void *overridesv)
+static void *config_server_merge(ap_context_t *p, void *basev, void *overridesv)
 {
     rewrite_server_conf *a, *base, *overrides;
 
@@ -304,7 +304,7 @@ static void *config_server_merge(pool *p, void *basev, void *overridesv)
 **
 */
 
-static void *config_perdir_create(pool *p, char *path)
+static void *config_perdir_create(ap_context_t *p, char *path)
 {
     rewrite_perdir_conf *a;
 
@@ -332,7 +332,7 @@ static void *config_perdir_create(pool *p, char *path)
     return (void *)a;
 }
 
-static void *config_perdir_merge(pool *p, void *basev, void *overridesv)
+static void *config_perdir_merge(ap_context_t *p, void *basev, void *overridesv)
 {
     rewrite_perdir_conf *a, *base, *overrides;
 
@@ -407,7 +407,7 @@ static const char *cmd_rewriteoptions(cmd_parms *cmd,
     return err;
 }
 
-static const char *cmd_rewriteoptions_setoption(pool *p, int *options,
+static const char *cmd_rewriteoptions_setoption(ap_context_t *p, int *options,
                                                 char *name)
 {
     if (strcasecmp(name, "inherit") == 0) {
@@ -605,7 +605,7 @@ static const char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf,
     }
 
     /* now be careful: Under the POSIX regex library
-       we can compile the pattern for case-insensitive matching,
+       we can compile the pattern for case ap_context_t nsensitive matching,
        under the old V8 library we have to do it self via a hack */
     if (new->flags & CONDFLAG_NOCASE) {
         rc = ((regexp = ap_pregcomp(cmd->pool, cp, REG_EXTENDED|REG_ICASE))
@@ -626,7 +626,7 @@ static const char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf,
     return NULL;
 }
 
-static const char *cmd_rewritecond_parseflagfield(pool *p,
+static const char *cmd_rewritecond_parseflagfield(ap_context_t *p,
                                                   rewritecond_entry *cfg,
                                                   char *str)
 {
@@ -678,7 +678,7 @@ static const char *cmd_rewritecond_parseflagfield(pool *p,
     return NULL;
 }
 
-static const char *cmd_rewritecond_setflag(pool *p, rewritecond_entry *cfg,
+static const char *cmd_rewritecond_setflag(ap_context_t *p, rewritecond_entry *cfg,
                                            char *key, char *val)
 {
     if (   strcasecmp(key, "nocase") == 0
@@ -782,7 +782,7 @@ static const char *cmd_rewriterule(cmd_parms *cmd, rewrite_perdir_conf *dconf,
     return NULL;
 }
 
-static const char *cmd_rewriterule_parseflagfield(pool *p,
+static const char *cmd_rewriterule_parseflagfield(ap_context_t *p,
                                                   rewriterule_entry *cfg,
                                                   char *str)
 {
@@ -834,7 +834,7 @@ static const char *cmd_rewriterule_parseflagfield(pool *p,
     return NULL;
 }
 
-static const char *cmd_rewriterule_setflag(pool *p, rewriterule_entry *cfg,
+static const char *cmd_rewriterule_setflag(ap_context_t *p, rewriterule_entry *cfg,
                                            char *key, char *val)
 {
     int status = 0;
@@ -939,7 +939,7 @@ static const char *cmd_rewriterule_setflag(pool *p, rewriterule_entry *cfg,
 **
 */
 
-static void init_module(server_rec *s, pool *p)
+static void init_module(server_rec *s, ap_context_t *p)
 {
     /* check if proxy module is available */
     proxy_available = (ap_find_linked_module("mod_proxy.c") != NULL);
@@ -966,7 +966,7 @@ static void init_module(server_rec *s, pool *p)
 **
 */
 
-static void init_child(server_rec *s, pool *p)
+static void init_child(server_rec *s, ap_context_t *p)
 {
      /* open the rewriting lockfile */
      rewritelock_open(s, p);
@@ -1595,7 +1595,7 @@ static int handler_redirect(request_rec *r)
  *  Apply a complete rule set,
  *  i.e. a list of rewrite rules
  */
-static int apply_rewrite_list(request_rec *r, array_header *rewriterules,
+static int apply_rewrite_list(request_rec *r, ap_array_header_t *rewriterules,
                               char *perdir)
 {
     rewriterule_entry *entries;
@@ -1740,7 +1740,7 @@ static int apply_rewrite_rule(request_rec *r, rewriterule_entry *p,
     backrefinfo *briRC = NULL;
     int prefixstrip;
     int failed;
-    array_header *rewriteconds;
+    ap_array_header_t *rewriteconds;
     rewritecond_entry *conds;
     rewritecond_entry *c;
     int i;
@@ -1758,7 +1758,7 @@ static int apply_rewrite_rule(request_rec *r, rewriterule_entry *p,
      *  make sure we really match against the complete URL.
      */
     if (perdir != NULL && r->path_info != NULL && r->path_info[0] != '\0') {
-        rewritelog(r, 3, "[per-dir %s] add path-info postfix: %s -> %s%s",
+        rewritelog(r, 3, "[per-dir %s] add path ap_context_t nfo postfix: %s -> %s%s",
                    perdir, uri, uri, r->path_info);
         uri = ap_pstrcat(r->pool, uri, r->path_info, NULL);
     }
@@ -2467,7 +2467,7 @@ static void fully_qualify_uri(request_rec *r)
 **
 */
 
-static void expand_backref_inbuffer(pool *p, char *buf, int nbuf,
+static void expand_backref_inbuffer(ap_context_t *p, char *buf, int nbuf,
                                     backrefinfo *bri, char c)
 {
     int i;
@@ -2675,7 +2675,7 @@ static char *lookup_map(request_rec *r, char *name, char *key)
 {
     void *sconf;
     rewrite_server_conf *conf;
-    array_header *rewritemaps;
+    ap_array_header_t *rewritemaps;
     rewritemap_entry *entries;
     rewritemap_entry *s;
     char *value;
@@ -3081,7 +3081,7 @@ static char *select_random_value_part(request_rec *r, char *value)
 */
 
 
-static void open_rewritelog(server_rec *s, pool *p)
+static void open_rewritelog(server_rec *s, ap_context_t *p)
 {
     rewrite_server_conf *conf;
     char *fname;
@@ -3251,7 +3251,7 @@ static char *current_logtime(request_rec *r)
 #define REWRITELOCK_MODE ( S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH )
 #endif
 
-static void rewritelock_create(server_rec *s, pool *p)
+static void rewritelock_create(server_rec *s, ap_context_t *p)
 {
     rewrite_server_conf *conf;
 
@@ -3283,7 +3283,7 @@ static void rewritelock_create(server_rec *s, pool *p)
     return;
 }
 
-static void rewritelock_open(server_rec *s, pool *p)
+static void rewritelock_open(server_rec *s, ap_context_t *p)
 {
     rewrite_server_conf *conf;
 
@@ -3343,13 +3343,13 @@ static void rewritelock_free(request_rec *r)
 ** +-------------------------------------------------------+
 */
 
-static void run_rewritemap_programs(server_rec *s, pool *p)
+static void run_rewritemap_programs(server_rec *s, ap_context_t *p)
 {
     rewrite_server_conf *conf;
     FILE *fpin;
     FILE *fpout;
     FILE *fperr;
-    array_header *rewritemaps;
+    ap_array_header_t *rewritemaps;
     rewritemap_entry *entries;
     rewritemap_entry *map;
     int i;
@@ -3689,7 +3689,7 @@ static char *lookup_variable(request_rec *r, char *var)
             rsub = subrecfunc(r->filename, r); \
             /* now recursively lookup the variable in the sub_req */ \
             result = lookup_variable(rsub, var+5); \
-            /* copy it up to our scope before we destroy sub_req's pool */ \
+            /* copy it up to our scope before we destroy sub_req's ap_context_t */ \
             result = ap_pstrdup(r->pool, result); \
             /* cleanup by destroying the subrequest */ \
             ap_destroy_sub_req(rsub); \
@@ -3756,7 +3756,7 @@ static char *lookup_variable(request_rec *r, char *var)
 
 static char *lookup_header(request_rec *r, const char *name)
 {
-    array_header *hdrs_arr;
+    ap_array_header_t *hdrs_arr;
     table_entry *hdrs;
     int i;
 
@@ -3786,7 +3786,7 @@ static char *lookup_header(request_rec *r, const char *name)
 */
 
 
-static cache *init_cache(pool *p)
+static cache *init_cache(ap_context_t *p)
 {
     cache *c;
 
diff --git a/modules/mappers/mod_rewrite.h b/modules/mappers/mod_rewrite.h
index 22ff337558..abdba13f84 100644
--- a/modules/mappers/mod_rewrite.h
+++ b/modules/mappers/mod_rewrite.h
@@ -115,7 +115,7 @@
 #include "http_vhost.h"
 
     /*
-     * The key in the r->notes table wherein we store our accumulated
+     * The key in the r->notes ap_table_t wherein we store our accumulated
      * Vary values, and the one used for per-condition checks in a chain.
      */
 #define VARY_KEY "rewrite-Vary"
@@ -281,7 +281,7 @@ typedef struct {
 } rewritecond_entry;
 
 typedef struct {
-    array_header *rewriteconds;    /* the corresponding RewriteCond entries */
+    ap_array_header_t *rewriteconds;    /* the corresponding RewriteCond entries */
     char    *pattern;              /* the RegExp pattern string */
     regex_t *regexp;               /* the RegExp pattern compilation */
     char    *output;               /* the Substitution string */
@@ -302,9 +302,9 @@ typedef struct {
     char         *rewritelogfile;  /* the RewriteLog filename */
     int           rewritelogfp;    /* the RewriteLog open filepointer */
     int           rewriteloglevel; /* the RewriteLog level of verbosity */
-    array_header *rewritemaps;     /* the RewriteMap entries */
-    array_header *rewriteconds;    /* the RewriteCond entries (temporary) */
-    array_header *rewriterules;    /* the RewriteRule entries */
+    ap_array_header_t *rewritemaps;     /* the RewriteMap entries */
+    ap_array_header_t *rewriteconds;    /* the RewriteCond entries (temporary) */
+    ap_array_header_t *rewriterules;    /* the RewriteRule entries */
     server_rec   *server;          /* the corresponding server indicator */
 } rewrite_server_conf;
 
@@ -315,15 +315,15 @@ typedef struct {
 typedef struct {
     int           state;           /* the RewriteEngine state */
     int           options;         /* the RewriteOption state */
-    array_header *rewriteconds;    /* the RewriteCond entries (temporary) */
-    array_header *rewriterules;    /* the RewriteRule entries */
+    ap_array_header_t *rewriteconds;    /* the RewriteCond entries (temporary) */
+    ap_array_header_t *rewriterules;    /* the RewriteRule entries */
     char         *directory;       /* the directory where it applies */
     char         *baseurl;         /* the base-URL  where it applies */
 } rewrite_perdir_conf;
 
 
     /* the cache structures,
-     * a 4-way hash table with LRU functionality
+     * a 4-way hash ap_table_t with LRU functionality
      */
 typedef struct cacheentry {
     time_t time;
@@ -337,13 +337,13 @@ typedef struct tlbentry {
 
 typedef struct cachelist {
     char         *resource;
-    array_header *entries;
-    array_header *tlb;
+    ap_array_header_t *entries;
+    ap_array_header_t *tlb;
 } cachelist;
 
 typedef struct cache {
-    pool         *pool;
-    array_header *lists;
+    ap_context_t         *pool;
+    ap_array_header_t *lists;
 } cache;
 
 
@@ -364,10 +364,10 @@ typedef struct backrefinfo {
 */
 
     /* config structure handling */
-static void *config_server_create(pool *p, server_rec *s);
-static void *config_server_merge (pool *p, void *basev, void *overridesv);
-static void *config_perdir_create(pool *p, char *path);
-static void *config_perdir_merge (pool *p, void *basev, void *overridesv);
+static void *config_server_create(ap_context_t *p, server_rec *s);
+static void *config_server_merge (ap_context_t *p, void *basev, void *overridesv);
+static void *config_perdir_create(ap_context_t *p, char *path);
+static void *config_perdir_merge (ap_context_t *p, void *basev, void *overridesv);
 
     /* config directive handling */
 static const char *cmd_rewriteengine(cmd_parms *cmd,
@@ -375,7 +375,7 @@ static const char *cmd_rewriteengine(cmd_parms *cmd,
 static const char *cmd_rewriteoptions(cmd_parms *cmd,
                                       rewrite_perdir_conf *dconf,
                                       char *option);
-static const char *cmd_rewriteoptions_setoption(pool *p, int *options,
+static const char *cmd_rewriteoptions_setoption(ap_context_t *p, int *options,
                                                 char *name);
 static const char *cmd_rewritelog     (cmd_parms *cmd, void *dconf, char *a1);
 static const char *cmd_rewriteloglevel(cmd_parms *cmd, void *dconf, char *a1);
@@ -386,22 +386,22 @@ static const char *cmd_rewritebase(cmd_parms *cmd, rewrite_perdir_conf *dconf,
                                    char *a1);
 static const char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf,
                                    char *str);
-static const char *cmd_rewritecond_parseflagfield(pool *p,
+static const char *cmd_rewritecond_parseflagfield(ap_context_t *p,
                                                   rewritecond_entry *new,
                                                   char *str);
-static const char *cmd_rewritecond_setflag(pool *p, rewritecond_entry *cfg,
+static const char *cmd_rewritecond_setflag(ap_context_t *p, rewritecond_entry *cfg,
                                            char *key, char *val);
 static const char *cmd_rewriterule(cmd_parms *cmd, rewrite_perdir_conf *dconf,
                                    char *str);
-static const char *cmd_rewriterule_parseflagfield(pool *p,
+static const char *cmd_rewriterule_parseflagfield(ap_context_t *p,
                                                   rewriterule_entry *new,
                                                   char *str);
-static const char *cmd_rewriterule_setflag(pool *p, rewriterule_entry *cfg,
+static const char *cmd_rewriterule_setflag(ap_context_t *p, rewriterule_entry *cfg,
                                            char *key, char *val);
 
     /* initialisation */
-static void init_module(server_rec *s, pool *p);
-static void init_child(server_rec *s, pool *p);
+static void init_module(server_rec *s, ap_context_t *p);
+static void init_child(server_rec *s, ap_context_t *p);
 
     /* runtime hooks */
 static int hook_uri2file   (request_rec *r);
@@ -410,7 +410,7 @@ static int hook_fixup      (request_rec *r);
 static int handler_redirect(request_rec *r);
 
     /* rewriting engine */
-static int apply_rewrite_list(request_rec *r, array_header *rewriterules,
+static int apply_rewrite_list(request_rec *r, ap_array_header_t *rewriterules,
                               char *perdir);
 static int apply_rewrite_rule(request_rec *r, rewriterule_entry *p,
                               char *perdir);
@@ -422,7 +422,7 @@ static int apply_rewrite_cond(request_rec *r, rewritecond_entry *p,
 static void  splitout_queryargs(request_rec *r, int qsappend);
 static void  fully_qualify_uri(request_rec *r);
 static void  reduce_uri(request_rec *r);
-static void  expand_backref_inbuffer(pool *p, char *buf, int nbuf,
+static void  expand_backref_inbuffer(ap_context_t *p, char *buf, int nbuf,
                                      backrefinfo *bri, char c);
 static char *expand_tildepaths(request_rec *r, char *uri);
 static void  expand_map_lookups(request_rec *r, char *uri, int uri_len);
@@ -447,20 +447,20 @@ static void  rewrite_rand_init(void);
 static int   rewrite_rand(int l, int h);
 
     /* rewriting logfile support */
-static void  open_rewritelog(server_rec *s, pool *p);
+static void  open_rewritelog(server_rec *s, ap_context_t *p);
 static void  rewritelog(request_rec *r, int level, const char *text, ...)
                         __attribute__((format(printf,3,4)));
 static char *current_logtime(request_rec *r);
 
     /* rewriting lockfile support */
-static void rewritelock_create(server_rec *s, pool *p);
-static void rewritelock_open(server_rec *s, pool *p);
+static void rewritelock_create(server_rec *s, ap_context_t *p);
+static void rewritelock_open(server_rec *s, ap_context_t *p);
 static void rewritelock_remove(void *data);
 static void rewritelock_alloc(request_rec *r);
 static void rewritelock_free(request_rec *r);
 
     /* program map support */
-static void  run_rewritemap_programs(server_rec *s, pool *p);
+static void  run_rewritemap_programs(server_rec *s, ap_context_t *p);
 static int   rewritemap_program_child(void *cmd, child_info *pinfo);
 
     /* env variable support */
@@ -470,7 +470,7 @@ static char *lookup_variable(request_rec *r, char *var);
 static char *lookup_header(request_rec *r, const char *name);
 
     /* caching functions */
-static cache *init_cache(pool *p);
+static cache *init_cache(ap_context_t *p);
 static char  *get_cache_string(cache *c, char *res, int mode, time_t mtime,
                                char *key);
 static void   set_cache_string(cache *c, char *res, int mode, time_t mtime,
diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
index f0c2a7b7db..1c8cbff455 100644
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -101,7 +101,7 @@
  * You can use this to dynamically change the capability of your server
  * without bringing it down.
  *
- * Because currently there is only limited built-in support in the Configure
+ * Because currently there is only limited built ap_context_t n support in the Configure
  * script for creating the shared library files (`.so'), please consult your
  * vendors cc(1), ld(1) and dlopen(3) manpages to find out the appropriate
  * compiler and linker flags and insert them manually into the Configuration
@@ -144,10 +144,10 @@ typedef struct moduleinfo {
 } moduleinfo;
 
 typedef struct so_server_conf {
-    array_header *loaded_modules;
+    ap_array_header_t *loaded_modules;
 } so_server_conf;
 
-static void *so_sconf_create(pool *p, server_rec *s)
+static void *so_sconf_create(ap_context_t *p, server_rec *s)
 {
     so_server_conf *soc;
 
@@ -269,7 +269,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
     ap_add_loaded_module(modp);
 
     /* 
-     * Register a cleanup in the config pool (normally pconf). When
+     * Register a cleanup in the config ap_context_t (normally pconf). When
      * we do a restart (or shutdown) this cleanup will cause the
      * shared object to be unloaded.
      */
@@ -344,7 +344,7 @@ module MODULE_VAR_EXPORT so_module = {
    NULL,			/* merge per-dir config */
    so_sconf_create,		/* server config */
    NULL,			/* merge server config */
-   so_cmds,			/* command table */
+   so_cmds,			/* command ap_table_t */
    NULL,			/* handlers */
    NULL,			/* filename translation */
    NULL,			/* check_user_id */
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index eb0e76a5e1..f81c88f4b3 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -98,7 +98,7 @@ typedef struct {
  * bother to have such a function.
  */
 
-static void *mkconfig(pool *p)
+static void *mkconfig(ap_context_t *p)
 {
     spconfig *cfg = ap_pcalloc(p, sizeof(spconfig));
 
@@ -110,7 +110,7 @@ static void *mkconfig(pool *p)
  * Respond to a callback to create configuration record for a server or
  * vhost environment.
  */
-static void *create_mconfig_for_server(pool *p, server_rec *s)
+static void *create_mconfig_for_server(ap_context_t *p, server_rec *s)
 {
     return mkconfig(p);
 }
@@ -118,7 +118,7 @@ static void *create_mconfig_for_server(pool *p, server_rec *s)
 /*
  * Respond to a callback to create a config record for a specific directory.
  */
-static void *create_mconfig_for_directory(pool *p, char *dir)
+static void *create_mconfig_for_directory(ap_context_t *p, char *dir)
 {
     return mkconfig(p);
 }
@@ -231,7 +231,7 @@ static int check_speling(request_rec *r)
     int filoc, dotloc, urlen, pglen;
     DIR *dirp;
     struct DIR_TYPE *dir_entry;
-    array_header *candidates = NULL;
+    ap_array_header_t *candidates = NULL;
 
     cfg = ap_get_module_config(r->per_dir_config, &speling_module);
     if (!cfg->enabled) {
@@ -428,11 +428,11 @@ static int check_speling(request_rec *r)
          * returned.
          */
         else {
-            pool *p;
-            table *notes;
-	    pool *sub_pool;
-	    array_header *t;
-	    array_header *v;
+            ap_context_t *p;
+            ap_table_t *notes;
+	    ap_context_t *sub_pool;
+	    ap_array_header_t *t;
+	    ap_array_header_t *v;
 
 
             if (r->main == NULL) {
@@ -514,7 +514,7 @@ static int check_speling(request_rec *r)
 	    }
 
 
-            /* Pass our table to http_protocol.c (see mod_negotiation): */
+            /* Pass our ap_table_t to http_protocol.c (see mod_negotiation): */
             ap_table_setn(notes, "variant-list", ap_array_pstrcat(p, t, 0));
 
 	    ap_table_mergen(r->subprocess_env, "VARIANTS",
@@ -544,7 +544,7 @@ module MODULE_VAR_EXPORT speling_module =
     NULL,                       /* merge per-dir config */
     create_mconfig_for_server,  /* server config */
     NULL,                       /* merge server config */
-    speling_cmds,               /* command table */
+    speling_cmds,               /* command ap_table_t */
     NULL,                       /* handlers */
     register_hooks		/* register hooks */
 };
diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index 105d0040e9..ffcc59dcb9 100644
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -99,8 +99,8 @@ module userdir_module;
 typedef struct userdir_config {
     int globally_disabled;
     char *userdir;
-    table *enabled_users;
-    table *disabled_users;
+    ap_table_t *enabled_users;
+    ap_table_t *disabled_users;
 }              userdir_config;
 
 /*
@@ -109,7 +109,7 @@ typedef struct userdir_config {
  * explicit) disablement, and the replacement string for all others.
  */
 
-static void *create_userdir_config(pool *p, server_rec *s)
+static void *create_userdir_config(ap_context_t *p, server_rec *s)
 {
     userdir_config
     * newcfg = (userdir_config *) ap_pcalloc(p, sizeof(userdir_config));
@@ -137,7 +137,7 @@ static const char *set_user_dir(cmd_parms *cmd, void *dummy, char *arg)
     const char
         *usernames = arg;
     char *kw = ap_getword_conf(cmd->pool, &usernames);
-    table *usertable;
+    ap_table_t *usertable;
 
     /*
      * Let's do the comparisons once.
@@ -340,7 +340,7 @@ module userdir_module = {
     NULL,                       /* dir merger --- default is to override */
     create_userdir_config,      /* server config */
     NULL,                       /* merge server config */
-    userdir_cmds,               /* command table */
+    userdir_cmds,               /* command ap_table_t */
     NULL,                       /* handlers */
     register_hooks              /* register hooks */
 };
diff --git a/modules/mappers/mod_vhost_alias.c b/modules/mappers/mod_vhost_alias.c
index 65cc5a2ef4..57ea60183f 100644
--- a/modules/mappers/mod_vhost_alias.c
+++ b/modules/mappers/mod_vhost_alias.c
@@ -101,7 +101,7 @@ typedef struct mva_sconf_t {
     mva_mode_e cgi_root_mode;
 } mva_sconf_t;
 
-static void *mva_create_server_config(pool *p, server_rec *s)
+static void *mva_create_server_config(ap_context_t *p, server_rec *s)
 {
     mva_sconf_t *conf;
 
@@ -113,7 +113,7 @@ static void *mva_create_server_config(pool *p, server_rec *s)
     return conf;
 }
 
-static void *mva_merge_server_config(pool *p, void *parentv, void *childv)
+static void *mva_merge_server_config(ap_context_t *p, void *parentv, void *childv)
 {
     mva_sconf_t *parent = (mva_sconf_t *) parentv;
     mva_sconf_t *child = (mva_sconf_t *) childv;
@@ -466,7 +466,7 @@ module MODULE_VAR_EXPORT vhost_alias_module =
     NULL,			/* dir merger --- default is to override */
     mva_create_server_config,	/* server config */
     mva_merge_server_config,	/* merge server configs */
-    mva_commands,		/* command table */
+    mva_commands,		/* command ap_table_t */
     NULL,			/* handlers */
     mva_translate,		/* filename translation */
     NULL,			/* check_user_id */