summaryrefslogtreecommitdiffstatsabout
path: root/src/gnutls_config.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gnutls_config.c')
-rw-r--r--src/gnutls_config.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/gnutls_config.c b/src/gnutls_config.c
index f9a315c..1194448 100644
--- a/src/gnutls_config.c
+++ b/src/gnutls_config.c
@@ -317,12 +317,27 @@ void *mgs_config_server_create(apr_pool_t * p, server_rec * s)
317 return sc; 317 return sc;
318} 318}
319 319
320void *mgs_config_dir_merge(apr_pool_t *p, void *basev, void *addv)
321{
322 mgs_dirconf_rec *new;
323 mgs_dirconf_rec *base = (mgs_dirconf_rec *) basev;
324 mgs_dirconf_rec *add = (mgs_dirconf_rec *) addv;
325
326 new = (mgs_dirconf_rec *) apr_pcalloc(p, sizeof(mgs_dirconf_rec));
327 new->lua_bytecode = apr_pstrmemdup(p, add->lua_bytecode,
328 add->lua_bytecode_len);
329 new->lua_bytecode_len = add->lua_bytecode_len;
330 new->client_verify_mode = add->client_verify_mode;
331 return new;
332}
333
320void *mgs_config_dir_create(apr_pool_t *p, char *dir) 334void *mgs_config_dir_create(apr_pool_t *p, char *dir)
321{ 335{
322 mgs_dirconf_rec *dc = apr_palloc(p, sizeof(*dc)); 336 mgs_dirconf_rec *dc = apr_palloc(p, sizeof(*dc));
323 337
324 dc->client_verify_mode = -1; 338 dc->client_verify_mode = -1;
325 339 dc->lua_bytecode = NULL;
340 dc->lua_bytecode_len = 0;
326 return dc; 341 return dc;
327} 342}
328 343