httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1701145 - /httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
Date Thu, 03 Sep 2015 22:59:19 GMT
Author: ylavic
Date: Thu Sep  3 22:59:18 2015
New Revision: 1701145

URL: http://svn.apache.org/r1701145
Log:
mod_ssl: fix compiler warning (bad cast).

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

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?rev=1701145&r1=1701144&r2=1701145&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Thu Sep  3 22:59:18 2015
@@ -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)



Mime
View raw message