Commit cd0c61b0 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1629440, r1629441, r1681424, r1681440, r1681685 from trunk: 

Style (mostly indent)
remove a useless local variable initialization

More style

Constify + save a few bytes in conf pool (+ some minor space adjustments)

Save a few bytes in conf pool and axe a function that duplicates 'ap_set_string_slot'

Save a few bytes in conf pool
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682889 13f79535-47bb-0310-9956-ffa450edef68
parent 83b693a1

STATUS

+0 −16
Changes for STATUS: 0 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -105,22 +105,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) Easy proposals:

        mod_allowmethods: Style (mostly indent)

        mod_allowmethods: More style

        mod_proxy_express: Constify + save a few bytes in conf pool

                           (+ some minor space adjustments)

        mod_authn_dbm: Save a few bytes in conf pool and axe a function

                       that duplicates 'ap_set_string_slot'

        mod_auth_basic: Save a few bytes in conf pool

     trunk patch:

        http://svn.apache.org/r1629440

        http://svn.apache.org/r1629441

        http://svn.apache.org/r1681424

        http://svn.apache.org/r1681440

        http://svn.apache.org/r1681685

     2.4.x patch: trunk patch works

     +1: jailletc36, ylavic, rjung





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/aaa/mod_allowmethods.c

+11 −6
Changes for modules/aaa/mod_allowmethods.c: 11 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ static void *am_create_conf(apr_pool_t * p, char *dummy) 
    return conf;

}



static void* am_merge_conf(apr_pool_t* pool, void* a, void* b) {

static void *am_merge_conf(apr_pool_t *pool, void *a, void *b)

{

    am_conf_t *base = (am_conf_t *)a;

    am_conf_t *add = (am_conf_t *)b;

    am_conf_t *conf = apr_palloc(pool, sizeof(am_conf_t));
@@ -93,7 +94,8 @@ static void* am_merge_conf(apr_pool_t* pool, void* a, void* b) { 
    if (add->allowed_set) {

        conf->allowed = add->allowed;

        conf->allowed_set = add->allowed_set;

  } else {

    }

    else {

        conf->allowed = base->allowed;

        conf->allowed_set = base->allowed_set;

    }
@@ -101,10 +103,12 @@ static void* am_merge_conf(apr_pool_t* pool, void* a, void* b) { 
    return conf;

}



static const char *am_allowmethods(cmd_parms *cmd, void *d, int argc, char *const argv[])

static const char *am_allowmethods(cmd_parms *cmd, void *d, int argc,

                                   char *const argv[])

{

    int i;

    am_conf_t *conf = (am_conf_t *)d;



    if (argc == 0) {

        return "AllowMethods: No method or 'reset' keyword given";

    }
@@ -117,10 +121,12 @@ static const char *am_allowmethods(cmd_parms *cmd, void *d, int argc, char *cons 
    }



    for (i = 0; i < argc; i++) {

    int m = 0;

        int m;



        m = ap_method_number_of(argv[i]);

        if (m == M_INVALID) {

      return apr_pstrcat(cmd->pool, "AllowMethods: Invalid Method '", argv[i], "'", NULL);

            return apr_pstrcat(cmd->pool, "AllowMethods: Invalid Method '",

                               argv[i], "'", NULL);

        }



        conf->allowed |= (AP_METHOD_BIT << m);
@@ -150,4 +156,3 @@ AP_DECLARE_MODULE(allowmethods) = { 
    am_cmds,

    am_register_hooks,

};

modules/aaa/mod_auth_basic.c

+1 −1
Changes for modules/aaa/mod_auth_basic.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static const char *set_use_digest_algorithm(cmd_parms *cmd, void *config, 
                           "AuthBasicUseDigestAlgorithm: ", alg, NULL);

    }



    conf->use_digest_algorithm = apr_pstrdup(cmd->pool, alg);

    conf->use_digest_algorithm = alg;

    conf->use_digest_algorithm_set = 1;



    return NULL;

modules/aaa/mod_authn_dbm.c

+2 −12
Changes for modules/aaa/mod_authn_dbm.c: 2 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -59,23 +59,13 @@ static void *create_authn_dbm_dir_config(apr_pool_t *p, char *d) 
    return conf;

}



static const char *set_dbm_type(cmd_parms *cmd,

                                void *dir_config,

                                const char *arg)

{

    authn_dbm_config_rec *conf = dir_config;



    conf->dbmtype = apr_pstrdup(cmd->pool, arg);

    return NULL;

}



static const command_rec authn_dbm_cmds[] =

{

    AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,

     (void *)APR_OFFSETOF(authn_dbm_config_rec, pwfile),

     OR_AUTHCFG, "dbm database file containing user IDs and passwords"),

    AP_INIT_TAKE1("AuthDBMType", set_dbm_type,

     NULL,

    AP_INIT_TAKE1("AuthDBMType", ap_set_string_slot,

     (void *)APR_OFFSETOF(authn_dbm_config_rec, dbmtype),

     OR_AUTHCFG, "what type of DBM file the user file is"),

    {NULL}

};

modules/proxy/mod_proxy_express.c

+4 −4
Changes for modules/proxy/mod_proxy_express.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ module AP_MODULE_DECLARE_DATA proxy_express_module; 
static int proxy_available = 0;



typedef struct {

    char *dbmfile;

    char *dbmtype;

    const char *dbmfile;

    const char *dbmtype;

    int enabled;

} express_server_conf;
@@ -48,7 +48,8 @@ static const char *set_dbmtype(cmd_parms *cmd, 
    express_server_conf *sconf;

    sconf = ap_get_module_config(cmd->server->module_config, &proxy_express_module);



    sconf->dbmtype = apr_pstrdup(cmd->pool, arg);

    sconf->dbmtype = arg;



    return NULL;

}
@@ -220,4 +221,3 @@ AP_DECLARE_MODULE(proxy_express) = 
    command_table,  /* table of config file commands */

    register_hooks  /* register hooks */

};