You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2018/10/12 10:59:10 UTC
svn commit: r1843646 - in /tomcat/native/trunk/native: configure.in
src/sslnetwork.c
Author: rjung
Date: Fri Oct 12 10:59:10 2018
New Revision: 1843646
URL: http://svn.apache.org/viewvc?rev=1843646&view=rev
Log:
Silence compiler warning "variable 'session'
set but not used."
Modified:
tomcat/native/trunk/native/configure.in
tomcat/native/trunk/native/src/sslnetwork.c
Modified: tomcat/native/trunk/native/configure.in
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=1843646&r1=1843645&r2=1843646&view=diff
==============================================================================
--- tomcat/native/trunk/native/configure.in (original)
+++ tomcat/native/trunk/native/configure.in Fri Oct 12 10:59:10 2018
@@ -226,6 +226,9 @@ case $host in
*-solaris2*)
APR_ADDTO(TCNATIVE_LIBS, -lkstat)
;;
+ *linux*)
+ APR_ADDTO(CFLAGS, -DTCNATIVE_LINUX)
+ ;;
*)
;;
esac
Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1843646&r1=1843645&r2=1843646&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Fri Oct 12 10:59:10 2018
@@ -625,15 +625,17 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
int error = 0;
char peekbuf[1];
apr_interval_time_t timeout;
+#if defined(SSL_OP_NO_TLSv1_3)
const SSL_SESSION *session;
+#endif
UNREFERENCED_STDARGS;
TCN_ASSERT(sock != 0);
con = (tcn_ssl_conn_t *)s->opaque;
- session = SSL_get_session(con->ssl);
apr_socket_timeout_get(con->sock, &timeout);
#if defined(SSL_OP_NO_TLSv1_3)
+ session = SSL_get_session(con->ssl);
if (SSL_SESSION_get_protocol_version(session) == TLS1_3_VERSION) {
// TLS 1.3 renegotiation
retVal = SSL_verify_client_post_handshake(con->ssl);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org