Changeset f06c148 in mod_gnutls

Timestamp:

Nov 2, 2018, 1:30:33 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

4e388b0

Parents:

6d8c00c

Message:

Simplify wildcard match for virtual host aliases

Files:

• include/mod_gnutls.h.in (modified) (1 diff)
• src/gnutls_hooks.c (modified) (1 diff)

include/mod_gnutls.h.in

@@ -28 +28 @@
 #include "apr_tables.h"
 #include "ap_release.h"
-#include "apr_fnmatch.h"
 /* GnuTLS Library Headers */
 #include <gnutls/gnutls.h>

src/gnutls_hooks.c

@@ -897 +897 @@
             }
         }
-        /* Wild any ServerAlias Directives */
+        /* ServerAlias directives may contain wildcards, check those last. */
     } else if(s->wild_names->nelts) {
         names = s->wild_names;
-        name = (char **)names->elts;
+        name = (char **) names->elts;
         for (int i = 0; i < names->nelts; ++i)
         {
-            if (!name[i]) { continue; }
-            if(apr_fnmatch(name[i], x->sni_name ,
-                           APR_FNM_CASE_BLIND|
-                           APR_FNM_PERIOD|
-                           APR_FNM_PATHNAME|
-                           APR_FNM_NOESCAPE) == APR_SUCCESS) {
+            if (!name[i])
+                continue;
+            if (ap_strcasecmp_match(x->sni_name, name[i]) == 0)
+            {
                 x->sc = tsc;
                 rv = 1;