Commit a2145db4 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

The style police have arrested mod_alias on charges of violating law and 

order.  It has been released after submitting to rehabilitation.
(No functional changes.)


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

modules/mappers/mod_alias.c

+119 −114
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static void *merge_alias_config(apr_pool_t *p, void *basev, void *overridesv) 
{

    alias_server_conf *a =

    (alias_server_conf *) apr_pcalloc(p, sizeof(alias_server_conf));

    alias_server_conf *base = (alias_server_conf *) basev, *overrides = (alias_server_conf *) overridesv;

    alias_server_conf *base = (alias_server_conf *) basev;

    alias_server_conf *overrides = (alias_server_conf *) overridesv;



    a->aliases = apr_array_append(p, overrides->aliases, base->aliases);

    a->redirects = apr_array_append(p, overrides->redirects, base->redirects);
@@ -130,7 +131,8 @@ static void *merge_alias_dir_config(apr_pool_t *p, void *basev, void *overridesv 
{

    alias_dir_conf *a =

    (alias_dir_conf *) apr_pcalloc(p, sizeof(alias_dir_conf));

    alias_dir_conf *base = (alias_dir_conf *) basev, *overrides = (alias_dir_conf *) overridesv;

    alias_dir_conf *base = (alias_dir_conf *) basev;

    alias_dir_conf *overrides = (alias_dir_conf *) overridesv;

    a->redirects = apr_array_append(p, overrides->redirects, base->redirects);

    return a;

}
@@ -320,7 +322,8 @@ static int alias_matches(const char *uri, const char *alias_fakename) 
    return urip - uri;

}



static char *try_alias_list(request_rec *r, apr_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];
@@ -332,7 +335,8 @@ static char *try_alias_list(request_rec *r, apr_array_header_t *aliases, int doe 
        int l;



        if (p->regexp) {

	    if (!ap_regexec(p->regexp, r->uri, p->regexp->re_nsub + 1, regm, 0)) {

            if (!ap_regexec(p->regexp, r->uri, p->regexp->re_nsub + 1, regm,

                            0)) {

                if (p->real) {

                    found = ap_pregsub(r->pool, p->real, r->uri,

                                    p->regexp->re_nsub + 1, regm);
@@ -405,8 +409,9 @@ static int translate_alias_redir(request_rec *r) 
    char *ret;

    int status;



    if (r->uri[0] != '/' && r->uri[0] != '\0')

    if (r->uri[0] != '/' && r->uri[0] != '\0') {

        return DECLINED;

    }



    if ((ret = try_alias_list(r, serverconf->redirects, 1, &status)) != NULL) {

        if (ap_is_HTTP_REDIRECT(status)) {