Skip to content

Commit d4c052c

Browse files
committed
Sync with 12.0.
1 parent 3aa3c90 commit d4c052c

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

java/org/apache/tomcat/jni/SSLConf.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ public final class SSLConf {
5353
public static native void free(long cctx);
5454

5555
/**
56-
* Check a command with an SSL_CONF context.
56+
* Optionally used to check a command with an SSL_CONF context.
57+
* <p>
58+
* This call is also used to pass Tomcat specific settings to Tomcat Native. It must be called for for each Tomcat
59+
* specific setting (e.g. {@link org.apache.tomcat.util.net.openssl.OpenSSLConfCmd#NO_OCSP_CHECK}) before {@link
60+
* #assign(long, long)} is called.
5761
*
5862
* @param cctx SSL_CONF context to use.
5963
* @param name command name.
@@ -71,6 +75,10 @@ public final class SSLConf {
7175
/**
7276
* Assign an SSL context to an SSL_CONF context. All following calls to {@link #apply(long, String, String)} will be
7377
* applied to this SSL context.
78+
* <p>
79+
* For Tomcat specific settings this call applies previous settings set via calls to {@link
80+
* #check(long, String, String)}. Further calls to {@link #check(long, String, String)} after a call to this method
81+
* will have no effect.
7482
*
7583
* @param cctx SSL_CONF context to use.
7684
* @param ctx SSL context to assign to the given SSL_CONF context.
@@ -82,6 +90,8 @@ public final class SSLConf {
8290

8391
/**
8492
* Apply a command to an SSL_CONF context.
93+
* <p>
94+
* This call has no effect for Tomcat specific settings.
8595
*
8696
* @param cctx SSL_CONF context to use.
8797
* @param name command name.
@@ -97,6 +107,8 @@ public final class SSLConf {
97107

98108
/**
99109
* Finish commands for an SSL_CONF context.
110+
* <p>
111+
* This call has no effect for Tomcat specific settings.
100112
*
101113
* @param cctx SSL_CONF context to use.
102114
*

0 commit comments

Comments
 (0)