You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2022/06/21 15:21:19 UTC
[tomcat] branch main updated: Avoid using an improbable allocator for this
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new d1f8f1bfc1 Avoid using an improbable allocator for this
d1f8f1bfc1 is described below
commit d1f8f1bfc19dbe5b7e4472dbaf96263ac9ba12cf
Author: remm <re...@apache.org>
AuthorDate: Tue Jun 21 17:21:00 2022 +0200
Avoid using an improbable allocator for this
Implicit allocator works fine. Thanks to Maurizio Cimadamore for the
review.
---
.../org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index a16f1dc37c..020b90009c 100644
--- a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -568,13 +568,13 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext {
// List the ciphers that the client is permitted to negotiate
if (minTlsVersion <= TLS1_2_VERSION()) {
if (SSL_CTX_set_cipher_list(state.sslCtx,
- SegmentAllocator.newNativeArena(state.contextMemorySession).allocateUtf8String(sslHostConfig.getCiphers())) <= 0) {
+ SegmentAllocator.implicitAllocator().allocateUtf8String(sslHostConfig.getCiphers())) <= 0) {
log.warn(sm.getString("engine.failedCipherList", sslHostConfig.getCiphers()));
}
}
if (maxTlsVersion >= TLS1_3_VERSION() && (sslHostConfig.getCiphers() != SSLHostConfig.DEFAULT_TLS_CIPHERS)) {
if (SSL_CTX_set_ciphersuites(state.sslCtx,
- SegmentAllocator.newNativeArena(state.contextMemorySession).allocateUtf8String(sslHostConfig.getCiphers())) <= 0) {
+ SegmentAllocator.implicitAllocator().allocateUtf8String(sslHostConfig.getCiphers())) <= 0) {
log.warn(sm.getString("engine.failedCipherSuite", sslHostConfig.getCiphers()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org