Clean up some of the includes:

[apache] / modules / mappers / mod_alias.c

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index c99bc699e94b7484b07882e11b82274fade40a01..ea31c3398d4a3017fca226ff02e7c275fe616686 100644 (file)
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -64,13 +64,17 @@
  * 
  */
 
+#include "apr_strings.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
 
 typedef struct {
     const char *real;
@@ -81,51 +85,51 @@ typedef struct {
 } alias_entry;
 
 typedef struct {
-    ap_array_header_t *aliases;
-    ap_array_header_t *redirects;
+    apr_array_header_t *aliases;
+    apr_array_header_t *redirects;
 } alias_server_conf;
 
 typedef struct {
-    ap_array_header_t *redirects;
+    apr_array_header_t *redirects;
 } alias_dir_conf;
 
-module MODULE_VAR_EXPORT alias_module;
+module AP_MODULE_DECLARE_DATA alias_module;
 
-static void *create_alias_config(ap_pool_t *p, server_rec *s)
+static void *create_alias_config(apr_pool_t *p, server_rec *s)
 {
     alias_server_conf *a =
-    (alias_server_conf *) ap_pcalloc(p, sizeof(alias_server_conf));
+    (alias_server_conf *) apr_pcalloc(p, sizeof(alias_server_conf));
 
-    a->aliases = ap_make_array(p, 20, sizeof(alias_entry));
-    a->redirects = ap_make_array(p, 20, sizeof(alias_entry));
+    a->aliases = apr_array_make(p, 20, sizeof(alias_entry));
+    a->redirects = apr_array_make(p, 20, sizeof(alias_entry));
     return a;
 }
 
-static void *create_alias_dir_config(ap_pool_t *p, char *d)
+static void *create_alias_dir_config(apr_pool_t *p, char *d)
 {
     alias_dir_conf *a =
-    (alias_dir_conf *) ap_pcalloc(p, sizeof(alias_dir_conf));
-    a->redirects = ap_make_array(p, 2, sizeof(alias_entry));
+    (alias_dir_conf *) apr_pcalloc(p, sizeof(alias_dir_conf));
+    a->redirects = apr_array_make(p, 2, sizeof(alias_entry));
     return a;
 }
 
-static void *merge_alias_config(ap_pool_t *p, void *basev, void *overridesv)
+static void *merge_alias_config(apr_pool_t *p, void *basev, void *overridesv)
 {
     alias_server_conf *a =
-    (alias_server_conf *) ap_pcalloc(p, sizeof(alias_server_conf));
+    (alias_server_conf *) apr_pcalloc(p, sizeof(alias_server_conf));
     alias_server_conf *base = (alias_server_conf *) basev, *overrides = (alias_server_conf *) overridesv;
 
-    a->aliases = ap_append_arrays(p, overrides->aliases, base->aliases);
-    a->redirects = ap_append_arrays(p, overrides->redirects, base->redirects);
+    a->aliases = apr_array_append(p, overrides->aliases, base->aliases);
+    a->redirects = apr_array_append(p, overrides->redirects, base->redirects);
     return a;
 }
 
-static void *merge_alias_dir_config(ap_pool_t *p, void *basev, void *overridesv)
+static void *merge_alias_dir_config(apr_pool_t *p, void *basev, void *overridesv)
 {
     alias_dir_conf *a =
-    (alias_dir_conf *) ap_pcalloc(p, sizeof(alias_dir_conf));
+    (alias_dir_conf *) apr_pcalloc(p, sizeof(alias_dir_conf));
     alias_dir_conf *base = (alias_dir_conf *) basev, *overrides = (alias_dir_conf *) overridesv;
-    a->redirects = ap_append_arrays(p, overrides->redirects, base->redirects);
+    a->redirects = apr_array_append(p, overrides->redirects, base->redirects);
     return a;
 }
 
@@ -136,7 +140,7 @@ static const char *add_alias_internal(cmd_parms *cmd, void *dummy,
     server_rec *s = cmd->server;
     alias_server_conf *conf =
     (alias_server_conf *) ap_get_module_config(s->module_config, &alias_module);
-    alias_entry *new = ap_push_array(conf->aliases);
+    alias_entry *new = apr_array_push(conf->aliases);
 
     /* XX r can NOT be relative to DocumentRoot here... compat bug. */
 
@@ -144,10 +148,16 @@ static const char *add_alias_internal(cmd_parms *cmd, void *dummy,
        new->regexp = ap_pregcomp(cmd->pool, f, REG_EXTENDED);
        if (new->regexp == NULL)
            return "Regular expression could not be compiled.";
+        new->real = r;
     }
+#ifndef OS2
+    else
+        new->real = ap_os_canonical_filename(cmd->pool, r);
+#else
+    new->real = r;
+#endif
 
     new->fake = f;
-    new->real = r;
     new->handler = cmd->info;
 
     return NULL;
@@ -187,7 +197,7 @@ static const char *add_redirect_internal(cmd_parms *cmd,
        status = HTTP_MOVED_TEMPORARILY;
     else if (!strcasecmp(arg1, "seeother"))
        status = HTTP_SEE_OTHER;
-    else if (ap_isdigit(*arg1))
+    else if (apr_isdigit(*arg1))
        status = atoi(arg1);
     else {
        f = arg1;
@@ -212,9 +222,9 @@ static const char *add_redirect_internal(cmd_parms *cmd,
     }
 
     if (cmd->path)
-       new = ap_push_array(dirconf->redirects);
+       new = apr_array_push(dirconf->redirects);
     else
-       new = ap_push_array(serverconf->redirects);
+       new = apr_array_push(serverconf->redirects);
 
     new->fake = f;
     new->real = url;
@@ -308,7 +318,7 @@ static int alias_matches(const char *uri, const char *alias_fakename)
     return urip - uri;
 }
 
-static char *try_alias_list(request_rec *r, ap_array_header_t *aliases, int doesc, int *status)
+static char *try_alias_list(request_rec *r, apr_array_header_t *aliases, int doesc, int *status)
 {
     alias_entry *entries = (alias_entry *) aliases->elts;
     regmatch_t regm[10];
@@ -330,7 +340,7 @@ static char *try_alias_list(request_rec *r, ap_array_header_t *aliases, int does
                }
                else {
                    /* need something non-null */
-                   found = ap_pstrdup(r->pool, "");
+                   found = apr_pstrdup(r->pool, "");
                }
            }
        }
@@ -342,17 +352,17 @@ static char *try_alias_list(request_rec *r, ap_array_header_t *aliases, int does
                    char *escurl;
                    escurl = ap_os_escape_path(r->pool, r->uri + l, 1);
 
-                   found = ap_pstrcat(r->pool, p->real, escurl, NULL);
+                   found = apr_pstrcat(r->pool, p->real, escurl, NULL);
                }
                else
-                   found = ap_pstrcat(r->pool, p->real, r->uri + l, NULL);
+                   found = apr_pstrcat(r->pool, p->real, r->uri + l, NULL);
            }
        }
 
        if (found) {
            if (p->handler) {   /* Set handler, and leave a note for mod_cgi */
                r->handler = p->handler;
-               ap_table_setn(r->notes, "alias-forced-type", r->handler);
+               apr_table_setn(r->notes, "alias-forced-type", r->handler);
            }
 
            *status = p->redir_status;
@@ -380,9 +390,9 @@ static int translate_alias_redir(request_rec *r)
        if (ap_is_HTTP_REDIRECT(status)) {
            /* include QUERY_STRING if any */
            if (r->args) {
-               ret = ap_pstrcat(r->pool, ret, "?", r->args, NULL);
+               ret = apr_pstrcat(r->pool, ret, "?", r->args, NULL);
            }
-           ap_table_setn(r->headers_out, "Location", ret);
+           apr_table_setn(r->headers_out, "Location", ret);
        }
        return status;
     }
@@ -407,29 +417,28 @@ static int fixup_redir(request_rec *r)
 
     if ((ret = try_alias_list(r, dirconf->redirects, 1, &status)) != NULL) {
        if (ap_is_HTTP_REDIRECT(status))
-           ap_table_setn(r->headers_out, "Location", ret);
+           apr_table_setn(r->headers_out, "Location", ret);
        return status;
     }
 
     return DECLINED;
 }
 
-static void register_hooks(void)
+static void register_hooks(apr_pool_t *p)
 {
     static const char * const aszPre[]={ "mod_userdir.c",NULL };
 
-    ap_hook_translate_name(translate_alias_redir,aszPre,NULL,AP_HOOK_MIDDLE);
-    ap_hook_fixups(fixup_redir,NULL,NULL,AP_HOOK_MIDDLE);
+    ap_hook_translate_name(translate_alias_redir,aszPre,NULL,APR_HOOK_MIDDLE);
+    ap_hook_fixups(fixup_redir,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-module MODULE_VAR_EXPORT alias_module =
+module AP_MODULE_DECLARE_DATA alias_module =
 {
     STANDARD20_MODULE_STUFF,
     create_alias_dir_config,   /* dir config creater */
     merge_alias_dir_config,    /* dir merger --- default is to override */
     create_alias_config,       /* server config */
     merge_alias_config,                /* merge server configs */
-    alias_cmds,                        /* command ap_table_t */
-    NULL,                      /* handlers */
+    alias_cmds,                        /* command apr_table_t */
     register_hooks             /* register hooks */
 };