httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1426850 - /httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
Date Sat, 29 Dec 2012 22:22:13 GMT
Author: sf
Date: Sat Dec 29 22:22:13 2012
New Revision: 1426850

URL: http://svn.apache.org/viewvc?rev=1426850&view=rev
Log:
Fix warning about discarding 'const' qualifier from pointer

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c?rev=1426850&r1=1426849&r2=1426850&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c Sat Dec 29 22:22:13 2012
@@ -360,7 +360,7 @@ BOOL SSL_X509_match_name(apr_pool_t *p, 
      */
 
     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, 
              * 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;
             }



Mime
View raw message