Commit e1602b91 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

moving cfgMerge macros to ssl_engine_config.c, they are not used anywhere else 


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

mod_ssl.h

+0 −6
Changes for mod_ssl.h: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -190,12 +190,6 @@ 


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



#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 cfgMergeString(el)  cfgMerge(el, NULL)

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

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



#define myConnConfig(c) \

(SSLConnRec *)ap_get_module_config(c->conn_config, &ssl_module)

#define myConnConfigSet(c, val) \

ssl_engine_config.c

+6 −0
Changes for ssl_engine_config.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -203,6 +203,12 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s) 
    return sc;

}



#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 cfgMergeString(el)  cfgMerge(el, NULL)

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

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



/*

 *  Merge per-server SSL configurations

 */