This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new f84ad5d Fix NPE
f84ad5d is described below
commit f84ad5d64e34eec5b26e243a73b4e3faa735130e
Author: remm <[email protected]>
AuthorDate: Thu Jan 28 13:14:14 2021 +0100
Fix NPE
---
java/org/apache/tomcat/jni/SSLContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index 8c2f9b9..1810571 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -419,7 +419,8 @@ public final class SSLContext {
}
// Can't be sure OpenSSL is going to provide the SNI value in lower
case
// so convert it before looking up the SSLContext
- return
sniCallBack.getSslContext(sniHostName.toLowerCase(Locale.ENGLISH));
+ String hostName = (sniHostName == null) ? null :
sniHostName.toLowerCase(Locale.ENGLISH);
+ return sniCallBack.getSslContext(hostName);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
