| 362 | } |
| 363 | |
| 364 | static void modssl_ctx_cfg_merge_server(apr_pool_t *p, |
| 365 | modssl_ctx_t *base, |
| 366 | modssl_ctx_t *add, |
| 367 | modssl_ctx_t *mrg) |
| 368 | { |
| 369 | modssl_ctx_cfg_merge(p, base, add, mrg); |
| 370 | |
| 371 | /* |
| 372 | * For better backwards compatibility with releases up to 2.4.7, |
| 373 | * merging global and vhost-level SSLCertificateFile and |
| 374 | * SSLCertificateKeyFile directives needs special treatment. |
| 375 | * See also PR 56306 and 56353. |
| 376 | */ |
| 377 | modssl_ctx_cfg_merge_certkeys_array(p, base->pks->cert_files, |
| 378 | add->pks->cert_files, |
| 379 | mrg->pks->cert_files); |
| 380 | modssl_ctx_cfg_merge_certkeys_array(p, base->pks->key_files, |
| 381 | add->pks->key_files, |
| 382 | mrg->pks->key_files); |
| 383 | |
| 384 | cfgMergeString(pks->ca_name_path); |
| 385 | cfgMergeString(pks->ca_name_file); |
| 386 | |
| 387 | #ifdef HAVE_TLS_SESSION_TICKETS |
| 388 | cfgMergeString(ticket_key->file_path); |
| 389 | #endif |
| 390 | } |
| 391 | |
| 392 | void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv) |
| 393 | { |
no test coverage detected