(tomcat) branch main updated: Further cleanups
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 be3b7efd29 Further cleanups
be3b7efd29 is described below
commit be3b7efd294631644781eea9d51dc50710561977
Author: remm
AuthorDate: Tue Jan 23 10:56:29 2024 +0100
Further cleanups
The newest updates hides all helpers that should not be accessed.
---
java/org/apache/tomcat/util/openssl/openssl_h.java | 457 +
1 file changed, 185 insertions(+), 272 deletions(-)
diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java
b/java/org/apache/tomcat/util/openssl/openssl_h.java
index c1dc9640b3..f006407e23 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -52,6 +52,7 @@ public class openssl_h {
.withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE,
JAVA_BYTE));
public static final ValueLayout.OfLong C_LONG = ValueLayout.JAVA_LONG;
+static final Arena LIBRARY_ARENA = Arena.ofAuto();
static final boolean TRACE_DOWNCALLS =
Boolean.getBoolean("jextract.trace.downcalls");
static void traceDowncall(String name, Object... args) {
@@ -108,7 +109,6 @@ public class openssl_h {
throw new IllegalArgumentException("Invalid type for ABI: " +
c.getTypeName());
}
private static final int BIO_CLOSE = (int)1L;
-
/**
* {@snippet lang=c :
* #define BIO_CLOSE 1
@@ -118,7 +118,6 @@ public class openssl_h {
return BIO_CLOSE;
}
private static final int BIO_CTRL_RESET = (int)1L;
-
/**
* {@snippet lang=c :
* #define BIO_CTRL_RESET 1
@@ -128,7 +127,6 @@ public class openssl_h {
return BIO_CTRL_RESET;
}
private static final int BIO_FP_READ = (int)2L;
-
/**
* {@snippet lang=c :
* #define BIO_FP_READ 2
@@ -138,7 +136,6 @@ public class openssl_h {
return BIO_FP_READ;
}
private static final int BIO_C_SET_FILENAME = (int)108L;
-
/**
* {@snippet lang=c :
* #define BIO_C_SET_FILENAME 108
@@ -148,7 +145,6 @@ public class openssl_h {
return BIO_C_SET_FILENAME;
}
private static final int NID_info_access = (int)177L;
-
/**
* {@snippet lang=c :
* #define NID_info_access 177
@@ -158,7 +154,6 @@ public class openssl_h {
return NID_info_access;
}
private static final int X509_FILETYPE_PEM = (int)1L;
-
/**
* {@snippet lang=c :
* #define X509_FILETYPE_PEM 1
@@ -168,7 +163,6 @@ public class openssl_h {
return X509_FILETYPE_PEM;
}
private static final int X509_L_FILE_LOAD = (int)1L;
-
/**
* {@snippet lang=c :
* #define X509_L_FILE_LOAD 1
@@ -178,7 +172,6 @@ public class openssl_h {
return X509_L_FILE_LOAD;
}
private static final int X509_L_ADD_DIR = (int)2L;
-
/**
* {@snippet lang=c :
* #define X509_L_ADD_DIR 2
@@ -188,7 +181,6 @@ public class openssl_h {
return X509_L_ADD_DIR;
}
private static final int X509_V_OK = (int)0L;
-
/**
* {@snippet lang=c :
* #define X509_V_OK 0
@@ -198,7 +190,6 @@ public class openssl_h {
return X509_V_OK;
}
private static final int X509_V_ERR_CRL_HAS_EXPIRED = (int)12L;
-
/**
* {@snippet lang=c :
* #define X509_V_ERR_CRL_HAS_EXPIRED 12
@@ -208,7 +199,6 @@ public class openssl_h {
return X509_V_ERR_CRL_HAS_EXPIRED;
}
private static final int X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT = (int)18L;
-
/**
* {@snippet lang=c :
* #define X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT 18
@@ -218,7 +208,6 @@ public class openssl_h {
return X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT;
}
private static final int X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN = (int)19L;
-
/**
* {@snippet lang=c :
* #define X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN 19
@@ -228,7 +217,6 @@ public class openssl_h {
return X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN;
}
private static final int X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY =
(int)20L;
-
/**
* {@snippet lang=c :
* #define X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY 20
@@ -238,7 +226,6 @@ public class openssl_h {
return X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY;
}
private static final int X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE =
(int)21L;
-
/**
* {@snippet lang=c :
* #define X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE 21
@@ -248,7 +235,6 @@ public class openssl_h {
return X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE;
}
private static final int X509_V_ERR_CERT_UNTRUSTED = (int)27L;
-
/**
* {@snippet lang=c :
* #define X509_V_ERR_CERT_UNTRUSTED 27
@@ -258,7 +244,6 @@ public class openssl_h {
(tomcat) branch main updated: Clarify docs
This is an automated email from the ASF dual-hosted git repository. markt 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 9cedd38980 Clarify docs 9cedd38980 is described below commit 9cedd38980a011bd3bdd92fa85427f771398cc77 Author: Mark Thomas AuthorDate: Tue Jan 23 10:33:04 2024 + Clarify docs --- webapps/docs/config/cluster-membership.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webapps/docs/config/cluster-membership.xml b/webapps/docs/config/cluster-membership.xml index aa6d453ce8..2ec0d70720 100644 --- a/webapps/docs/config/cluster-membership.xml +++ b/webapps/docs/config/cluster-membership.xml @@ -236,8 +236,9 @@ LocalMember: Static member that is the local member of the static cluster group. -Note: The setting of local member is not required. -It is possible to set up a list of all cluster members including local member instead of setting this components. +Note: It is not necessary to explicitly configure the local member using the +element. All cluster members, including the local member, may be defined using +the element and Tomcat work out which one is the local member. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Clarify docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 092c83b0ee Clarify docs 092c83b0ee is described below commit 092c83b0ee23772c8ea18ec5f33e58810d515d1e Author: Mark Thomas AuthorDate: Tue Jan 23 10:33:04 2024 + Clarify docs --- webapps/docs/config/cluster-membership.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webapps/docs/config/cluster-membership.xml b/webapps/docs/config/cluster-membership.xml index aa6d453ce8..2ec0d70720 100644 --- a/webapps/docs/config/cluster-membership.xml +++ b/webapps/docs/config/cluster-membership.xml @@ -236,8 +236,9 @@ LocalMember: Static member that is the local member of the static cluster group. -Note: The setting of local member is not required. -It is possible to set up a list of all cluster members including local member instead of setting this components. +Note: It is not necessary to explicitly configure the local member using the +element. All cluster members, including the local member, may be defined using +the element and Tomcat work out which one is the local member. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Clarify docs
This is an automated email from the ASF dual-hosted git repository. markt 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 777aca1587 Clarify docs 777aca1587 is described below commit 777aca158742b7551a7f209f360f342203078629 Author: Mark Thomas AuthorDate: Tue Jan 23 10:33:04 2024 + Clarify docs --- webapps/docs/config/cluster-membership.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webapps/docs/config/cluster-membership.xml b/webapps/docs/config/cluster-membership.xml index a8cb0b6fd4..63833d79fb 100644 --- a/webapps/docs/config/cluster-membership.xml +++ b/webapps/docs/config/cluster-membership.xml @@ -236,8 +236,9 @@ LocalMember: Static member that is the local member of the static cluster group. -Note: In Tomcat 9.0.17 and later, The setting of local member is not required. -It is possible to set up a list of all cluster members including local member instead of setting this components. +Note: In Tomcat 9.0.17 and later, it is not necessary to explicitly configure the local member +using theelement. All cluster members, including the local member, may be +defined using the element and Tomcat work out which one is the local member. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] native/common/jk_global.h: fix compilation on musl [tomcat-connectors]
ConiKost opened a new pull request, #8: URL: https://github.com/apache/tomcat-connectors/pull/8 On musl, sys/socketvar.h does not exist, so we need to make sure, not to use it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
