]> granicus.if.org Git - apache/commitdiff
mod_ssl: fix compiler warning (bad cast).
authorYann Ylavic <ylavic@apache.org>
Thu, 3 Sep 2015 22:59:18 +0000 (22:59 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 3 Sep 2015 22:59:18 +0000 (22:59 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1701145 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_kernel.c

index b9abb196f9f86244a71bf8e1cae7e39323066dbd..1875dc9bd0b2e346e10829797ba8eb8a98f28776 100644 (file)
@@ -2211,9 +2211,8 @@ int ssl_callback_alpn_select(SSL *ssl,
      */
     init_vhost(c, ssl);
     
-    proposed = (const unsigned char *)ap_select_protocol(c, NULL, sslconn->server, 
-                                                         client_protos);
-    *out = proposed? proposed : ap_get_protocol(c);
+    proposed = ap_select_protocol(c, NULL, sslconn->server, client_protos);
+    *out = (const unsigned char *)(proposed? proposed : ap_get_protocol(c));
     len = strlen((const char*)*out);
     if (len > 255) {
         ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(02840)