From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 22 Sep 2017 11:59:57 +0000 (+0000)
Subject: mod_ssl: follow up to r1809302.
X-Git-Tag: 2.5.0-alpha~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a40e705b5e68c34ddc194b2d5f6ad555785f7d75;p=apache

mod_ssl: follow up to r1809302.

Make use of AP_MODULE_FLAG_ALWAYS_MERGE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809303 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 8505b29903..8fb54b31dc 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -838,4 +838,7 @@ module AP_MODULE_DECLARE_DATA ssl_module = {
     ssl_config_server_merge,    /* merge  per-server config structures */
     ssl_config_cmds,            /* table of configuration directives   */
     ssl_register_hooks          /* register hooks */
+#if AP_MODULE_HAS_FLAGS
+   ,AP_MODULE_FLAG_ALWAYS_MERGE /* flags */
+#endif
 };
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 483a267a5e..f26090814e 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -189,25 +189,6 @@ int ssl_is_challenge(conn_rec *c, const char *servername,
     return 0;
 }
 
-static SSLSrvConfigRec *ssl_config_server_uniq(apr_pool_t *p, server_rec *s,
-                                               server_rec *base_s)
-{
-    SSLSrvConfigRec *sc, *base_sc, *nsc;
-    
-    sc = mySrvConfig(s);
-    if (s != base_s) {
-        base_sc = mySrvConfig(base_s);
-        if (sc == base_sc) {
-            /* Give s its own SSLSrvConfigRec instance by using the
-             * standard create/merge methods. */
-            nsc = ssl_config_server_create(p, s);
-            sc = ssl_config_server_merge(p, base_sc, nsc);
-            ap_set_module_config(s->module_config, &ssl_module, sc);
-        }
-    }
-    return sc;
-}
-
 /*
  *  Per-module initialization
  */
@@ -258,12 +239,6 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
         md_get_certificate = NULL;
     }
 
-    /* Take care that we have individual config records before
-     * we start modifying them. */
-    for (s = base_server->next; s; s = s->next) {
-        sc = ssl_config_server_uniq(p, s, base_server);
-    }
-    
     /*
      *  try to fix the configuration and open the dedicated SSL
      *  logfile as early as possible