Author: remm
Date: Fri Dec 11 15:26:43 2015
New Revision: 1719456
URL: http://svn.apache.org/viewvc?rev=1719456&view=rev
Log:
SSL.getHandshake count is unused (it probably was removed from the JNI API
because of that) but can just as well return the *completed* handshake count
rather than the started handshake count (I know easily how many times I called
doHandshake, thank you ...).
Modified:
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1719456&r1=1719455&r2=1719456&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Fri Dec 11 15:26:43 2015
@@ -1117,7 +1117,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, getLastErr
static void ssl_info_callback(const SSL *ssl, int where, int ret) {
int *handshakeCount = NULL;
- if (0 != (where & SSL_CB_HANDSHAKE_START)) {
+ if (0 != (where & SSL_CB_HANDSHAKE_DONE)) {
handshakeCount = (int*) SSL_get_app_data3(ssl);
if (handshakeCount != NULL) {
++(*handshakeCount);
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1719456&r1=1719455&r2=1719456&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Fri Dec 11 15:26:43
2015
@@ -34,6 +34,14 @@
This is the Changelog for Tomcat Native 1.2.
</p>
</section>
+<section name="Changes in 1.2.4">
+ <changelog>
+ <fix>
+ SSL.getHandshakeCount, which was unused, now returns the handshake
+ completed count rather than the handshake stated count. (remm)
+ </fix>
+ </changelog>
+</section>
<section name="Changes in 1.2.3">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
