svn commit: r1805855 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java java/org/apache/catalina/tribes/tipis/LocalStrings.properties webapps/docs/changelog.x
Author: kfujino
Date: Wed Aug 23 06:23:08 2017
New Revision: 1805855
URL: http://svn.apache.org/viewvc?rev=1805855&view=rev
Log:
Avoid Ping timeout until the added map member by receiving MSG_START message is
completely started.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1805855&r1=1805854&r2=1805855&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Aug 23 06:23:08 2017
@@ -277,13 +277,23 @@ public abstract class AbstractReplicated
MapMessage mapMsg = (MapMessage)resp[i].getMessage();
try {
mapMsg.deserialize(getExternalLoaders());
+Member member = resp[i].getSource();
State state = (State) mapMsg.getValue();
if (state.isAvailable()) {
-memberAlive(resp[i].getSource());
+memberAlive(member);
+} else if (state == State.STATETRANSFERRED) {
+synchronized (mapMembers) {
+if (log.isInfoEnabled())
+
log.info(sm.getString("abstractReplicatedMap.ping.stateTransferredMember",
+member));
+if (mapMembers.containsKey(member) ) {
+mapMembers.put(member,
Long.valueOf(System.currentTimeMillis()));
+}
+}
} else {
if (log.isInfoEnabled())
log.info(sm.getString("abstractReplicatedMap.mapMember.unavailable",
-resp[i].getSource()));
+member));
}
} catch (ClassNotFoundException | IOException e) {
log.error(sm.getString("abstractReplicatedMap.unable.deserialize.MapMessage"),
e);
@@ -535,6 +545,7 @@ public abstract class AbstractReplicated
} catch (ClassNotFoundException x) {
log.error(sm.getString("abstractReplicatedMap.unable.transferState"), x);
}
+this.state = State.STATETRANSFERRED;
}
/**
@@ -1630,6 +1641,7 @@ public abstract class AbstractReplicated
private static enum State {
NEW(false),
+STATETRANSFERRED(false),
INITIALIZED(true),
DESTROYED(false);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1805855&r1=1805854&r2=1805855&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
Wed Aug 23 06:23:08 2017
@@ -40,6 +40,7 @@ abstractReplicatedMap.leftOver.pingMsg=P
abstractReplicatedMap.leftOver.ignored=Message[{0}] is ignored.
abstractReplicatedMap.mapMember.unavailable=Member[{0}] is not available yet.
abstractReplicatedMap.ping.timeout=Member[{0}] in the Map[{1}] has timed-out
in the ping processing.
+abstractReplicatedMap.ping.stateTransferredMember=Member[{0}] is state
transferred but not available yet.
mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
mapMessage.deserialize.error.value=Deserialization error of the
MapMessage.value
lazyReplicatedMap.unableReplicate.backup=Unable to replicate backup key:{0} to
backup:{1}. Reason:{2}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1805855&r1=1805854&r2=1805855&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Aug 23 06:23:08 2017
@@ -94,6 +94,10 @@
Add member info to the log message when the failure detection check
fails in TcpFailureDetector. (kfujino)
+
+Avoid Ping timeout until the added map member
svn commit: r1805856 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Aug 23 06:24:21 2017
New Revision: 1805856
URL: http://svn.apache.org/viewvc?rev=1805856&view=rev
Log:
Avoid Ping timeout until the added map member by receiving MSG_START message is
completely started.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1805856&r1=1805855&r2=1805856&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Aug 23 06:24:21 2017
@@ -281,12 +281,21 @@ public abstract class AbstractReplicated
MapMessage mapMsg = (MapMessage)resp[i].getMessage();
try {
mapMsg.deserialize(getExternalLoaders());
+Member member = resp[i].getSource();
State state = (State) mapMsg.getValue();
if (state.isAvailable()) {
-memberAlive(resp[i].getSource());
+memberAlive(member);
+} else if (state == State.STATETRANSFERRED) {
+synchronized (mapMembers) {
+if (log.isInfoEnabled())
+log.info("Member[" + member + "] is state
transferred but not available yet.");
+if (mapMembers.containsKey(member) ) {
+mapMembers.put(member,
Long.valueOf(System.currentTimeMillis()));
+}
+}
} else {
if (log.isInfoEnabled())
-log.info("Member[" + resp[i].getSource() + "]
is not available yet.");
+log.info("Member[" + member + "] is not
available yet.");
}
} catch (IOException x) {
log.error("Unable to deserialize MapMessage.", x);
@@ -543,6 +552,7 @@ public abstract class AbstractReplicated
} catch (ClassNotFoundException x) {
log.error("Unable to transfer AbstractReplicatedMap state.", x);
}
+this.state = State.STATETRANSFERRED;
}
/**
@@ -1669,6 +1679,7 @@ public abstract class AbstractReplicated
private static enum State {
NEW(false),
+STATETRANSFERRED(false),
INITIALIZED(true),
DESTROYED(false);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1805856&r1=1805855&r2=1805856&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 23 06:24:21 2017
@@ -84,6 +84,10 @@
Add member info to the log message when the failure detection check
fails in TcpFailureDetector. (kfujino)
+
+Avoid Ping timeout until the added map member by receiving
+MSG_START message is completely started. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805860 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Author: markt Date: Wed Aug 23 08:04:09 2017 New Revision: 1805860 URL: http://svn.apache.org/viewvc?rev=1805860&view=rev Log: Add changelog entry for r1803817 Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1805860&r1=1805859&r2=1805860&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 23 08:04:09 2017 @@ -36,6 +36,9 @@ + + Add missing source files to Visual Studio project files. (wrowe) + Add support for the OpenSSL SSL_CONF API. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805862 - /tomcat/native/trunk/xdocs/index.xml
Author: markt Date: Wed Aug 23 08:08:41 2017 New Revision: 1805862 URL: http://svn.apache.org/viewvc?rev=1805862&view=rev Log: Update docs - remove sentence that refers to 'manuals' - remove reference to 6.0.x Modified: tomcat/native/trunk/xdocs/index.xml Modified: tomcat/native/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1805862&r1=1805861&r2=1805862&view=diff == --- tomcat/native/trunk/xdocs/index.xml (original) +++ tomcat/native/trunk/xdocs/index.xml Wed Aug 23 08:08:41 2017 @@ -54,11 +54,6 @@ FIPS 140-2 support for TLS/SSL (if supported by linked OpenSSL library) - -Select one of the links from the navigation menu (to the left) to drill -down to the more detailed documentation that is available. Each available -manual is described in more detail below. - @@ -202,9 +197,8 @@ INFO: Initializing Coyote HTTP/1.1 on ht Refer to the tomcat documentation to configure the connectors (See http://tomcat.apache.org/tomcat-8.5-doc/apr.html";>Tomcat 8.5.x, -http://tomcat.apache.org/tomcat-8.0-doc/apr.html";>Tomcat 8.0.x, -http://tomcat.apache.org/tomcat-7.0-doc/apr.html";>Tomcat 7.0.x, -and http://tomcat.apache.org/tomcat-6.0-doc/apr.html";>Tomcat 6.0.x) +http://tomcat.apache.org/tomcat-8.0-doc/apr.html";>Tomcat 8.0.x +and http://tomcat.apache.org/tomcat-7.0-doc/apr.html";>Tomcat 7.0.x) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805863 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Aug 23 08:10:13 2017
New Revision: 1805863
URL: http://svn.apache.org/viewvc?rev=1805863&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61425
Ensure that transaction of idle connection has terminated when the
testWhileIdle is set to true and defaultAutoCommit is set to false.
Patch provided by WangZheng.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1805863&r1=1805862&r2=1805863&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed Aug 23 08:10:13 2017
@@ -541,6 +541,22 @@ public class PooledConnection {
}
if (stmt!=null)
try { stmt.close();} catch (Exception ignore2){/*NOOP*/}
+
+try {
+if(!connection.getAutoCommit()) {
+connection.rollback();
+}
+} catch (SQLException e) {
+// do nothing
+}
+} finally {
+try {
+if(!connection.getAutoCommit()) {
+connection.commit();
+}
+} catch (SQLException e) {
+// do nothing
+}
}
return false;
} //validate
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1805863&r1=1805862&r2=1805863&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 23 08:10:13 2017
@@ -156,6 +156,16 @@
+
+
+
+61425: Ensure that transaction of idle connection has
+terminated when the testWhileIdle is set to
+true and defaultAutoCommit is set to
+false. Patch provided by WangZheng. (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61425] all idle connections become ' in transaction' when the 'testWhileIdle' is set to 'true' and 'defaultAutoCommit' is set to 'false'
https://bz.apache.org/bugzilla/show_bug.cgi?id=61425 Keiichi Fujino changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #5 from Keiichi Fujino --- Thanks for the patch. The fix will be in : - 9.0.x for 9.0.0.M27 onwards - 8.5.x for 8.5.21 onwards - 8.0.x for 8.0.47 onwards - 7.0.x for 7.0.82 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805866 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Aug 23 08:15:10 2017
New Revision: 1805866
URL: http://svn.apache.org/viewvc?rev=1805866&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61425
Ensure that transaction of idle connection has terminated when the
testWhileIdle is set to true and defaultAutoCommit is set to false.
Patch provided by WangZheng
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1805866&r1=1805865&r2=1805866&view=diff
==
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed Aug 23 08:15:10 2017
@@ -492,6 +492,22 @@ public class PooledConnection {
}
if (stmt!=null)
try { stmt.close();} catch (Exception ignore2){/*NOOP*/}
+
+try {
+if(!connection.getAutoCommit()) {
+connection.rollback();
+}
+} catch (SQLException e) {
+// do nothing
+}
+} finally {
+try {
+if(!connection.getAutoCommit()) {
+connection.commit();
+}
+} catch (SQLException e) {
+// do nothing
+}
}
return false;
} //validate
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1805866&r1=1805865&r2=1805866&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 23 08:15:10 2017
@@ -90,6 +90,16 @@
+
+
+
+61425: Ensure that transaction of idle connection has
+terminated when the testWhileIdle is set to
+true and defaultAutoCommit is set to
+false. Patch provided by WangZheng. (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805865 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Aug 23 08:14:34 2017
New Revision: 1805865
URL: http://svn.apache.org/viewvc?rev=1805865&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61425
Ensure that transaction of idle connection has terminated when the
testWhileIdle is set to true and defaultAutoCommit is set to false.
Patch provided by WangZheng
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1805865&r1=1805864&r2=1805865&view=diff
==
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed Aug 23 08:14:34 2017
@@ -535,6 +535,22 @@ public class PooledConnection {
}
if (stmt!=null)
try { stmt.close();} catch (Exception ignore2){/*NOOP*/}
+
+try {
+if(!connection.getAutoCommit()) {
+connection.rollback();
+}
+} catch (SQLException e) {
+// do nothing
+}
+} finally {
+try {
+if(!connection.getAutoCommit()) {
+connection.commit();
+}
+} catch (SQLException e) {
+// do nothing
+}
}
return false;
} //validate
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1805865&r1=1805864&r2=1805865&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Aug 23 08:14:34 2017
@@ -100,6 +100,16 @@
+
+
+
+61425: Ensure that transaction of idle connection has
+terminated when the testWhileIdle is set to
+true and defaultAutoCommit is set to
+false. Patch provided by WangZheng. (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805864 - in /tomcat/tc8.5.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java webapps/docs/changelog.xml
Author: kfujino
Date: Wed Aug 23 08:13:48 2017
New Revision: 1805864
URL: http://svn.apache.org/viewvc?rev=1805864&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61425
Ensure that transaction of idle connection has terminated when the
testWhileIdle is set to true and defaultAutoCommit is set to false.
Patch provided by WangZheng
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1805864&r1=1805863&r2=1805864&view=diff
==
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed Aug 23 08:13:48 2017
@@ -541,6 +541,22 @@ public class PooledConnection {
}
if (stmt!=null)
try { stmt.close();} catch (Exception ignore2){/*NOOP*/}
+
+try {
+if(!connection.getAutoCommit()) {
+connection.rollback();
+}
+} catch (SQLException e) {
+// do nothing
+}
+} finally {
+try {
+if(!connection.getAutoCommit()) {
+connection.commit();
+}
+} catch (SQLException e) {
+// do nothing
+}
}
return false;
} //validate
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1805864&r1=1805863&r2=1805864&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Aug 23 08:13:48 2017
@@ -131,6 +131,16 @@
+
+
+
+61425: Ensure that transaction of idle connection has
+terminated when the testWhileIdle is set to
+true and defaultAutoCommit is set to
+false. Patch provided by WangZheng. (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805861 - /tomcat/native/trunk/native/src/sslcontext.c
Author: remm
Date: Wed Aug 23 08:04:48 2017
New Revision: 1805861
URL: http://svn.apache.org/viewvc?rev=1805861&view=rev
Log:
Fix build error on my setup.
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1805861&r1=1805860&r2=1805861&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Aug 23 08:04:48 2017
@@ -530,7 +530,9 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
len = sk_SSL_CIPHER_num(sk);
if (len <= 0) {
+#if OPENSSL_VERSION_NUMBER < 0x1010L
SSL_free(ssl);
+#endif
return NULL;
}
@@ -543,7 +545,9 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
c_name = (*e)->NewStringUTF(e, name);
(*e)->SetObjectArrayElement(e, array, i, c_name);
}
+#if OPENSSL_VERSION_NUMBER < 0x1010L
SSL_free(ssl);
+#endif
return array;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805870 - /tomcat/native/trunk/native/src/ssl.c
Author: markt
Date: Wed Aug 23 09:33:49 2017
New Revision: 1805870
URL: http://svn.apache.org/viewvc?rev=1805870&view=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58434
Fix an error when trying to build with libressl
Note: Other errors and warnings still to be fixed
Modified:
tomcat/native/trunk/native/src/ssl.c
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1805870&r1=1805869&r2=1805870&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Aug 23 09:33:49 2017
@@ -782,8 +782,10 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
&& (ee = ssl_try_load_engine(J2S(engine))) == NULL)
err = APR_ENOTIMPL;
else {
-if (strcmp(J2S(engine), "chil") == 0)
+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
+ if (strcmp(J2S(engine), "chil") == 0)
ENGINE_ctrl(ee, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
+#endif
if (!ENGINE_set_default(ee, ENGINE_METHOD_ALL))
err = APR_ENOTIMPL;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1805861 - /tomcat/native/trunk/native/src/sslcontext.c
Am 23.08.2017 um 10:04 schrieb r...@apache.org:
Author: remm
Date: Wed Aug 23 08:04:48 2017
New Revision: 1805861
URL: http://svn.apache.org/viewvc?rev=1805861&view=rev
Log:
Fix build error on my setup.
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1805861&r1=1805860&r2=1805861&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Aug 23 08:04:48 2017
@@ -530,7 +530,9 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
len = sk_SSL_CIPHER_num(sk);
if (len <= 0) {
+#if OPENSSL_VERSION_NUMBER < 0x1010L
SSL_free(ssl);
+#endif
return NULL;
}
@@ -543,7 +545,9 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
c_name = (*e)->NewStringUTF(e, name);
(*e)->SetObjectArrayElement(e, array, i, c_name);
}
+#if OPENSSL_VERSION_NUMBER < 0x1010L
SSL_free(ssl);
+#endif
return array;
}
Hi Rémy,
thanks for fixing this. Yes freeing when not having it allocated isn't a
good idea.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805877 - in /tomcat/native/trunk/native: config.nice.openssl include/ssl_private.h src/ssl.c src/sslcontext.c
Author: markt
Date: Wed Aug 23 10:55:53 2017
New Revision: 1805877
URL: http://svn.apache.org/viewvc?rev=1805877&view=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58434
Fix remaining errors when building with libressl. Warnings still to be fixed.
Note: This is not yet working with libressl
Added:
tomcat/native/trunk/native/config.nice.openssl (with props)
Modified:
tomcat/native/trunk/native/include/ssl_private.h
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/native/src/sslcontext.c
Added: tomcat/native/trunk/native/config.nice.openssl
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/config.nice.openssl?rev=1805877&view=auto
==
--- tomcat/native/trunk/native/config.nice.openssl (added)
+++ tomcat/native/trunk/native/config.nice.openssl Wed Aug 23 10:55:53 2017
@@ -0,0 +1,9 @@
+#! /bin/sh
+#
+# Created by configure
+
+"./configure" \
+"--with-apr=/usr/bin/apr-config" \
+"--with-ssl=/usr/lib/x86_64-linux-gnu" \
+"--prefix=/home/mark/libs/tomcat-native-1.2.x" \
+"$@"
Propchange: tomcat/native/trunk/native/config.nice.openssl
--
svn:executable = *
Modified: tomcat/native/trunk/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1805877&r1=1805876&r2=1805877&view=diff
==
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Wed Aug 23 10:55:53 2017
@@ -209,7 +209,7 @@
#endif /* !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) */
/* OpenSSL 1.0.2 compatibility */
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
#define OpenSSL_version SSLeay_version
#define OpenSSL_version_num SSLeay
#define OPENSSL_VERSION SSLEAY_VERSION
@@ -234,7 +234,7 @@
#define TLS_method SSLv23_method
#define TLS_client_methodSSLv23_client_method
#define TLS_server_methodSSLv23_server_method
-#endif /* OPENSSL_VERSION_NUMBER < 0x1010L */
+#endif /* OPENSSL_VERSION_NUMBER < 0x1010L ||
defined(LIBRESSL_VERSION_NUMBER) */
#define MAX_ALPN_NPN_PROTO_SIZE 65535
#define SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL1
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1805877&r1=1805876&r2=1805877&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Aug 23 10:55:53 2017
@@ -201,7 +201,7 @@ static const jint supported_ssl_opts = 0
#endif
| 0;
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
/* OpenSSL Pre-1.1.0 compatibility */
/* Taken from OpenSSL 1.1.0 snapshot 20160410 */
int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1805877&r1=1805876&r2=1805877&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Aug 23 10:55:53 2017
@@ -503,7 +503,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
const char *name;
int i;
jstring c_name;
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
SSL *ssl;
#endif
@@ -516,7 +516,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
/* Before OpenSSL 1.1.0, get_ciphers() was only available
* on an SSL, not for an SSL_CTX. */
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
ssl = SSL_new(c->ctx);
if (ssl == NULL) {
tcn_ThrowException(e, "could not create temporary ssl from ssl
context");
@@ -530,7 +530,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
len = sk_SSL_CIPHER_num(sk);
if (len <= 0) {
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
SSL_free(ssl);
#endif
return NULL;
@@ -545,7 +545,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
c_name = (*e)->NewStringUTF(e, name);
(*e)->SetObjectArrayElement(e, array, i, c_name);
}
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
SSL_free(ssl);
#endif
return array;
@@ -1678,7 +1678
svn commit: r1805879 - in /tomcat/native/trunk/native/src: ssl.c sslcontext.c
Author: markt
Date: Wed Aug 23 11:10:58 2017
New Revision: 1805879
URL: http://svn.apache.org/viewvc?rev=1805879&view=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58434
Fix enough of the remaining warnings to enable Tomcat to start and a serve
pages over TLS.
Some warnings remain to be fixed.
Not extensively tested
Modified:
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1805879&r1=1805878&r2=1805879&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Aug 23 11:10:58 2017
@@ -303,7 +303,7 @@ DH *SSL_get_dh_params(unsigned keylen)
return NULL; /* impossible to reach. */
}
-#if OPENSSL_VERSION_NUMBER >= 0x1010L
+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
static void init_bio_methods(void);
static void free_bio_methods(void);
#endif
@@ -338,7 +338,7 @@ static apr_status_t ssl_init_cleanup(voi
tcn_password_callback.cb.obj);
}
-#if OPENSSL_VERSION_NUMBER >= 0x1010L
+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
free_bio_methods();
#endif
free_dh_params();
@@ -357,7 +357,7 @@ static apr_status_t ssl_init_cleanup(voi
ENGINE_cleanup();
#endif
CRYPTO_cleanup_all_ex_data();
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(NULL);
#endif
@@ -813,7 +813,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
SSL_init_app_data2_3_idx();
init_dh_params();
-#if OPENSSL_VERSION_NUMBER >= 0x1010L
+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
init_bio_methods();
#endif
@@ -,7 +,7 @@ static long jbs_ctrl(BIO *b, int cmd, lo
return ret;
}
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
static BIO_METHOD jbs_methods = {
BIO_TYPE_FILE,
"Java Callback",
@@ -1147,7 +1147,7 @@ static void free_bio_methods(void)
static BIO_METHOD *BIO_jbs()
{
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
return(&jbs_methods);
#else
return jbs_methods;
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1805879&r1=1805878&r2=1805879&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Aug 23 11:10:58 2017
@@ -226,7 +226,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
BIO_set_fp(c->bio_os, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
SSL_CTX_set_options(c->ctx, SSL_OP_ALL);
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
/* always disable SSLv2, as per RFC 6176 */
SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
if (!(protocol & SSL_PROTOCOL_SSLV3))
@@ -242,7 +242,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
SSL_CTX_set_options(c->ctx, SSL_OP_NO_TLSv1_2);
#endif
-#else /* if OPENSSL_VERSION_NUMBER < 0x1010L */
+#else /* if OPENSSL_VERSION_NUMBER < 0x1010L ||
defined(LIBRESSL_VERSION_NUMBER) */
/* We first determine the maximum protocol version we should provide */
if (protocol & SSL_PROTOCOL_TLSV1_2) {
prot = TLS1_2_VERSION;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1805877 - in /tomcat/native/trunk/native: config.nice.openssl include/ssl_private.h src/ssl.c src/sslcontext.c
Am 23.08.2017 um 12:55 schrieb ma...@apache.org: Author: markt Date: Wed Aug 23 10:55:53 2017 New Revision: 1805877 URL: http://svn.apache.org/viewvc?rev=1805877&view=rev Log: Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58434 Fix remaining errors when building with libressl. Warnings still to be fixed. Note: This is not yet working with libressl Added: tomcat/native/trunk/native/config.nice.openssl (with props) Modified: tomcat/native/trunk/native/include/ssl_private.h tomcat/native/trunk/native/src/ssl.c tomcat/native/trunk/native/src/sslcontext.c Added: tomcat/native/trunk/native/config.nice.openssl URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/config.nice.openssl?rev=1805877&view=auto == --- tomcat/native/trunk/native/config.nice.openssl (added) +++ tomcat/native/trunk/native/config.nice.openssl Wed Aug 23 10:55:53 2017 @@ -0,0 +1,9 @@ +#! /bin/sh +# +# Created by configure + +"./configure" \ +"--with-apr=/usr/bin/apr-config" \ +"--with-ssl=/usr/lib/x86_64-linux-gnu" \ +"--prefix=/home/mark/libs/tomcat-native-1.2.x" \ +"$@" Propchange: tomcat/native/trunk/native/config.nice.openssl -- svn:executable = * Adding the file config.nice.openssl was probably not intended. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805882 - /tomcat/native/trunk/native/config.nice.openssl
Author: markt Date: Wed Aug 23 11:42:50 2017 New Revision: 1805882 URL: http://svn.apache.org/viewvc?rev=1805882&view=rev Log: Remove file added in error Removed: tomcat/native/trunk/native/config.nice.openssl - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805883 - /tomcat/native/trunk/native/src/sslcontext.c
Author: markt
Date: Wed Aug 23 11:43:30 2017
New Revision: 1805883
URL: http://svn.apache.org/viewvc?rev=1805883&view=rev
Log:
Fix a warning when compiling with LibreSSL
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1805883&r1=1805882&r2=1805883&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Aug 23 11:43:30 2017
@@ -1211,9 +1211,14 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
ERR_error_string(SSL_ERR_get(), err);
tcn_Throw(e, "Error reading certificate (%s)", err);
rv = JNI_FALSE;
+#if defined(LIBRESSL_VERSION_NUMBER)
+} else {
+tcn_Throw(e, "Unable to use Java keystores with LibreSSL");
+#else
} else if (SSL_CTX_add0_chain_cert(c->ctx, certs) <= 0) {
ERR_error_string(SSL_ERR_get(), err);
tcn_Throw(e, "Error adding certificate to chain (%s)", err);
+#endif
rv = JNI_FALSE;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805884 - /tomcat/native/trunk/native/src/sslcontext.c
Author: markt
Date: Wed Aug 23 11:45:11 2017
New Revision: 1805884
URL: http://svn.apache.org/viewvc?rev=1805884&view=rev
Log:
Fix two more LibreSSL warnings
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1805884&r1=1805883&r2=1805884&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Aug 23 11:45:11 2017
@@ -1783,7 +1783,7 @@ static const char* SSL_CIPHER_authentica
if (cipher == NULL) {
return "UNKNOWN";
}
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
kx = cipher->algorithm_mkey;
auth = cipher->algorithm_auth;
#else
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805885 - /tomcat/native/trunk/native/src/sslinfo.c
Author: markt Date: Wed Aug 23 11:49:53 2017 New Revision: 1805885 URL: http://svn.apache.org/viewvc?rev=1805885&view=rev Log: Fix remaining LibreSSL warnings Modified: tomcat/native/trunk/native/src/sslinfo.c Modified: tomcat/native/trunk/native/src/sslinfo.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1805885&r1=1805884&r2=1805885&view=diff == --- tomcat/native/trunk/native/src/sslinfo.c (original) +++ tomcat/native/trunk/native/src/sslinfo.c Wed Aug 23 11:49:53 2017 @@ -394,11 +394,15 @@ TCN_IMPLEMENT_CALL(jstring, SSLSocket, g } break; case SSL_INFO_CLIENT_A_SIG: +#if defined(LIBRESSL_VERSION_NUMBER) + value = tcn_new_string(e, "UNKNOWN"); +#else nid = X509_get_signature_nid(xs); if (nid == NID_undef) value = tcn_new_string(e, "UNKNOWN"); else value = tcn_new_string(e, OBJ_nid2ln(nid)); +#endif break; case SSL_INFO_CLIENT_A_KEY: X509_PUBKEY_get0_param(&paobj, NULL, 0, NULL, X509_get_X509_PUBKEY(xs)); @@ -445,11 +449,15 @@ TCN_IMPLEMENT_CALL(jstring, SSLSocket, g } break; case SSL_INFO_SERVER_A_SIG: +#if defined(LIBRESSL_VERSION_NUMBER) + value = tcn_new_string(e, "UNKNOWN"); +#else nid = X509_get_signature_nid(xs); if (nid == NID_undef) value = tcn_new_string(e, "UNKNOWN"); else value = tcn_new_string(e, OBJ_nid2ln(nid)); +#endif break; case SSL_INFO_SERVER_A_KEY: X509_PUBKEY_get0_param(&paobj, NULL, 0, NULL, X509_get_X509_PUBKEY(xs)); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1805877 - in /tomcat/native/trunk/native: config.nice.openssl include/ssl_private.h src/ssl.c src/sslcontext.c
On 23/08/17 12:31, Rainer Jung wrote: > Am 23.08.2017 um 12:55 schrieb ma...@apache.org: >> Author: markt >> Date: Wed Aug 23 10:55:53 2017 >> New Revision: 1805877 >> >> URL: http://svn.apache.org/viewvc?rev=1805877&view=rev >> Log: >> Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58434 >> Fix remaining errors when building with libressl. Warnings still to be >> fixed. >> Note: This is not yet working with libressl >> >> Added: >> tomcat/native/trunk/native/config.nice.openssl (with props) >> Modified: >> tomcat/native/trunk/native/include/ssl_private.h >> tomcat/native/trunk/native/src/ssl.c >> tomcat/native/trunk/native/src/sslcontext.c >> >> Added: tomcat/native/trunk/native/config.nice.openssl >> URL: >> http://svn.apache.org/viewvc/tomcat/native/trunk/native/config.nice.openssl?rev=1805877&view=auto >> >> == >> >> --- tomcat/native/trunk/native/config.nice.openssl (added) >> +++ tomcat/native/trunk/native/config.nice.openssl Wed Aug 23 10:55:53 >> 2017 >> @@ -0,0 +1,9 @@ >> +#! /bin/sh >> +# >> +# Created by configure >> + >> +"./configure" \ >> +"--with-apr=/usr/bin/apr-config" \ >> +"--with-ssl=/usr/lib/x86_64-linux-gnu" \ >> +"--prefix=/home/mark/libs/tomcat-native-1.2.x" \ >> +"$@" >> >> Propchange: tomcat/native/trunk/native/config.nice.openssl >> -- >> >> svn:executable = * > > Adding the file config.nice.openssl was probably not intended. It wasn't. Thanks for catching that. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58434] Make Fails Against LibreSSL
https://bz.apache.org/bugzilla/show_bug.cgi?id=58434 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Mark Thomas --- Keep in mind that Tomcat Native requires OpenSSL 1.0.2 but LibreSSL has not fully implemented the 1.0.2 API. The most obvious missing feature is that Java keystores cannot be used. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805942 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Author: markt Date: Wed Aug 23 17:40:49 2017 New Revision: 1805942 URL: http://svn.apache.org/viewvc?rev=1805942&view=rev Log: Update changelog with LibreSSL info Warnings all fixed, test cases pass, simple smoke tests pass. Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1805942&r1=1805941&r2=1805942&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 23 17:40:49 2017 @@ -57,6 +57,10 @@ Fix renegotiation to obtain a client certificate from a user agent. (markt) + + 58434: Allow Tomcat Native to be compiled with LibreSSL. Note + that some features may not be available when using LibreSSL. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805943 - in /tomcat/native/trunk: native/Makefile.in xdocs/miscellaneous/changelog.xml
Author: markt Date: Wed Aug 23 17:45:20 2017 New Revision: 1805943 URL: http://svn.apache.org/viewvc?rev=1805943&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60290 When building Tomcat Native, don't ignore the value of CC if explicitly set. Patch provided by Michael Osipov. Modified: tomcat/native/trunk/native/Makefile.in tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/native/Makefile.in URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/Makefile.in?rev=1805943&r1=1805942&r2=1805943&view=diff == --- tomcat/native/trunk/native/Makefile.in (original) +++ tomcat/native/trunk/native/Makefile.in Wed Aug 23 17:45:20 2017 @@ -21,6 +21,7 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CC_OLD = @CC@ # gets substituted into some targets TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@ @@ -47,6 +48,10 @@ TARGETS = $(TARGET_LIB) @INCLUDE_RULES@ @INCLUDE_OUTPUTS@ +ifneq ($(CC_OLD),$(CC)) +CC=$(CC_OLD) +endif + LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@ CLEAN_SUBDIRS = test Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1805943&r1=1805942&r2=1805943&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 23 17:45:20 2017 @@ -61,6 +61,11 @@ 58434: Allow Tomcat Native to be compiled with LibreSSL. Note that some features may not be available when using LibreSSL. (markt) + + 60290: When building Tomcat Native, don't ignore the value of + CC if explicitly set. Patch provided by Michael Osipov. + (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60290] rules.mk defeats CC for configure
https://bz.apache.org/bugzilla/show_bug.cgi?id=60290 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Thanks for the patch. This has been fixed for 1.2.13 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1805960 - in /tomcat/native/trunk: native/Makefile.in native/configure.in xdocs/miscellaneous/changelog.xml
Author: markt Date: Wed Aug 23 21:12:17 2017 New Revision: 1805960 URL: http://svn.apache.org/viewvc?rev=1805960&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60301 When building Tomcat Native, allow the user to override the libtool specified by APR but setting the LIBTOOL environment variable. Modified: tomcat/native/trunk/native/Makefile.in tomcat/native/trunk/native/configure.in tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/native/Makefile.in URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/Makefile.in?rev=1805960&r1=1805959&r2=1805960&view=diff == --- tomcat/native/trunk/native/Makefile.in (original) +++ tomcat/native/trunk/native/Makefile.in Wed Aug 23 21:12:17 2017 @@ -22,6 +22,7 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CC_OLD = @CC@ +LIBTOOL_OLD = @LIBTOOL@ # gets substituted into some targets TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@ @@ -52,6 +53,10 @@ ifneq ($(CC_OLD),$(CC)) CC=$(CC_OLD) endif +ifneq ($(LIBTOOL_OLD),$(LIBTOOL)) +LIBTOOL=$(LIBTOOL_OLD) +endif + LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@ CLEAN_SUBDIRS = test Modified: tomcat/native/trunk/native/configure.in URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=1805960&r1=1805959&r2=1805960&view=diff == --- tomcat/native/trunk/native/configure.in (original) +++ tomcat/native/trunk/native/configure.in Wed Aug 23 21:12:17 2017 @@ -101,6 +101,11 @@ dnl APR_SETIFNULL(CC, `$apr_config --cc`) APR_SETIFNULL(CPP, `$apr_config --cpp`) +dnl +dnl Default to the APR provided libtool but allow the user to override it +dnl +APR_SETIFNULL(LIBTOOL, `$apr_config --apr-libtool`) + AC_PROG_INSTALL dnl @@ -234,6 +239,7 @@ AC_SUBST(TCNATIVE_LDFLAGS) AC_SUBST(TCNATIVE_LIBS) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) +AC_SUBST(LIBTOOL) dnl copy apr's rules.mk into our build directory. if test ! -d ./build; then Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1805960&r1=1805959&r2=1805960&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 23 21:12:17 2017 @@ -66,6 +66,11 @@ CC if explicitly set. Patch provided by Michael Osipov. (markt) + + 60301: When building Tomcat Native, allow the user to override + the libtool specified by APR but setting the LIBTOOL + environment variable. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60301] Cannot exchange libtool bundled with apr with a newer one
https://bz.apache.org/bugzilla/show_bug.cgi?id=60301 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed for 1.2.13 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1805960 - in /tomcat/native/trunk: native/Makefile.in native/configure.in xdocs/miscellaneous/changelog.xml
On 23/08/17 22:12, ma...@apache.org wrote: > Author: markt > Date: Wed Aug 23 21:12:17 2017 > New Revision: 1805960 > > URL: http://svn.apache.org/viewvc?rev=1805960&view=rev > Log: > Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60301 > When building Tomcat Native, allow the user to override the libtool specified > by APR but setting the LIBTOOL environment variable. C gurus, I'm not sure that I have done this the right / proper / best way. Review and feedback appreciated. Assuming all is well, I hope to tag Tomcat Native tomorrow. I do just want to run through the open bugs that refer to crashes first. Mark > > Modified: > tomcat/native/trunk/native/Makefile.in > tomcat/native/trunk/native/configure.in > tomcat/native/trunk/xdocs/miscellaneous/changelog.xml > > Modified: tomcat/native/trunk/native/Makefile.in > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/native/Makefile.in?rev=1805960&r1=1805959&r2=1805960&view=diff > == > --- tomcat/native/trunk/native/Makefile.in (original) > +++ tomcat/native/trunk/native/Makefile.in Wed Aug 23 21:12:17 2017 > @@ -22,6 +22,7 @@ > CFLAGS = @CFLAGS@ > CPPFLAGS = @CPPFLAGS@ > CC_OLD = @CC@ > +LIBTOOL_OLD = @LIBTOOL@ > > # gets substituted into some targets > TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@ > @@ -52,6 +53,10 @@ ifneq ($(CC_OLD),$(CC)) > CC=$(CC_OLD) > endif > > +ifneq ($(LIBTOOL_OLD),$(LIBTOOL)) > +LIBTOOL=$(LIBTOOL_OLD) > +endif > + > LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) > -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@ > CLEAN_SUBDIRS = test > > > Modified: tomcat/native/trunk/native/configure.in > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=1805960&r1=1805959&r2=1805960&view=diff > == > --- tomcat/native/trunk/native/configure.in (original) > +++ tomcat/native/trunk/native/configure.in Wed Aug 23 21:12:17 2017 > @@ -101,6 +101,11 @@ dnl > APR_SETIFNULL(CC, `$apr_config --cc`) > APR_SETIFNULL(CPP, `$apr_config --cpp`) > > +dnl > +dnl Default to the APR provided libtool but allow the user to override it > +dnl > +APR_SETIFNULL(LIBTOOL, `$apr_config --apr-libtool`) > + > AC_PROG_INSTALL > > dnl > @@ -234,6 +239,7 @@ AC_SUBST(TCNATIVE_LDFLAGS) > AC_SUBST(TCNATIVE_LIBS) > AC_SUBST(CFLAGS) > AC_SUBST(CPPFLAGS) > +AC_SUBST(LIBTOOL) > > dnl copy apr's rules.mk into our build directory. > if test ! -d ./build; then > > Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1805960&r1=1805959&r2=1805960&view=diff > == > --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) > +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 23 21:12:17 > 2017 > @@ -66,6 +66,11 @@ >CC if explicitly set. Patch provided by Michael Osipov. >(markt) > > + > + 60301: When building Tomcat Native, allow the user to > override > + the libtool specified by APR but setting the LIBTOOL > + environment variable. (markt) > + > > > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Random SocketTimeoutExceptions in Tomcat 8.0.x
Hi, I believe I have identified a bug in Tomcat 7.0.15+ and 8.0.x versions that is likely to also affect 8.0.47-dev version: It is possible that under high load NioBlockingSelector will incorrectly detect read socket timeout (even though timeouts are disabled on the underlying Socket), and thus calls such as request.getInputStream() can randomly throw SocketTimeoutException in web applications. To me this feels like a critical issue, and I'm only writing to this list, because I couldn't find a notification for my tomcat80 PR [0] in this list's archive. Apologies if this e-mail is inappropriate, or if I come across as impatient (the PR was only opened yesterday after all). Best Regards, Peter Major [0]: https://github.com/apache/tomcat80/pull/9 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56313] Tomcat 8 crashes in tcnative-1.dll+0x7923
https://bz.apache.org/bugzilla/show_bug.cgi?id=56313 Mark Thomas changed: What|Removed |Added CC||kmash...@yahoo.com --- Comment #16 from Mark Thomas --- *** Bug 55797 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55797] Tomcat 7.0.47 crashes using server jvm.dll and APR at ntdll!ZwGetContextThread+0xa
https://bz.apache.org/bugzilla/show_bug.cgi?id=55797 Mark Thomas changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEEDINFO|RESOLVED --- Comment #5 from Mark Thomas --- As far as I can tell from the provided information, this is a duplicate. If you still see this issue (or something like it) with the latest stable 1.2.x release and the latest stable release of a supported Tomcat version, please open a new bug. What we really need are steps to reproduce. Even if it doesn't reproduce reliable, a script that will trigger then problem (the quicker the better) is very helpful. *** This bug has been marked as a duplicate of bug 56313 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56415] EXCEPTION_ACCESS_VIOLATION (0xc0000005) in tcnative-1.dll
https://bz.apache.org/bugzilla/show_bug.cgi?id=56415 Mark Thomas changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #7 from Mark Thomas --- As far as I can tell from the provided information, this is a duplicate. If you still see this issue (or something like it) with the latest stable 1.2.x release and the latest stable release of a supported Tomcat version, please open a new bug. What we really need are steps to reproduce. Even if it doesn't reproduce reliable, a script that will trigger then problem (the quicker the better) is very helpful. *** This bug has been marked as a duplicate of bug 56313 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56313] Tomcat 8 crashes in tcnative-1.dll+0x7923
https://bz.apache.org/bugzilla/show_bug.cgi?id=56313 Mark Thomas changed: What|Removed |Added CC||martin.ha...@ysoft.com --- Comment #17 from Mark Thomas --- *** Bug 56415 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56313] Tomcat 8 crashes in tcnative-1.dll+0x7923
https://bz.apache.org/bugzilla/show_bug.cgi?id=56313 Mark Thomas changed: What|Removed |Added CC||kevin.g.flynn@thomsonreuter ||s.com --- Comment #18 from Mark Thomas --- *** Bug 57140 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57140] tcnative-1.dll 1.1.31 indicated in fatal error
https://bz.apache.org/bugzilla/show_bug.cgi?id=57140 Mark Thomas changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- As far as I can tell from the provided information, this is a duplicate. If you still see this issue (or something like it) with the latest stable 1.2.x release and the latest stable release of a supported Tomcat version, please open a new bug. What we really need are steps to reproduce. Even if it doesn't reproduce reliable, a script that will trigger then problem (the quicker the better) is very helpful. *** This bug has been marked as a duplicate of bug 56313 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1805870 - /tomcat/native/trunk/native/src/ssl.c
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Mark, On 8/23/17 5:33 AM, ma...@apache.org wrote: > Author: markt Date: Wed Aug 23 09:33:49 2017 New Revision: 1805870 > > URL: http://svn.apache.org/viewvc?rev=1805870&view=rev Log: Partial > fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58434 Fix an > error when trying to build with libressl Thanks for doing this. It was on my "eventually TODO list" ;) If there are any different instructions for building against libressl versus openssl, please put them in the BUILDING file if you haven't already done so. I would definitely like to test the build and operation against libressl. - -chris -BEGIN PGP SIGNATURE- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJZnhBVAAoJEBzwKT+lPKRY28IQAI4IDB9vWGhLKcyCn928H0wD Fl3AcGEvhTAamIqkOxD9vF1i8TVkGBoo1MduSM6uTzSldU0Zl0iZeMDCoWAAyOaY 31RiOB8PVcCta/nHM41wHpeDvosfgRW3JBRoEKky1XcPmkKZtq+3n6b13PaUcwGt 9hVGksPfoItz6thFRvxMCZtl1VmkLkgE7j1Uv9QJ9TCPCBRJhblA3BmN1PM/ZF/K 9hvft3pJnhLK71PfmV1haxcOjK+6+HfuYK+N1FvVS041hUZWAeqk7d2iKsFwnxmE y0VZY+OCty4ae9xzBiTxtHQJmcFnWKt5ofyMLKDhG4QVlqkvdJ8wlNm2us/9OkJB Xv+WA9nyz71UyHFkMQQi2wFHahYP04JufpC0H5JrU6NskhSZXd82HPTEe92CNS8O C98/Y8DDiE4NHWHtLvmVbmKLq0/rID8nziQvXgUN8e7ARsQ/PsU9ek0Bt4IrNyvA x/PDluimJXhhwAaZJrPADBitL1VoMj5Pxcbx6YiQGowUAHtnsYZ8KuAUeGg788cZ 4EOUgtpadWkFKu40tG492gbvPnVCnbXf0uMrx2heDImVDCGLDqR/K3ohcijwZUNr 1M8ZrLtCWOGhdhWQU+cIMinjSguD1oTroFKzKHzTv8UwXUIvOEovZUqEMhUV4hPv CBW7ZI00reahH6oxCKh/ =iidZ -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
