From: Stefan Fritsch <sf@apache.org>
Date: Sat, 29 Dec 2012 22:22:13 +0000 (+0000)
Subject: Fix warning about discarding 'const' qualifier from pointer
X-Git-Tag: 2.5.0-alpha~5940
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=304f1d01bc2e5f33c653461e4193ae1a2b0f94af;p=apache

Fix warning about discarding 'const' qualifier from pointer


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

diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
index 6cdbdc1b18..0785a576a1 100644
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -360,7 +360,7 @@ BOOL SSL_X509_match_name(apr_pool_t *p, X509 *x509, const char *name,
      */
 
     if (SSL_X509_getIDs(p, x509, &ids)) {
-        char *cp;
+        const char *cp;
         int i;
         char **id = (char **)ids->elts;
         BOOL is_wildcard;
@@ -383,7 +383,7 @@ BOOL SSL_X509_match_name(apr_pool_t *p, X509 *x509, const char *name,
              * to match a dot. Otherwise, try a simple string compare.
              */
             if ((allow_wildcard == TRUE && is_wildcard == TRUE &&
-                 (cp = strchr(name, '.')) && !strcasecmp(id[i]+1, cp)) ||
+                 (cp = ap_strchr_c(name, '.')) && !strcasecmp(id[i]+1, cp)) ||
                 !strcasecmp(id[i], name)) {
                 matched = TRUE;
             }