Author: markt
Date: Wed Apr 8 18:53:20 2015
New Revision: 1672142
URL: http://svn.apache.org/r1672142
Log:
JNI changes for newly added ALPN support in tomcat-native 1.2.x
Removed:
tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1672142&r1=1672141&r2=1672142&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Wed Apr 8 18:53:20
2015
@@ -288,4 +288,5 @@ public final class SSLContext {
*/
public static native void setVerify(long ctx, int level, int depth);
+ public static native int setALPN(long ctx, byte[] proto, int len);
}
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java?rev=1672142&r1=1672141&r2=1672142&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java Wed Apr 8 18:53:20
2015
@@ -107,4 +107,16 @@ public class SSLSocket {
public static native int getInfoI(long sock, int id)
throws Exception;
+
+ /**
+ * Obtain the name of the protocol negotiated via ALPN. Only valid after
the
+ * TLS handshake has completed.
+ *
+ * @param sock Socket
+ * @param negotiatedProtocol Byte array in which to store agreed
protocol
+ *
+ * @return Length of agreed protocol. Zero means no protocol agreed.
+ */
+ public static native int getALPN(long sock, byte[] negotiatedProtocol);
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
