svn commit: r1660331 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Author: markt
Date: Tue Feb 17 09:46:41 2015
New Revision: 1660331
URL: http://svn.apache.org/r1660331
Log:
Whitespace police (thanks to Gump for the tip-off)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1660331&r1=1660330&r2=1660331&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue
Feb 17 09:46:41 2015
@@ -221,7 +221,7 @@ public class ReplicatedMap extends
Map.Entry> e = i.next();
MapEntry entry = innerMap.get(e.getKey());
if ( entry == null ) continue;
-if (entry.isPrimary() &&
!inSet(member,entry.getBackupNodes())) {
+if (entry.isPrimary() &&
!inSet(member,entry.getBackupNodes())) {
entry.setBackupNodes(backup);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660332 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Author: markt
Date: Tue Feb 17 09:47:05 2015
New Revision: 1660332
URL: http://svn.apache.org/r1660332
Log:
Fix an IDE warning
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1660332&r1=1660331&r2=1660332&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue
Feb 17 09:47:05 2015
@@ -204,6 +204,7 @@ public class ReplicatedMap extends
if (log.isInfoEnabled()) log.info("Relocation of map entries was
complete in " + complete + " ms.");
}
+@Override
public void mapMemberAdded(Member member) {
if ( member.equals(getChannel().getLocalMember(false)) ) return;
boolean memberAdded = false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660333 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Author: markt Date: Tue Feb 17 09:48:10 2015 New Revision: 1660333 URL: http://svn.apache.org/r1660333 Log: Backport a couple of style fixes Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 17 09:48:10 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293
svn commit: r1660337 - /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Tue Feb 17 10:00:13 2015
New Revision: 1660337
URL: http://svn.apache.org/r1660337
Log:
Ensure the ciphers added in OpenSSL 1.1.0 are not expected to be present when
testing with 1.0.2
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660337&r1=1660336&r2=1660337&view=diff
==
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Feb 17 10:00:13 2015
@@ -106,6 +106,13 @@ public class TestCipher {
if (openSSLAlias.contains("RC2-MD5")) {
continue;
}
+// Added in OpenSSL 1.1.0 but the 8.0.x tests are configured for
+// 1.0.2
+if (cipher.getProtocol().equals(Protocol.TLSv1_2) &&
+(cipher.getEnc().equals(Encryption.CAMELLIA256) ||
+cipher.getEnc().equals(Encryption.CAMELLIA128))) {
+continue;
+}
expectedCipherSuites.add(openSSLAlias + "+" +
cipher.getProtocol().getOpenSSLName());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660343 - /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: markt
Date: Tue Feb 17 10:28:01 2015
New Revision: 1660343
URL: http://svn.apache.org/r1660343
Log:
Need to update the list of unsupported OpenSSL ciphers after adding the 1.1.0
only ones to the overall Ciphers list.
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1660343&r1=1660342&r2=1660343&view=diff
==
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Tue Feb 17 10:28:01 2015
@@ -34,6 +34,8 @@ public class TesterOpenSSL {
public static final Set OPENSSL_UNIMPLEMENTED_CIPHERS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+// The following ciphers are not implemented in an OpenSSL
+// version
Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA,
Cipher.SSL_CK_RC2_128_CBC_WITH_MD5,
Cipher.SSL_FORTEZZA_DMS_WITH_NULL_SHA,
@@ -44,7 +46,30 @@ public class TesterOpenSSL {
Cipher.TLS_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
Cipher.TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_SHA,
-Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5)));
+Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5,
+// The following ciphers are implemented in OpenSSL 1.1.0
+// but not earlier
+Cipher.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256,
+Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+Cipher.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256,
+Cipher.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+Cipher.TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256,
+Cipher.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
+Cipher.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
+Cipher.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
+Cipher.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+Cipher.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384)));
+
static {
// Note: The tests are configured for OpenSSL 1.0.2. Running with a
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-291) Integration tests using selenium:xvfb fails on Windows
Dennis Lundberg created MTOMCAT-291:
---
Summary: Integration tests using selenium:xvfb fails on Windows
Key: MTOMCAT-291
URL: https://issues.apache.org/jira/browse/MTOMCAT-291
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.2
Environment: Windows 7
Reporter: Dennis Lundberg
Assignee: Olivier Lamy (*$^¨%`£)
Fix For: 2.3
The integration test "simple-war-exec-project" in tomcat7-maven-plugin fail on
Windows. The reason for the failure is that the {{JarArchiveEntry}} that is
created in {{AbstractExecWarMojo.copyDirectoryContentIntoArchive()}} contains
platform specific path separators, i.e. '\'. The integration test requires that
all path separators are '/'.
According to
http://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#isDirectory%28%29
path separators should be '/' and nothing else. So the fix is to transform the
path separators of the included file before its name is added to the archive.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-291) Integration tests using selenium:xvfb fails on Windows
[
https://issues.apache.org/jira/browse/MTOMCAT-291?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-291:
Component/s: (was: tomcat7)
Description:
The integration test "artifact.id-webapp-it" in tomcat-maven-archetype fail on
Windows. The failure occurs when running the ITs using the "headless" profile
as defined in
{{tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml}}.
That profile tries to run {{selenium:xvfb}} which can only be launched on
headless unix systems, se the docs:
http://mojo.codehaus.org/selenium-maven-plugin/xvfb-mojo.html
The IT failure can be seen in Jenkins here:
https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x-windows/5/console
was:
The integration test "simple-war-exec-project" in tomcat7-maven-plugin fail on
Windows. The reason for the failure is that the {{JarArchiveEntry}} that is
created in {{AbstractExecWarMojo.copyDirectoryContentIntoArchive()}} contains
platform specific path separators, i.e. '\'. The integration test requires that
all path separators are '/'.
According to
http://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#isDirectory%28%29
path separators should be '/' and nothing else. So the fix is to transform the
path separators of the included file before its name is added to the archive.
Fix Version/s: (was: 2.3)
Labels: (was: patch)
> Integration tests using selenium:xvfb fails on Windows
> --
>
> Key: MTOMCAT-291
> URL: https://issues.apache.org/jira/browse/MTOMCAT-291
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
>Affects Versions: 2.2
> Environment: Windows 7
>Reporter: Dennis Lundberg
>Assignee: Olivier Lamy (*$^¨%`£)
>
> The integration test "artifact.id-webapp-it" in tomcat-maven-archetype fail
> on Windows. The failure occurs when running the ITs using the "headless"
> profile as defined in
> {{tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml}}.
> That profile tries to run {{selenium:xvfb}} which can only be launched on
> headless unix systems, se the docs:
> http://mojo.codehaus.org/selenium-maven-plugin/xvfb-mojo.html
> The IT failure can be seen in Jenkins here:
> https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x-windows/5/console
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-291) Integration tests using selenium:xvfb fails on Windows
[
https://issues.apache.org/jira/browse/MTOMCAT-291?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-291:
Description:
The integration test "artifact.id-webapp-it" in tomcat-maven-archetype fail on
Windows. The failure occurs when running the ITs using the "headless" profile
as defined in
{{tomcat-maven-archetype/src/main/resources/archetype-resources/\_\_rootArtifactId\_\_-webapp-it/pom.xml}}.
That profile tries to run {{selenium:xvfb}} which can only be launched on
headless unix systems, se the docs:
http://mojo.codehaus.org/selenium-maven-plugin/xvfb-mojo.html
The IT failure can be seen in Jenkins here:
https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x-windows/5/console
was:
The integration test "artifact.id-webapp-it" in tomcat-maven-archetype fail on
Windows. The failure occurs when running the ITs using the "headless" profile
as defined in
{{tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml}}.
That profile tries to run {{selenium:xvfb}} which can only be launched on
headless unix systems, se the docs:
http://mojo.codehaus.org/selenium-maven-plugin/xvfb-mojo.html
The IT failure can be seen in Jenkins here:
https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x-windows/5/console
> Integration tests using selenium:xvfb fails on Windows
> --
>
> Key: MTOMCAT-291
> URL: https://issues.apache.org/jira/browse/MTOMCAT-291
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
>Affects Versions: 2.2
> Environment: Windows 7
>Reporter: Dennis Lundberg
>Assignee: Olivier Lamy (*$^¨%`£)
>
> The integration test "artifact.id-webapp-it" in tomcat-maven-archetype fail
> on Windows. The failure occurs when running the ITs using the "headless"
> profile as defined in
> {{tomcat-maven-archetype/src/main/resources/archetype-resources/\_\_rootArtifactId\_\_-webapp-it/pom.xml}}.
> That profile tries to run {{selenium:xvfb}} which can only be launched on
> headless unix systems, se the docs:
> http://mojo.codehaus.org/selenium-maven-plugin/xvfb-mojo.html
> The IT failure can be seen in Jenkins here:
> https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x-windows/5/console
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Reg: Bug 56438
On 17/02/2015 06:42, Pravallika Peddi wrote: > Hi Mark, > Its regarding the another bug that you shared to me: > https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 > > This bug involves migration from 5.5 to 7.0, and i am new to migration of > Tomcat releases. Hence can you assign me some other issues which can handle > with code directly? > > Or please let me know the search criteria to find out the right issues > based on my expertise. Do some more research on that issue. Migration was just the point in time where the user discovered the issue with the current Tomcat behaviour. You should be able to replicate the problem with a very simple web application with trunk (or just add JARs to one of the web applications that ships with Tomcat). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1660266 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/tipis/ReplicatedMap.java webapps/docs/changelog.xml
2015-02-17 5:20 GMT+03:00 :
> Author: kfujino
> Date: Tue Feb 17 02:20:11 2015
> New Revision: 1660266
>
> URL: http://svn.apache.org/r1660266
> Log:
> Make sure that add to the backup node of the map entry when map member has
> been added to ReplicatedMap.
It is hard to read the above phrase. I guess that it means the following:
"When a map member has been added to ReplicatedMap, make sure to add
it to backup nodes list of all other members."
> Modified:
>
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
>
> Modified:
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1660266&r1=1660265&r2=1660266&view=diff
> ==
> ---
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> (original)
> +++
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> Tue Feb 17 02:20:11 2015
> @@ -203,4 +203,29 @@ public class ReplicatedMap extends
> long complete = System.currentTimeMillis() - start;
> if (log.isInfoEnabled()) log.info("Relocation of map entries was
> complete in " + complete + " ms.");
> }
> +
@Override
> +public void mapMemberAdded(Member member) {
This overrides the same method in AbstractReplicatedMap -
AbstractReplicatedMap.mapMemberAdded().
The AbstractReplicatedMap.mapMemberAdded() method calls
"publishEntryInfo(entry.getKey(), entry.getValue());". The
publishEntryInfo() method sends a message to other nodes of the
cluster.
The new code in ReplicatedMap.mapMemberAdded() does not call
"publishEntryInfo" and does not send that message. Is it intended?
> +if ( member.equals(getChannel().getLocalMember(false)) ) return;
> +boolean memberAdded = false;
> +synchronized (mapMembers) {
> +if (!mapMembers.containsKey(member) ) {
> +mapMembers.put(member, new Long(System.currentTimeMillis()));
> +memberAdded = true;
> +}
> +}
> +if ( memberAdded ) {
> +synchronized (stateMutex) {
> +Member[] backup = getMapMembers();
> +Iterator>> i =
> innerMap.entrySet().iterator();
> +while (i.hasNext()) {
> +Map.Entry> e = i.next();
> +MapEntry entry = innerMap.get(e.getKey());
> +if ( entry == null ) continue;
> +if (entry.isPrimary() &&
> !inSet(member,entry.getBackupNodes())) {
> +entry.setBackupNodes(backup);
> +}
> +}
> +}
> +}
> +}
> }
> \ No newline at end of file
>
> 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=1660266&r1=1660265&r2=1660266&view=diff
> ==
> --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Feb 17 02:20:11 2015
> @@ -55,6 +55,14 @@
>
>
>
> +
> +
> +
> +Make sure that add to the backup node of the map entry when map
> member
> +has been added to ReplicatedMap. (kfujino)
> +
> +
> +
>
>
>
>
>
>
> -
> 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
svn commit: r1660353 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: markt Date: Tue Feb 17 11:43:46 2015 New Revision: 1660353 URL: http://svn.apache.org/r1660353 Log: Update for DBCP2. Patch provided by Phil Steitz Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1660353&r1=1660352&r2=1660353&view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue Feb 17 11:43:46 2015 @@ -163,15 +163,17 @@ which opened these resources and never c To configure a DBCP DataSource so that abandoned database connections are -removed and recycled add the following attribute to the +removed and recycled, add one or both of the following attributes to the Resource configuration for your DBCP DataSource: - -removeAbandoned="true" - - -When available database connections run low DBCP will recover and recycle -any abandoned database connections it finds. The default is false. +removeAbandonedOnBorrow=true +removeAbandonedOnMaintenance=true + The default for both of these attributes is false. Note that +removeAbandonedOnMaintenance has no effect unless pool +maintenance is enabled by setting timeBetweenEvictionRunsMillis +to a positive value. See the +http://commons.apache.org/dbcp/configuration.html";> +DBCP documentation for full documentation on these attributes. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57587] JNDI Datasource HOW-TO refers to obsolete DBCP config property
https://bz.apache.org/bugzilla/show_bug.cgi?id=57587 --- Comment #1 from Konstantin Kolinko --- When did it happen? The DBCP documentation [1] mentions "removeAbandoned", but none of those two other properties? One also needs to update the migration guide. [2] [1] http://commons.apache.org/proper/commons-dbcp/configuration.html [2] http://tomcat.apache.org/migration-8.html#Database_Connection_Pooling -- 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: r1660357 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/jndi-datasource-examples-howto.xml
Author: markt Date: Tue Feb 17 12:00:48 2015 New Revision: 1660357 URL: http://svn.apache.org/r1660357 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57587 Update for DBCP2. Patch provided by Phil Steitz Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 17 12:00:48 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1
svn commit: r1660358 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: markt Date: Tue Feb 17 12:12:36 2015 New Revision: 1660358 URL: http://svn.apache.org/r1660358 Log: Whitespace police Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1660358&r1=1660357&r2=1660358&view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue Feb 17 12:12:36 2015 @@ -168,10 +168,10 @@ removed and recycled, add one or both of removeAbandonedOnBorrow=true removeAbandonedOnMaintenance=true - The default for both of these attributes is false. Note that -removeAbandonedOnMaintenance has no effect unless pool -maintenance is enabled by setting timeBetweenEvictionRunsMillis -to a positive value. See the + The default for both of these attributes is false. Note that +removeAbandonedOnMaintenance has no effect unless pool +maintenance is enabled by setting timeBetweenEvictionRunsMillis +to a positive value. See the http://commons.apache.org/dbcp/configuration.html";> DBCP documentation for full documentation on these attributes. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660359 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml
Author: markt Date: Tue Feb 17 12:13:31 2015 New Revision: 1660359 URL: http://svn.apache.org/r1660359 Log: Whitespace police Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 17 12:13:31 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,
Re: Question about taglibs. Issue 37466
2015-02-14 20:04 GMT+03:00 Stephan van Loendersloot (LIST) : > Hi everyone, > > I have a question about this issue: > https://bz.apache.org/bugzilla/show_bug.cgi?id=37466 > > I tried to switch to the latest Tomcat TagLibs implementation, but due to > this fixed bug, it seems that posted form parameters aren't visible anymore > in relative pages imported by tags. > > The JSTl specicication 1.2, Section 7.2 (page 57) states that relative URLs > should be processed in the exact same way as the include action of the JSP > specification () when used in the same application context. > > The older, Jakarta TagLibs don't have this problem, but the Tomcat TagLibs > do... > > Can anyone tell me if the fix breaks the specification guidelines, or did I > misread the whole thing? > BZ 37466 fix (r495005) was committed 8 years ago. You need to provide an example that reproduces your issue. Wrapping a request with overwritten getMethod() should not break parsing of POST parameters. The parameters parsing is done by tomcat internals and operates on the original request, not on the wrapper. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57587] JNDI Datasource HOW-TO refers to obsolete DBCP config property
https://bz.apache.org/bugzilla/show_bug.cgi?id=57587 --- Comment #2 from Phil Steitz --- This is since DBCP 2.0. The DBCP config doc has been updated in trunk. Changes will appear on the web site once the release in progress completes. -- 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 57587] JNDI Datasource HOW-TO refers to obsolete DBCP config property
https://bz.apache.org/bugzilla/show_bug.cgi?id=57587 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas --- Fixed in trunk and 8.0.x for 8.0.21 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: r1660376 - in /tomcat/site/trunk: docs/index.html docs/migration-8.html xdocs/migration-8.xml
Author: markt Date: Tue Feb 17 13:48:40 2015 New Revision: 1660376 URL: http://svn.apache.org/r1660376 Log: Update migration guide for DBCP2 changes to removeAbandoned Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/xdocs/migration-8.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1660376&r1=1660375&r2=1660376&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Feb 17 13:48:40 2015 @@ -236,7 +236,7 @@ since 7.0.57 include: - + Session ID Generator is now extensible. Modified: tomcat/site/trunk/docs/migration-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1660376&r1=1660375&r2=1660376&view=diff == --- tomcat/site/trunk/docs/migration-8.html (original) +++ tomcat/site/trunk/docs/migration-8.html Tue Feb 17 13:48:40 2015 @@ -456,6 +456,10 @@ of Apache Tomcat. validation query is defined and at least one of the testxxx attributes is true, connections will be validated using Connection.isValid(). + +The removeAbandoned configuration option has been + replaced by removeAbandonedOnBorrow and + removeAbandonedOnMaintenance. Modified: tomcat/site/trunk/xdocs/migration-8.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1660376&r1=1660375&r2=1660376&view=diff == --- tomcat/site/trunk/xdocs/migration-8.xml (original) +++ tomcat/site/trunk/xdocs/migration-8.xml Tue Feb 17 13:48:40 2015 @@ -150,6 +150,9 @@ of Apache Tomcat. validation query is defined and at least one of the testxxx attributes is true, connections will be validated using Connection.isValid(). + The removeAbandoned configuration option has been + replaced by removeAbandonedOnBorrow and + removeAbandonedOnMaintenance. Additionally, Commons DBCP has added a number of new configuration - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.20
On 16/02/2015 14:09, Konstantin Kolinko wrote: > 2015-02-15 21:46 GMT+03:00 Mark Thomas : >> The proposed Apache Tomcat 8.0.20 release is now available for voting. >> >> >> The proposed 8.0.20 release is: >> [ ] Broken - do not release >> [ ] Stable - go ahead and release as 8.0.20 >> > > I am abstaining for now. > > Using JDK 7u76, win, 32-bit > Unit tests pass. > > Smoke testing: I see an issue with numberwriter example. > > Test: > 1) go to /examples/servlets/nonblocking/numberwriter with a web browser > 2) look into access log > Expected: status 200 > Actual: status 500 for APR, NIO, NIO2. (BIO is OK) > > NIO sometimes show status 200. > NIO+HTTPS shows status 200. How frequently do you see this? I've just tried repeating this with NIO on Windows (64-bit OS, 32-bit u76 JDK, 8.0.x) without success. I've tired a few other OS / JDK combinations that are less like your environment and I haven't been able to repeat this there either. > A GET request is sufficient to trigger this, so I first noted this > with wget -r examples and searched the log for " 500 ". The > downloaded file is OK. > > There are no error messages in JULI log files. > > Looking into my old logs for testing 8.0.18, this was observed in that > version as well, so it is not a regression. OK. Based on what we know about this so far, I intend to continue with the 8.0.20 vote. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660388 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Tue Feb 17 14:21:04 2015
New Revision: 1660388
URL: http://svn.apache.org/r1660388
Log:
Fix formatting of debug method
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1660388&r1=1660387&r2=1660388&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Feb 17
14:21:04 2015
@@ -768,7 +768,7 @@ public class Nio2Endpoint extends Abstra
public void completed(Integer nBytes,
SocketWrapperBase attachment) {
boolean notify = false;
if (log.isDebugEnabled()) {
-log.debug("Socket: [ + " + attachment + "], Interest:
[" + readInterest + "]");
+log.debug("Socket: [" + attachment + "], Interest: ["
+ readInterest + "]");
}
synchronized (readCompletionHandler) {
if (nBytes.intValue() < 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660390 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Tue Feb 17 14:30:59 2015
New Revision: 1660390
URL: http://svn.apache.org/r1660390
Log:
Additional debug logging to try and trace the cause of the occasional NIO2
failures for TestWebSocketFrameClientSSL.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1660390&r1=1660389&r2=1660390&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Feb 17
14:30:59 2015
@@ -562,6 +562,9 @@ public class Nio2Endpoint extends Abstra
}
protected boolean processSocket0(SocketWrapperBase
socketWrapper, SocketStatus status, boolean dispatch) {
+if (log.isDebugEnabled()) {
+log.debug("processSocket0 [" + socketWrapper + "], [" + status +
"], [" + dispatch + "]", new Exception());
+}
try {
SocketProcessor sc = (useCaches) ? processorCache.pop() : null;
if (sc == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660398 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Tue Feb 17 14:50:05 2015
New Revision: 1660398
URL: http://svn.apache.org/r1660398
Log:
REvert debug message - it won't help.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1660398&r1=1660397&r2=1660398&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Feb 17
14:50:05 2015
@@ -562,9 +562,6 @@ public class Nio2Endpoint extends Abstra
}
protected boolean processSocket0(SocketWrapperBase
socketWrapper, SocketStatus status, boolean dispatch) {
-if (log.isDebugEnabled()) {
-log.debug("processSocket0 [" + socketWrapper + "], [" + status +
"], [" + dispatch + "]", new Exception());
-}
try {
SocketProcessor sc = (useCaches) ? processorCache.pop() : null;
if (sc == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660402 - in /tomcat/trunk: java/org/apache/coyote/AbstractProtocol.java test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Author: markt
Date: Tue Feb 17 14:55:52 2015
New Revision: 1660402
URL: http://svn.apache.org/r1660402
Log:
Additional debug logging to try and trace the cause of the occasional NIO2
failures for TestWebSocketFrameClientSSL.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1660402&r1=1660401&r2=1660402&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Tue Feb 17
14:55:52 2015
@@ -601,12 +601,18 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1660402&r1=1660401&r2=1660402&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Tue Feb 17 14:55:52 2015
@@ -47,6 +47,8 @@ public class TestWebSocketFrameClientSSL
public void testConnectToServerEndpoint() throws Exception {
Logger logger =
Logger.getLogger("org.apache.tomcat.util.net.Nio2Endpoint");
logger.setLevel(Level.ALL);
+logger =
Logger.getLogger("org.apache.coyote.http11.Http11Nio2Protocol");
+logger.setLevel(Level.ALL);
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Context ctx = tomcat.addContext("", null);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660407 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Tue Feb 17 15:17:27 2015
New Revision: 1660407
URL: http://svn.apache.org/r1660407
Log:
Tweak debug message
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1660407&r1=1660406&r2=1660407&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Feb 17
15:17:27 2015
@@ -1010,7 +1010,7 @@ public class Nio2Endpoint extends Abstra
} else {
if (!readPending.tryAcquire()) {
if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read: [0]");
+log.debug("Socket: [" + this + "], Read in progress.
Returning [0]");
}
return 0;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57540] report TLS protocol version
https://bz.apache.org/bugzilla/show_bug.cgi?id=57540 Ralf Hauser changed: What|Removed |Added Attachment #32437|0 |1 is obsolete|| CC||hau...@acm.org --- Comment #9 from Ralf Hauser --- Created attachment 32486 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32486&action=edit apache.tomcat.tls.protocol.57540c9.patch hopefully followed all the instructions by Mark and Christopher - please committ -- 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: r1660433 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt Date: Tue Feb 17 16:17:00 2015 New Revision: 1660433 URL: http://svn.apache.org/r1660433 Log: Remove debug messages. They weren't helping. Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1660433&r1=1660432&r2=1660433&view=diff == --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Tue Feb 17 16:17:00 2015 @@ -601,18 +601,12 @@ public abstract class AbstractProtocol
Re: Question about taglibs. Issue 37466
On Feb 17, 2015, at 4:34 AM, Konstantin Kolinko wrote: > > 2015-02-14 20:04 GMT+03:00 Stephan van Loendersloot (LIST) > : >> Hi everyone, >> >> I have a question about this issue: >> https://bz.apache.org/bugzilla/show_bug.cgi?id=37466 >> >> I tried to switch to the latest Tomcat TagLibs implementation, but due to >> this fixed bug, it seems that posted form parameters aren't visible anymore >> in relative pages imported by tags. >> >> The JSTl specicication 1.2, Section 7.2 (page 57) states that relative URLs >> should be processed in the exact same way as the include action of the JSP >> specification () when used in the same application context. >> >> The older, Jakarta TagLibs don't have this problem, but the Tomcat TagLibs >> do... >> >> Can anyone tell me if the fix breaks the specification guidelines, or did I >> misread the whole thing? >> > > > BZ 37466 fix (r495005) was committed 8 years ago. > > You need to provide an example that reproduces your issue. Wrapping a > request with overwritten getMethod() should not break parsing of POST > parameters. The parameters parsing is done by tomcat internals and > operates on the original request, not on the wrapper. I think there may be an issue here but would like an example to confirm. This change was introduced between 1.1 and 1.2 and after GlassFish forked away. The original thread that led to BZ 37466 related to HEAD requests where the original HttpServletRequest was being passed to a RequestDispatcher. What I took from the thread is that this would result an empty response from the imported resource which the application was not expecting - it tried to parse empty content and failed. The r495005 patch attempts to fix this by forcing the method to GET, mirroring the semantic of an external absolute URL where the JSTL spec mandates a GET request is made when using HTTP. I’m not convinced this change was correct. For relative URLs it specifies the “whole environment is available … as well as request parameters” and by forcing the method to GET we are indicating that there is no request body to parse and so parameters in the original POST body should be skipped. As Konstantin said, Tomcat does not take account of wrappers so will still extract parameters from the request body but that may not be true for other containers or if the application code is parsing the request content. Perhaps the issue here is actually with Tomcat’s implementation of HttpServlet and/or DefaultServlet where it appears doHead() never returns content even for dispatched includes. If these only suppressed content for the original response but did return content for included responses then BZ 37466 would not be an issue. This would also seem to be necessary to return the same headers for HEAD as GET e.g. ensuring that the Content-Length returned included bytes from the included resource. Stephan, please can you submit an example showing what’s failing for you and include info on which container you are using and what version of taglibs you are upgrading from. Thanks Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
Re: [VOTE] Release Apache Taglibs 1.2.3
Ping? > On Feb 13, 2015, at 7:46 AM, Jeremy Boynes wrote: > > Please could we have a third set of eyes on this release. > > Thanks > Jeremy > >> On Feb 10, 2015, at 8:40 PM, Jeremy Boynes wrote: >> >> The proposed Apache Taglibs 1.2.3 release is now available for voting. >> >> It can be obtained from: >> https://dist.apache.org/repos/dist/dev/tomcat/taglibs/taglibs-standard-1.2.3/ >> >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-1034/ >> >> The SVN tag is: >> http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/ >> >> The proposed 1.2.3 release is: >> [ ] Broken - do not release >> [ ] Stable - go ahead and release as 1.2.3 Stable >> >> Thanks >> Jeremy > signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r1660438 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Author: markt
Date: Tue Feb 17 16:38:28 2015
New Revision: 1660438
URL: http://svn.apache.org/r1660438
Log:
Drop some of the extra debug logging
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1660438&r1=1660437&r2=1660438&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Tue Feb 17 16:38:28 2015
@@ -47,8 +47,6 @@ public class TestWebSocketFrameClientSSL
public void testConnectToServerEndpoint() throws Exception {
Logger logger =
Logger.getLogger("org.apache.tomcat.util.net.Nio2Endpoint");
logger.setLevel(Level.ALL);
-logger =
Logger.getLogger("org.apache.coyote.http11.Http11Nio2Protocol");
-logger.setLevel(Level.ALL);
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Context ctx = tomcat.addContext("", null);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.20
Am 15.02.2015 um 19:46 schrieb Mark Thomas: The proposed 8.0.20 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 8.0.20 +1 to release. Details === - MD5 OK - signatures OK - key in KEYS file - gz and zip for src and bin consistent - src completely consistent with svn tag - builds fine - warning about unchecked calls or conversions in: - org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java - org/apache/tomcat/jdbc/pool/PoolProperties.java Not a regression - build result looks consistent with binaries - no checkstyle complaints - no Javadoc warnings - Unit tests: No failures - Details of log output see below - JMX MBean Comparison: - OperatingSystem MBean attribute OpenFileDescriptorCount reduced from 81 to 80 (was 81 at least since 8.0.16) Build and tests were done using Java 1.7.0_76. OS was Solaris 10 Sparc, tcnative was 1.1.32 based on APR 1.5.1 and OpenSSL 1.0.1l. Unit test warnings == - total 214, previous numbers: 8.0.14: 198 8.0.15: 212 8.0.16: 200 8.0.17: 213 8.0.18: 204 8.0.20: 214 - 62 times (+3) "...tribes.group.interceptors.NonBlockingCoordinator.sendElectionMsgToNextInline Unable to send election message to:..." - 9 (-2) "...tribes.transport.nio.ParallelNioSender.doLoop Member send is failing..." on thread Tribes-Task-Receiver-... - 7 (+6) "...tribes.transport.nio.ParallelNioSender.doLoop Member send is failing..." on thread Membership-MemberDisappeared. - 6 (+2) "org.apache.catalina.tribes.transport.nio.NioReplicationTask.run IOException in replication worker, unable to drain channel. Probable cause: Keep alive socket closed[null]." - 0 (-1) "...tribes.transport.nio.ParallelNioSender.doLoop Not retrying send for:..." - 48 (+2) "...WebappClassLoaderBase.clearReferencesThreads The web application [ROOT] appears to have started a thread named..." - 4 (unchanged) "...WebappClassLoaderBase.clearReferencesStopTimerThread The web application [ROOT] appears to have started a TimerThread named [leaked-thread] via the java.util.Timer API but has failed to stop it" - 12 (unchanged) "...HostConfig.deployDescriptor A docBase /.../output/test-tmp/webapps/myapp inside the host appBase has been specified, and will be ignored" - 8 (unchanged) "...HostConfig.deployWARs The directory [/.../apache-tomcat-VERSION-src-gz/output/test-tmp/webapps/myapp] will be ignored because the WAR [/.../apache-tomcat-VERSION-src-gz/output/test-tmp/webapps/myapp.war] takes priority and unpackWARs is false" - 20 (unchanged) "...StandardContext.setPath A context path must either be an empty string or start with a '/' and do not end with a '/'. The path [...] does not meet these criteria and has been changed to [...]" - 8 (unchanged) StuckThreadDetectionValve.notifyStuckThreadDetected - 4 (unchanged) StuckThreadDetectionValve$MonitoredThread.interruptIfStuck - 4 (unchanged) "...WebXml.setVersion Unknown version string [0.0]. Default version will be used." - 4 (unchanged) "...WebXml.orderWebFragments Used a wrong fragment name z at web.xml absolute-ordering tag!" - 4 (unchanged) "...TestStandardContextResources.testResources testResources(): orderedLibs: [...]" - 3 (unchanged) "...AbstractEndpoint.shutdownExecutor The executor associated with thread pool [...] has not fully shutdown. Some application threads may still be running." - 3 (unchanged) "WsSession.onClose Failed to flush batched messages on session close" - 2 (-2) "...WsServerContainer.destroy Unable to destroy WebSocket thread group [WebSocketServer-localhost-ROOT] as [1] threads were still running when the web application was stopped. The thread group will be destroyed once the threads terminate." - 2 (unchanged) "...Http11Processor.actionInternal Exception getting SSL attribute" - 2 (unchanged) "...Http11Nio2Processor.actionInternal Exception re-negotiating SSL connection" - 1 (+1) "...JIoEndpoint$SocketProcessor.run Socket reprocessing request was rejected for:org.apache.tomcat.util.net.SocketWrapper@...:Socket[addr=...,port=...,localport=...]" Unit test SEVERE messages = - total 711, previous numbers: 8.0.14: 706 8.0.15: 701 8.0.16: 698 8.0.17: 701 8.0.18: 698 8.0.20: 711 - 196 (unchanged) "Servlet.service() for servlet ... threw exception". 292 messages (unchanged) in TestHostConfigAutomaticDeployment: - 104 org.apache.catalina.core.ContainerBase.addChildInternal ContainerBase.addChild: start: - 64 org.apache.catalina.startup.HostConfig.deployDescriptor Error deploying configuration descriptor .../output/test-tmp/conf/Tomcat/localhost/myapp.xml - 24 org.apache.catalina.startup.HostConfig.deployDirectory The web application with context path [/myapp] was not deployed because it contained a deployment descriptor [.../output/test-tmp/webapps/myapp/META-INF/context.xml] which may include configuration necessary for the secure deployment of the appl
[Bug 57540] report TLS protocol version
https://bz.apache.org/bugzilla/show_bug.cgi?id=57540 --- Comment #10 from Christopher Schultz --- I'm evaluating this. The change for AprSSLSupport doesn't seem that onerous. Why didn't you implement that? -- 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: r1660470 - in /tomcat/trunk: java/org/apache/coyote/http11/upgrade/LocalStrings.properties java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java test/org/apache/tomcat/websocket/Test
Author: markt
Date: Tue Feb 17 19:25:07 2015
New Revision: 1660470
URL: http://svn.apache.org/r1660470
Log:
After a few wrong turns, take another stab at some debug logging for the
ocassional NIO2 failure in the CI build. I don't expect this to find the
problem, just point us in the right direction.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1660470&r1=1660469&r2=1660470&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Tue Feb 17 19:25:07 2015
@@ -15,6 +15,9 @@
upgradeProcessor.isCloseFail=Failed to close input stream associated with
upgraded connection
upgradeProcessor.osCloseFail=Failed to close output stream associated with
upgraded connection
+upgradeProcessor.requiredClose=Closing upgraded connection due to
closeRequired state of streams: Input [{0}], Output [{1}]
+upgradeProcessor.stop=Closing upgraded connection as incoming socket status
was STOP
+upgradeProcessor.unexpectedState=Closing upgraded connection unexpectedly as
incoming socket status was [{0}]
upgrade.sis.errorCloseFail=Failed to close InputStream cleanly after a
previous error
upgrade.sis.isFinished.ise=It is illegal to call isFinished() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1660470&r1=1660469&r2=1660470&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Tue Feb 17 19:25:07 2015
@@ -103,6 +103,9 @@ public class UpgradeProcessor implements
} else if (status == SocketStatus.OPEN_WRITE) {
upgradeServletOutputStream.onWritePossible();
} else if (status == SocketStatus.STOP) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("upgradeProcessor.stop"));
+}
try {
upgradeServletInputStream.close();
} catch (IOException ioe) {
@@ -116,10 +119,18 @@ public class UpgradeProcessor implements
return SocketState.CLOSED;
} else {
// Unexpected state
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("upgradeProcessor.unexpectedState"));
+}
return SocketState.CLOSED;
}
if (upgradeServletInputStream.isCloseRequired() ||
upgradeServletOutputStream.isCloseRequired()) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("upgradeProcessor.requiredClose",
+
Boolean.valueOf(upgradeServletInputStream.isCloseRequired()),
+
Boolean.valueOf(upgradeServletOutputStream.isCloseRequired(;
+}
return SocketState.CLOSED;
}
return SocketState.UPGRADED;
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1660470&r1=1660469&r2=1660470&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Tue Feb 17 19:25:07 2015
@@ -47,6 +47,8 @@ public class TestWebSocketFrameClientSSL
public void testConnectToServerEndpoint() throws Exception {
Logger logger =
Logger.getLogger("org.apache.tomcat.util.net.Nio2Endpoint");
logger.setLevel(Level.ALL);
+logger =
Logger.getLogger("org.apache.coyote.http11.upgrade.UpgradeProcessor");
+logger.setLevel(Level.ALL);
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Context ctx = tomcat.addContext("", null);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660472 - /tomcat/trunk/build.xml
Author: markt Date: Tue Feb 17 19:30:50 2015 New Revision: 1660472 URL: http://svn.apache.org/r1660472 Log: Missed a version number update for 8.0.x -> 9.0.x Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1660472&r1=1660471&r2=1660472&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Feb 17 19:30:50 2015 @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660479 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Author: markt
Date: Tue Feb 17 19:50:40 2015
New Revision: 1660479
URL: http://svn.apache.org/r1660479
Log:
Typical. The tests starts failing regularly and it is the test that isn't
configured for debug that fails.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1660479&r1=1660478&r2=1660479&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Tue Feb 17 19:50:40 2015
@@ -96,6 +96,10 @@ public class TestWebSocketFrameClientSSL
@Test
public void testBug56032() throws Exception {
+Logger logger =
Logger.getLogger("org.apache.tomcat.util.net.Nio2Endpoint");
+logger.setLevel(Level.ALL);
+logger =
Logger.getLogger("org.apache.coyote.http11.upgrade.UpgradeProcessor");
+logger.setLevel(Level.ALL);
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Context ctx = tomcat.addContext("", null);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1660479 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
On 17/02/2015 19:50, ma...@apache.org wrote: > Author: markt > Date: Tue Feb 17 19:50:40 2015 > New Revision: 1660479 > > URL: http://svn.apache.org/r1660479 > Log: > Typical. The tests starts failing regularly and it is the test that isn't > configured for debug that fails. > > Modified: > > tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java I'm currently running this test in a loop until it fails on a local VM and on the VM that hosts the buildbot slave we use. I'm seeing a couple a different failure modes. In one, something triggers a socket closure before the write has finished. I'm fairly sure it is happening on the write thread but I don't know exactly where yet. The other is that the write thread just stops writing. I think that is probably an issue with a failure to register for write somewhere. My plan - such as it is - is to keep adding targeted debug statements until I track down the source of these errors. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57540] report TLS protocol version
https://bz.apache.org/bugzilla/show_bug.cgi?id=57540 --- Comment #11 from Christopher Schultz --- Something is missing, here. I can't get the NIO connector to give me the protocol value. I changed the code to use "(unknown)" when the value returned by SSLSupport is null, and I'm not seeing that, either. I think something might be wrong with my test case. One more note: AJP isn't supported by this patch, and I think it should be. -- 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 57540] report TLS protocol version
https://bz.apache.org/bugzilla/show_bug.cgi?id=57540 --- Comment #12 from Christopher Schultz --- Rats... looks like to support AJP, there need to be additional data sent by the proxy. There is no pre-defined field for SSL_PROTOCOL (similar to o.a.coyote.ajp.Constants.SC_A_SSL_CIPHER) so that'll need to wait. -- 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 57540] report TLS protocol version
https://bz.apache.org/bugzilla/show_bug.cgi?id=57540 --- Comment #13 from Christopher Schultz --- Okay, the patch doesn't work as presented. If you request the SSL protocol before any of the other SSL attributes, then the protocol comes back as null. That's because o.a.c.connector.Request.getAttribtue does some magic to trigger the loading of the SSL variables from the (physical) request into the request attributes. I'm working on an update to the patch that includes hooks for this magic. -- 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 57540] report TLS protocol version
https://bz.apache.org/bugzilla/show_bug.cgi?id=57540 --- Comment #14 from Christopher Schultz --- Created attachment 32487 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32487&action=edit Updated patch This patch supports APR-based connectors and also works when the SSL protocol is the first SSL attribute fetched from the request attributes. I'm not sure about how many places we like to define these key constants, so I'm asking for a review before I commit. -- 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: r1660498 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Tue Feb 17 21:02:09 2015
New Revision: 1660498
URL: http://svn.apache.org/r1660498
Log:
Possible fix for occasional NIO2 CI failures. Without the sync it is possible
for a write registration to get lost.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1660498&r1=1660497&r2=1660498&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Feb 17
21:02:09 2015
@@ -736,7 +736,7 @@ public class Nio2Endpoint extends Abstra
private final CompletionHandler
writeCompletionHandler;
private final CompletionHandler
gatheringWriteCompletionHandler;
-private final Semaphore writePending = new Semaphore(1);
+private final Semaphore writePending = new Semaphore(1); // Guarded by
writeCompletionHandler
private boolean writeInterest = false; // Guarded by
writeCompletionHandler
private boolean writeNotify = false;
@@ -1199,10 +1199,12 @@ public class Nio2Endpoint extends Abstra
// Before doing a blocking flush, make sure that any pending non
// blocking write has completed.
try {
-if (writePending.tryAcquire(getNio2WriteTimeout(),
TimeUnit.MILLISECONDS)) {
-writePending.release();
-} else {
-throw new SocketTimeoutException();
+synchronized(writeCompletionHandler) {
+if (writePending.tryAcquire(getNio2WriteTimeout(),
TimeUnit.MILLISECONDS)) {
+writePending.release();
+} else {
+throw new SocketTimeoutException();
+}
}
} catch (InterruptedException e) {
// Ignore
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 27 mins 14 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150217-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150217/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150217.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150217-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150217/bin/openssl -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/pub
svn commit: r1660504 - in /tomcat/jk/trunk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/common/jk_ajp_common.c native/common/jk_ajp_common.h native/common/jk_service.h xdocs/miscellan
Author: rjung
Date: Tue Feb 17 21:35:17 2015
New Revision: 1660504
URL: http://svn.apache.org/r1660504
Log:
AJP: Forward name of SSL protocol used for handling
the request (SSLv3, TLSv1, TLSv1.1, TLSv1.2).
This is related to Tomcat BZ 57540.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_ajp_common.h
tomcat/jk/trunk/native/common/jk_service.h
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/apache.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1660504&r1=1660503&r2=1660504&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Tue Feb 17 21:35:17 2015
@@ -75,6 +75,7 @@
#define JK_ENV_LOCAL_PORT ("JK_LOCAL_PORT")
#define JK_ENV_IGNORE_CL("JK_IGNORE_CL")
#define JK_ENV_HTTPS("HTTPS")
+#define JK_ENV_SSL_PROTOCOL ("SSL_PROTOCOL")
#define JK_ENV_CERTS("SSL_CLIENT_CERT")
#define JK_ENV_CIPHER ("SSL_CIPHER")
#define JK_ENV_SESSION ("SSL_SESSION_ID")
@@ -198,6 +199,7 @@ typedef struct
*/
int ssl_enable;
char *https_indicator;
+char *ssl_protocol_indicator;
char *certs_indicator;
char *cipher_indicator;
char *session_indicator;
@@ -1018,6 +1020,9 @@ static int init_ws_service(apache_privat
s->ssl_cert_len, s->ssl_cert);
}
}
+s->ssl_protocol =
+(char *)ap_table_get(r->subprocess_env,
+ conf->ssl_protocol_indicator);
/* Servlet 2.3 API */
s->ssl_cipher =
(char *)ap_table_get(r->subprocess_env,
@@ -2068,6 +2073,25 @@ static const char *jk_set_https_indicato
}
/*
+ * JkSSLPROTOCOLIndicator Directive Handling
+ *
+ * JkSSLPROTOCOLIndicator SSL_PROTOCOL
+ */
+
+static const char *jk_set_ssl_protocol_indicator(cmd_parms * cmd,
+ void *dummy, char *indicator)
+{
+server_rec *s = cmd->server;
+jk_server_conf_t *conf =
+(jk_server_conf_t *) ap_get_module_config(s->module_config,
+ &jk_module);
+
+conf->ssl_protocol_indicator = ap_pstrdup(cmd->pool, indicator);
+
+return NULL;
+}
+
+/*
* JkCERTSIndicator Directive Handling
*
* JkCERTSIndicator SSL_CLIENT_CERT
@@ -2466,6 +2490,8 @@ static const command_rec jk_cmds[] = {
*/
{"JkHTTPSIndicator", jk_set_https_indicator, NULL, RSRC_CONF, TAKE1,
"Name of the Apache environment that contains SSL indication"},
+{"JkSSLPROTOCOLIndicator", jk_set_ssl_protocol_indicator, NULL, RSRC_CONF,
TAKE1,
+ "Name of the Apache environment that contains the SSL protocol name"},
{"JkCERTSIndicator", jk_set_certs_indicator, NULL, RSRC_CONF, TAKE1,
"Name of the Apache environment that contains SSL client certificates"},
{"JkCIPHERIndicator", jk_set_cipher_indicator, NULL, RSRC_CONF, TAKE1,
@@ -2822,6 +2848,7 @@ static void *create_jk_config(ap_pool *
* to be in more use).
*/
c->https_indicator = JK_ENV_HTTPS;
+c->ssl_protocol_indicator = JK_ENV_SSL_PROTOCOL;
c->certs_indicator = JK_ENV_CERTS;
c->cipher_indicator = JK_ENV_CIPHER;
c->certchain_prefix = JK_ENV_CERTCHAIN_PREFIX;
@@ -2898,6 +2925,8 @@ static void *merge_jk_config(ap_pool * p
overrides->ssl_enable = base->ssl_enable;
if (!overrides->https_indicator)
overrides->https_indicator = base->https_indicator;
+if (!overrides->ssl_protocol_indicator)
+overrides->ssl_protocol_indicator = base->ssl_protocol_indicator;
if (!overrides->certs_indicator)
overrides->certs_indicator = base->certs_indicator;
if (!overrides->cipher_indicator)
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1660504&r1=1660503&r2=1660504&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Tue Feb 17 21:35:17 2015
@@ -110,6 +110,7 @@
#define JK_ENV_LOCAL_PORT ("JK_LOCAL_PORT")
#define JK_ENV_IGNORE_CL("JK_IGNORE_CL")
#define JK_ENV_HTTPS("HTTPS")
+#define JK_ENV_SSL_PROTOCOL ("SSL_PROTOCOL")
#define JK_ENV_CERTS("SSL_CLIENT_CERT")
#define JK_ENV_CIPHER ("SSL_CIPHER")
#define JK_ENV_SESSION ("SSL_SESSION_ID")
@@ -228,6 +229,7 @@ typede
Re: svn commit: r1660498 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
On 17/02/2015 21:02, ma...@apache.org wrote: > Author: markt > Date: Tue Feb 17 21:02:09 2015 > New Revision: 1660498 > > URL: http://svn.apache.org/r1660498 > Log: > Possible fix for occasional NIO2 CI failures. Without the sync it is possible > for a write registration to get lost. I still see the error but less frequently. So I think this patch is a step in the right direction. The logs still indicate that a write registration is being lost somewhere so my plan is to continue the code review. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Bug 57540] report TLS protocol version
Am 17.02.2015 um 21:13 schrieb bugzi...@apache.org: https://bz.apache.org/bugzilla/show_bug.cgi?id=57540 --- Comment #12 from Christopher Schultz --- Rats... looks like to support AJP, there need to be additional data sent by the proxy. There is no pre-defined field for SSL_PROTOCOL (similar to o.a.coyote.ajp.Constants.SC_A_SSL_CIPHER) so that'll need to wait. Answering here, because I'm waiting for a pw reset mail form BZ, but BZ currently can't send pw mails. I added a proprietary request attribute named "AJP_SSL_PROTOCOL" to mod_jk in r1660504. It could be mapped to a uniform attribute name, e.g. "org.apache.tomcat.util.net.secure_protocol_version" or whatever is the final name from this patch here in the Tomcat connector. If this featur ehere gets applied, I'll add the same extension to mod_proxy_ajp (httpd trunk) and will propose for backport). Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57540] report TLS protocol version
https://bz.apache.org/bugzilla/show_bug.cgi?id=57540 --- Comment #15 from Rainer Jung --- I added a proprietary request attribute named "AJP_SSL_PROTOCOL" to mod_jk in r1660504. It could be mapped to a uniform attribute name, e.g. "org.apache.tomcat.util.net.secure_protocol_version" or whatever is the final name from this patch here in the Tomcat connector. If this featur here gets applied, I'll add the same extension to mod_proxy_ajp (httpd trunk) and will propose for backport to httpd 2.4/2.2. -- 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: r1660266 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/tipis/ReplicatedMap.java webapps/docs/changelog.xml
2015-02-17 20:30 GMT+09:00 Konstantin Kolinko :
> 2015-02-17 5:20 GMT+03:00 :
> > Author: kfujino
> > Date: Tue Feb 17 02:20:11 2015
> > New Revision: 1660266
> >
> > URL: http://svn.apache.org/r1660266
> > Log:
> > Make sure that add to the backup node of the map entry when map member
> has been added to ReplicatedMap.
>
> It is hard to read the above phrase. I guess that it means the following:
>
> "When a map member has been added to ReplicatedMap, make sure to add
> it to backup nodes list of all other members."
>
>
>
Thanks. I will rewrite changelog.
> > Modified:
> >
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> > tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
> >
> > Modified:
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> > URL:
> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1660266&r1=1660265&r2=1660266&view=diff
> >
> ==
> > ---
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> (original)
> > +++
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> Tue Feb 17 02:20:11 2015
> > @@ -203,4 +203,29 @@ public class ReplicatedMap extends
> > long complete = System.currentTimeMillis() - start;
> > if (log.isInfoEnabled()) log.info("Relocation of map entries
> was complete in " + complete + " ms.");
> > }
> > +
>
> @Override
> > +public void mapMemberAdded(Member member) {
>
> This overrides the same method in AbstractReplicatedMap -
> AbstractReplicatedMap.mapMemberAdded().
>
> The AbstractReplicatedMap.mapMemberAdded() method calls
> "publishEntryInfo(entry.getKey(), entry.getValue());". The
> publishEntryInfo() method sends a message to other nodes of the
> cluster.
>
> The new code in ReplicatedMap.mapMemberAdded() does not call
> "publishEntryInfo" and does not send that message. Is it intended?
>
>
Yes, I intended it.
The most general case which this method is invoked is when starting the
ReplicatedMap.
transferState() method has been already invoked before
ReplicatedMap.mapMemberAdded(Member) is invoked.
Because the newly added nodes have received COPY messages, they have the
entry information.
Therefore, it does not need to send a message in mapMemberAdded.
Although this method is also a possibility that will be invoked by
AbstractReplicatedMap.ping, I did it in the same way as the more general
case.
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
> --
> Keiichi.Fujino
>
>
>
svn commit: r1660564 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: kfujino Date: Wed Feb 18 04:25:34 2015 New Revision: 1660564 URL: http://svn.apache.org/r1660564 Log: rewrite changelog. Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml 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=1660564&r1=1660563&r2=1660564&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Feb 18 04:25:34 2015 @@ -66,8 +66,8 @@ -Make sure that add to the backup node of the map entry when map member -has been added to ReplicatedMap. (kfujino) +When a map member has been added to ReplicatedMap, make +sure to add it to backup nodes list of all other members. (kfujino) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.20
2015-02-16 3:46 GMT+09:00 Mark Thomas : > The proposed Apache Tomcat 8.0.20 release is now available for voting. > > The main changes since 8.0.18 are: > - Fix a performance regression in the new resources implementation > when signed JARs are used in a web application. > - Fix several bugs that could cause multiple registrations for write > events for a single socket when using Servlet 3.0 async. Typically, > the side effects of these multiple registrations would be > exceptions appearing in the logs. > - Enhance the bean factory used for JNDI resources. The new > attribute forceString allows to support non-standard string > argument property setters. > > There is also the usual collection of bug fixes, new features and > performance improvements. For full details, see the changelog: > > http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.20/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1036/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_20/ > > The proposed 8.0.20 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.20 > > Tested on my test applications (enable session replication). Works fine. > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- > Keiichi.Fujino >
Re: Reg: Bug 56438
Sure Mark, I will try and let you know. On Tue, Feb 17, 2015 at 4:20 PM, Mark Thomas wrote: > On 17/02/2015 06:42, Pravallika Peddi wrote: > > Hi Mark, > > Its regarding the another bug that you shared to me: > > https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 > > > > This bug involves migration from 5.5 to 7.0, and i am new to migration > of > > Tomcat releases. Hence can you assign me some other issues which can > handle > > with code directly? > > > > Or please let me know the search criteria to find out the right issues > > based on my expertise. > > Do some more research on that issue. Migration was just the point in > time where the user discovered the issue with the current Tomcat > behaviour. You should be able to replicate the problem with a very > simple web application with trunk (or just add JARs to one of the web > applications that ships with Tomcat). > > Mark > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
