Commit 26426a25 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

"new" is a c++ keyword; s/new/mrg/g in config merge functions 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94244 13f79535-47bb-0310-9956-ffa450edef68
parent 178d0d75

mod_ssl.h

+4 −4
Changes for mod_ssl.h: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -198,10 +198,10 @@ 


#define strIsEmpty(s)    (s == NULL || s[0] == NUL)



#define cfgMerge(el,unset)  new->el = (add->el == (unset)) ? base->el : add->el

#define cfgMergeArray(el)   new->el = apr_array_append(p, add->el, base->el)

#define cfgMergeTable(el)   new->el = apr_table_overlay(p, add->el, base->el)

#define cfgMergeCtx(el)     new->el = apr_table_overlay(p, add->el, base->el)

#define cfgMerge(el,unset)  mrg->el = (add->el == (unset)) ? base->el : add->el

#define cfgMergeArray(el)   mrg->el = apr_array_append(p, add->el, base->el)

#define cfgMergeTable(el)   mrg->el = apr_table_overlay(p, add->el, base->el)

#define cfgMergeCtx(el)     mrg->el = apr_table_overlay(p, add->el, base->el)

#define cfgMergeString(el)  cfgMerge(el, NULL)

#define cfgMergeBool(el)    cfgMerge(el, UNSET)

#define cfgMergeInt(el)     cfgMerge(el, UNSET)

ssl_engine_config.c

+11 −11
Changes for ssl_engine_config.c: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv) 
    int i;

    SSLSrvConfigRec *base = (SSLSrvConfigRec *)basev;

    SSLSrvConfigRec *add  = (SSLSrvConfigRec *)addv;

    SSLSrvConfigRec *new  = (SSLSrvConfigRec *)apr_palloc(p, sizeof(*new));

    SSLSrvConfigRec *mrg  = (SSLSrvConfigRec *)apr_palloc(p, sizeof(*mrg));



    cfgMerge(mc, NULL);

    cfgMergeString(szVHostID);
@@ -232,7 +232,7 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv) 
    cfgMerge(pSSLProxyCtx, NULL);

#endif



    return new;

    return mrg;

}



/*
@@ -265,23 +265,23 @@ void *ssl_config_perdir_merge(apr_pool_t *p, void *basev, void *addv) 
{

    SSLDirConfigRec *base = (SSLDirConfigRec *)basev;

    SSLDirConfigRec *add  = (SSLDirConfigRec *)addv;

    SSLDirConfigRec *new  = (SSLDirConfigRec *)apr_palloc(p, sizeof(*new));

    SSLDirConfigRec *mrg  = (SSLDirConfigRec *)apr_palloc(p, sizeof(*mrg));



    cfgMerge(bSSLRequired, FALSE);

    cfgMergeArray(aRequirement);



    if (add->nOptions & SSL_OPT_RELSET) {

        new->nOptionsAdd =

        mrg->nOptionsAdd =

            (base->nOptionsAdd & ~(add->nOptionsDel)) | add->nOptionsAdd;

        new->nOptionsDel =

        mrg->nOptionsDel =

            (base->nOptionsDel & ~(add->nOptionsAdd)) | add->nOptionsDel;

        new->nOptions    =

            (base->nOptions    & ~(new->nOptionsDel)) | new->nOptionsAdd;

        mrg->nOptions    =

            (base->nOptions    & ~(mrg->nOptionsDel)) | mrg->nOptionsAdd;

    }

    else {

        new->nOptions    = add->nOptions;

        new->nOptionsAdd = add->nOptionsAdd;

        new->nOptionsDel = add->nOptionsDel;

        mrg->nOptions    = add->nOptions;

        mrg->nOptionsAdd = add->nOptionsAdd;

        mrg->nOptionsDel = add->nOptionsDel;

    }



    cfgMergeString(szCipherSuite);
@@ -291,7 +291,7 @@ void *ssl_config_perdir_merge(apr_pool_t *p, void *basev, void *addv) 
    cfgMergeString(szCACertificatePath);

    cfgMergeString(szCACertificateFile);



    return new;

    return mrg;

}



/*