From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 3 Sep 2015 22:59:18 +0000 (+0000)
Subject: mod_ssl: fix compiler warning (bad cast).
X-Git-Tag: 2.5.0-alpha~2872
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cad3cbd7f64349f15a49b92b526cfef860f27aa5;p=apache

mod_ssl: fix compiler warning (bad cast).

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

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index b9abb196f9..1875dc9bd0 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -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)