]> granicus.if.org Git - apache/commitdiff
* modules/ssl/ssl_engine_init.c (ssl_init_CheckServers): Fix IP/port
authorJoe Orton <jorton@apache.org>
Thu, 13 Oct 2005 16:35:55 +0000 (16:35 +0000)
committerJoe Orton <jorton@apache.org>
Thu, 13 Oct 2005 16:35:55 +0000 (16:35 +0000)
key generation which passed a bogus pointer for a %pA conversion,
hence could give false warnings for name-based-vhost use.

PR: 37051

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

modules/ssl/ssl_engine_init.c

index 5a2409126d25536f58fd7d3c12e5e9499d2b4462..8ba727c806a256c4865c8d4ace8a4760689cdd5d 100644 (file)
@@ -1053,14 +1053,16 @@ void ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p)
     table = apr_hash_make(p);
 
     for (s = base_server; s; s = s->next) {
+        char *addr;
+
         sc = mySrvConfig(s);
 
         if (!((sc->enabled == SSL_ENABLED_TRUE) && s->addrs)) {
             continue;
         }
 
-        key = apr_psprintf(p, "%pA:%u",
-                           &s->addrs->host_addr, s->addrs->host_port);
+        apr_sockaddr_ip_get(&addr, s->addrs->host_addr);
+        key = apr_psprintf(p, "%s:%u", addr, s->addrs->host_port);
         klen = strlen(key);
 
         if ((ps = (server_rec *)apr_hash_get(table, key, klen))) {