Commit 73d08441 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Various code cleanup 

PR: 51398
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>


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

modules/aaa/mod_authnz_ldap.c

+2 −2
Original line number Diff line number Diff line
@@ -1378,8 +1378,8 @@ static const char *mod_auth_ldap_parse_url(cmd_parms *cmd, 
             * Get rid of the surrounding parens; later on when generating the

             * filter, they'll be put back.

             */

            sec->filter = apr_pstrdup(cmd->pool, urld->lud_filter+1);

            sec->filter[strlen(sec->filter)-1] = '\0';

            sec->filter = apr_pstrmemdup(cmd->pool, urld->lud_filter+1,

                                                    strlen(urld->lud_filter)-2);

        }

        else {

            sec->filter = apr_pstrdup(cmd->pool, urld->lud_filter);

modules/cluster/mod_heartmonitor.c

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ static int hm_handler(request_rec *r) 


    ap_set_content_type(r, "text/plain");

    ap_set_content_length(r, 2);

    ap_rprintf(r, "OK");

    ap_rputs("OK", r);

    ap_rflush(r);



    return OK;

modules/dav/fs/repos.c

+1 −2
Original line number Diff line number Diff line
@@ -719,8 +719,7 @@ static dav_error * dav_fs_get_resource( 
    /* make sure the URI does not have a trailing "/" */

    len = strlen(r->uri);

    if (len > 1 && r->uri[len - 1] == '/') {

        s = apr_pstrdup(r->pool, r->uri);

        s[len - 1] = '\0';

        s = apr_pstrmemdup(r->pool, r->uri, len-1);

        resource->uri = s;

    }

    else {

modules/dav/main/mod_dav.c

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ static void *dav_create_dir_config(apr_pool_t *p, char *dir) 
        char *d;

        apr_size_t l;



        d = apr_pstrdup(p, dir);

        l = strlen(d);

        l = strlen(dir);

        d = apr_pstrmemdup(p, dir, l);

        if (l > 1 && d[l - 1] == '/')

            d[l - 1] = '\0';

        conf->dir = d;

modules/mappers/mod_rewrite.c

+2 −2
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ static char *lookup_variable(char *var, rewrite_ctx *ctx) 


    /* fast exit */

    if (varlen < 4) {

        return apr_pstrdup(r->pool, "");

        return "";

    }



    result = NULL;
@@ -2211,7 +2211,7 @@ static char *do_expand(char *input, rewrite_ctx *ctx, rewriterule_entry *entry) 


    /* fast exit */

    if (inputlen == span) {

        return apr_pstrdup(pool, input);

        return apr_pstrmemdup(pool, input, inputlen);

    }



    /* well, actually something to do */