Changeset 4e388b0 in mod_gnutls for src

Timestamp:

Nov 2, 2018, 2:24:00 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

7f2fd55

Parents:

f06c148

Message:

Consistently use strcasecmp() instead of mixing in apr_strnatcasecmp()

Location:

src

Files:

• gnutls_config.c (modified) (1 diff)
• gnutls_hooks.c (modified) (3 diffs)

src/gnutls_config.c

@@ -659 +659 @@
         ap_get_module_config(parms->server->module_config, &gnutls_module);
 
-    if (!apr_strnatcasecmp(parms->directive->directive, "GnuTLSCacheTimeout"))
+    if (!strcasecmp(parms->directive->directive, "GnuTLSCacheTimeout"))
         sc->cache_timeout = apr_time_from_sec(argint);
-    else if (!apr_strnatcasecmp(parms->directive->directive,
-                                "GnuTLSOCSPCacheTimeout"))
+    else if (!strcasecmp(parms->directive->directive,
+                         "GnuTLSOCSPCacheTimeout"))
         sc->ocsp_cache_time = apr_time_from_sec(argint);
-    else if (!apr_strnatcasecmp(parms->directive->directive,
-                                "GnuTLSOCSPFailureTimeout"))
+    else if (!strcasecmp(parms->directive->directive,
+                         "GnuTLSOCSPFailureTimeout"))
         sc->ocsp_failure_timeout = apr_time_from_sec(argint);
-    else if (!apr_strnatcasecmp(parms->directive->directive,
-                                "GnuTLSOCSPFuzzTime"))
+    else if (!strcasecmp(parms->directive->directive,
+                         "GnuTLSOCSPFuzzTime"))
         sc->ocsp_fuzz_time = apr_time_from_sec(argint);
-    else if (!apr_strnatcasecmp(parms->directive->directive,
-                                "GnuTLSOCSPSocketTimeout"))
+    else if (!strcasecmp(parms->directive->directive,
+                         "GnuTLSOCSPSocketTimeout"))
         sc->ocsp_socket_timeout = apr_time_from_sec(argint);
     else

src/gnutls_hooks.c

@@ -31 +31 @@
 #include <util_mutex.h>
 #include <apr_escape.h>
+/* This provides strcmp and related functions */
+#define APR_WANT_STRFUNC
+#include <apr_want.h>
 
 #ifdef ENABLE_MSVA
@@ -880 +883 @@
 
     /* Check ServerName First! */
-    if(apr_strnatcasecmp(x->sni_name, s->server_hostname) == 0) {
+    if (strcasecmp(x->sni_name, s->server_hostname) == 0) {
         // We have a match, save this server configuration
         x->sc = tsc;
@@ -887 +890 @@
     } else if(s->names->nelts) {
         names = s->names;
-        name = (char **)names->elts;
+        name = (char **) names->elts;
         for (int i = 0; i < names->nelts; ++i)
         {
-            if (!name[i]) { continue; }
-            if (apr_strnatcasecmp(x->sni_name, name[i]) == 0) {
+            if (!name[i])
+                continue;
+            if (strcasecmp(x->sni_name, name[i]) == 0)
+            {
                 // We have a match, save this server configuration
                 x->sc = tsc;