[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

[Bill Barker]

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-tc7.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-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 28 mins 58 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 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151104-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151104-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151104/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151104.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtest.exclu
 dePerformance=true -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio=false 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20151104.jar
 -Dtest.temp=output/test-tmp-APR 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/buil

svn commit: r1712489 - in /tomcat/trunk: java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java

[violetagg]

Author: violetagg
Date: Wed Nov  4 08:17:10 2015
New Revision: 1712489

URL: http://svn.apache.org/viewvc?rev=1712489&view=rev
Log:
Fixed UnsupportedOperationException when releasing an user-provided 
URLStreamHandlerFactory. Patch provided by Cristian Talau via github.

Added:

tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
   (with props)
Modified:

tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java?rev=1712489&r1=1712488&r2=1712489&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
 Wed Nov  4 08:17:10 2015
@@ -102,10 +102,11 @@ public class TomcatURLStreamHandlerFacto
 public static void release(ClassLoader classLoader) {
 Iterator iter = 
instance.userFactories.iterator();
 while (iter.hasNext()) {
-ClassLoader factoryLoader = 
iter.next().getClass().getClassLoader();
+URLStreamHandlerFactory candidate = iter.next();
+ClassLoader factoryLoader = candidate.getClass().getClassLoader();
 while (factoryLoader != null) {
 if (classLoader.equals(factoryLoader)) {
-iter.remove();
+instance.userFactories.remove(candidate);
 break;
 }
 factoryLoader = factoryLoader.getParent();

Added: 
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java?rev=1712489&view=auto
==
--- 
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
 (added)
+++ 
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
 Wed Nov  4 08:17:10 2015
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.webresources;
+
+import java.net.URLStreamHandler;
+import java.net.URLStreamHandlerFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestTomcatURLStreamHandlerFactory {
+
+@Before
+public void register() {
+TomcatURLStreamHandlerFactory.register();
+}
+
+@Test
+public void testUserFactory() throws Exception {
+URLStreamHandlerFactory factory = new URLStreamHandlerFactory() {
+@Override
+public URLStreamHandler createURLStreamHandler(String protocol) {
+return null;
+}
+};
+TomcatURLStreamHandlerFactory.getInstance().addUserFactory(factory);
+
TomcatURLStreamHandlerFactory.release(factory.getClass().getClassLoader());
+}
+}
\ No newline at end of file

Propchange: 
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
--
svn:eol-style = native



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712491 - /tomcat/trunk/build.properties.default

[markt]

Author: markt
Date: Wed Nov  4 08:21:40 2015
New Revision: 1712491

URL: http://svn.apache.org/viewvc?rev=1712491&view=rev
Log:
Fix duplicate. Settings should be before all the version info

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1712491&r1=1712490&r2=1712491&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Nov  4 08:21:40 2015
@@ -52,7 +52,7 @@ test.cobertura=false
 
 # Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
 # multicast tests to work
-#java.net.preferIPv4Stack=true
+java.net.preferIPv4Stack=false
 
 # Location of GPG executable (used only for releases)
 gpg.exec=/path/to/gpg
@@ -226,6 +226,3 @@ cobertura.home=${base.path}/cobertura-${
 cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
 cobertura.lib=${cobertura.home}/lib
 cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
-
-# - JVM settings for unit tests
-java.net.preferIPv4Stack=false



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712492 - /tomcat/tc8.0.x/trunk/build.properties.default

[markt]

Author: markt
Date: Wed Nov  4 08:22:20 2015
New Revision: 1712492

URL: http://svn.apache.org/viewvc?rev=1712492&view=rev
Log:
Fix duplicate. Settings should be before all the version info

Modified:
tomcat/tc8.0.x/trunk/build.properties.default

Modified: tomcat/tc8.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1712492&r1=1712491&r2=1712492&view=diff
==
--- tomcat/tc8.0.x/trunk/build.properties.default (original)
+++ tomcat/tc8.0.x/trunk/build.properties.default Wed Nov  4 08:22:20 2015
@@ -53,7 +53,7 @@ test.cobertura=false
 
 # Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
 # multicast tests to work
-#java.net.preferIPv4Stack=true
+java.net.preferIPv4Stack=false
 
 # Location of GPG executable (used only for releases)
 gpg.exec=/path/to/gpg
@@ -239,6 +239,3 @@ cobertura.home=${base.path}/cobertura-${
 cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
 cobertura.lib=${cobertura.home}/lib
 cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.0.3-bin.tar.gz
-
-# - JVM settings for unit tests
-java.net.preferIPv4Stack=false



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1712361 - /tomcat/trunk/build.properties.default

[Mark Thomas]

On 04/11/2015 03:44, Huxing Zhang wrote:
> Hi Mark, 
> 
> This options has already been defined in build.property.default with default 
> value set to be false.
> I think it is a duplication.

Thanks. Fixed.

Mark


> 
> see the last line in 
> http://svn.apache.org/repos/asf/tomcat/trunk/build.properties.default
> # - JVM settings for unit tests
> java.net.preferIPv4Stack=false
> 
> Thanks,
> Huxing Zhang
> 
> --
> From:markt 
> Send Time:2015年11月4日(星期三) 02:11
> To:dev 
> Subject:svn commit: r1712361 - /tomcat/trunk/build.properties.default
> 
> 
> Author: markt
> Date: Tue Nov  3 18:11:13 2015
> New Revision: 1712361
> 
> URL: http://svn.apache.org/viewvc?rev=1712361&view=rev
> Log:
> Add note about needing IPv4 on latest OSX for multicast tests to work
> 
> Modified:
> tomcat/trunk/build.properties.default
> 
> Modified: tomcat/trunk/build.properties.default
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1712361&r1=1712360&r2=1712361&view=diff
> ==
> --- tomcat/trunk/build.properties.default (original)
> +++ tomcat/trunk/build.properties.default Tue Nov  3 18:11:13 2015
> @@ -50,6 +50,10 @@ test.threads=1
>  # Note the Cobertura code coverage tool is GPLv2 licensed
>  test.cobertura=false
>  
> +# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
> +# multicast tests to work
> +#java.net.preferIPv4Stack=true
> +
>  # Location of GPG executable (used only for releases)
>  gpg.exec=/path/to/gpg
>  
> 
> 
> 
> -
> 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
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712493 - /tomcat/tc7.0.x/trunk/build.properties.default

[markt]

Author: markt
Date: Wed Nov  4 08:23:05 2015
New Revision: 1712493

URL: http://svn.apache.org/viewvc?rev=1712493&view=rev
Log:
Align with 8.0.x

Modified:
tomcat/tc7.0.x/trunk/build.properties.default

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1712493&r1=1712492&r2=1712493&view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Wed Nov  4 08:23:05 2015
@@ -46,7 +46,7 @@ test.cobertura=false
 
 # Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
 # multicast tests to work
-#java.net.preferIPv4Stack=true
+java.net.preferIPv4Stack=false
 
 # Location of Java7 JDK
 #java.7.home=/path/to/java7/jdk



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712495 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.jav

[violetagg]

Author: violetagg
Date: Wed Nov  4 08:24:39 2015
New Revision: 1712495

URL: http://svn.apache.org/viewvc?rev=1712495&view=rev
Log:
Merged revision 1712489 from tomcat/trunk:
Fixed UnsupportedOperationException when releasing an user-provided 
URLStreamHandlerFactory. Patch provided by Cristian Talau via github PR#23.

Added:

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
  - copied unchanged from r1712489, 
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 08:24:39 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,1649973,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,1655351,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,1657
 
609,1657682,1657907,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,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242

[GitHub] tomcat pull request: Fixed UnsupportedOperationException when rele...

[violetagg]

Github user violetagg commented on the pull request:

https://github.com/apache/tomcat/pull/23#issuecomment-153633527
  
Hi,
Thanks for the patch.
Fix is available in trunk and Tomcat 8 (for 8.0.29 onwards).
Regards,
Violeta


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712497 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Wed Nov  4 08:28:06 2015
New Revision: 1712497

URL: http://svn.apache.org/viewvc?rev=1712497&view=rev
Log:
Add forward port of SSL fixes

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=1712497&r1=1712496&r2=1712497&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Nov  4 08:28:06 
2015
@@ -39,6 +39,10 @@
 
   Fix broken debug and maintainer mode build. (rjung)
 
+
+  Forward port additional fixes to the OpenSSL I/O to align it with
+  non-OpenSSL I/O. (markt)
+
   
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] tomcat pull request: Fixed UnsupportedOperationException when rele...

[markt-asf]

Github user markt-asf closed the pull request at:

https://github.com/apache/tomcat/pull/23


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: websocket tomcat listener API?

[Mark Thomas]

On 04/11/2015 06:28, Romain Manni-Bucau wrote:
> Hi guys,

So you only want the views of the male committers?

> Would it be possible to add to tomcat codebase a way to register custom
> websocket lifecycle listeners for technical integration. For instance in
> TomEE we would need a clean way to listen for close() or timeout() without
> modifying the user code side if possible.

Why? What is the use case?

Also, there is no timeout() method but there is an error() method. There
is no clear way to differentiate between timeout and any other errors.

> wdyt?

Looking at trunk, it appears to be doable with some refactoring but
there would be a (probably small) performance impact. It depends on the
justification.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: websocket tomcat listener API?

[Rémy Maucherat]

2015-11-04 9:47 GMT+01:00 Mark Thomas :

> On 04/11/2015 06:28, Romain Manni-Bucau wrote:
> > Hi guys,
>
> So you only want the views of the male committers?
>
> > Would it be possible to add to tomcat codebase a way to register custom
> > websocket lifecycle listeners for technical integration. For instance in
> > TomEE we would need a clean way to listen for close() or timeout()
> without
> > modifying the user code side if possible.
>
> Why? What is the use case?
>
> Also, there is no timeout() method but there is an error() method. There
> is no clear way to differentiate between timeout and any other errors.
>
> > wdyt?
>
> Looking at trunk, it appears to be doable with some refactoring but
> there would be a (probably small) performance impact. It depends on the
> justification.
>
> Maybe it could be the usual integration thing, for example at the moment
the endpoint instances are not going through the InstanceManager. Not sure
if that would be enough for him. Obviously a listener system would be much
more annoying (configuration needed, etc ...).

Rémy

Re: Tomcat Native 1.2.2

[jean-frederic clere]

On 11/04/2015 02:00 AM, Mark Thomas wrote:
> I've just finished running the unit tests for APR on OSX with the
> current 1.2.x trunk and 9.0.x, 8.0.x and 7.0.x and all pass.
> 
> I plan to tag 1.2.2 tomorrow morning and will hopefully be able to start
> a new vote later in the day.

I am trying some small changes to allow to use the keystore with the
openssl engine, I need a few days more, do you want to wait or should we
add that later.

Cheers

Jean-Frederic

> 
> Mark
> 
> -
> 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

Re: Tomcat Native 1.2.2

[Huxing Zhang]

Hi All,

I have trouble running tcnative test under Mac OSX(EI Capitan).

I used the jdk8,  apr 1.5.2, openssl 1.0.2d(OpenSSL 1.0.2d 9 Jul 2015) to build 
the tcnative code in trunk.

I followed the instructions described in native/BUILDING:

Step by step build output is:
1) sh buildconf --with-apr=/Users/wangtao/work/apache-tomcat/apr/apr-1.5.2

Looking for apr source in /Users/wangtao/work/apache-tomcat/apr/apr-1.5.2
Creating configure ...
Generating 'make' outputs ...
rebuilding rpm spec file
Using version '1.2.2' and release '1' in RPM spec file

2) ./configure --with-apr=/usr/local/apr --with-ssl=/usr/local/openssl
checking build system type... x86_64-apple-darwin15.0.0
checking host system type... x86_64-apple-darwin15.0.0
checking target system type... x86_64-apple-darwin15.0.0
checking for a BSD-compatible install... /usr/bin/install -c
checking for working mkdir -p... yes
Tomcat Native Version: 1.2.2
checking for chosen layout... tcnative
checking for APR... yes
configure: APR 1.5.2 detected.
  setting CC to "gcc"
  setting CPP to "gcc -E"
  adding "-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include" to 
TCNATIVE_PRIV_INCLUDES
checking for JDK os include directory...  darwin
  adding "-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin" to 
TCNATIVE_PRIV_INCLUDES
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking for OpenSSL library... using openssl from /usr/local/openssl/lib and 
/usr/local/openssl/include
checking OpenSSL library version >= 1.0.2... ok
checking for OpenSSL DSA support... yes
  adding "-I/usr/local/openssl/include" to TCNATIVE_PRIV_INCLUDES
  setting TCNATIVE_LDFLAGS to "-L/usr/local/openssl/lib -lssl -lcrypto"
  adding "-DHAVE_OPENSSL" to CFLAGS
  setting TCNATIVE_LIBS to ""
  setting TCNATIVE_LIBS to " /usr/local/apr/lib/libapr-1.la -lpthread"
checking for apr_pollset_wakeup in -lapr-1... yes
  adding "-DHAVE_POLLSET_WAKEUP" to CFLAGS
configure: creating ./config.status
config.status: creating tcnative.pc
config.status: creating Makefile
config.status: executing default commands

3) make
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2   
-DHAVE_CONFIG_H  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -DDARWIN_10   -g -O2 
-DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP   
-I/Users/wangtao/work/apache-tomcat/tcnative/trunk/native/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin 
-I/usr/local/openssl/include  -I/usr/local/apr/include/apr-1   -o 
src/address.lo -c src/address.c && touch src/address.lo
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2   
-DHAVE_CONFIG_H  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -DDARWIN_10   -g -O2 
-DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP   
-I/Users/wangtao/work/apache-tomcat/tcnative/trunk/native/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin 
-I/usr/local/openssl/include  -I/usr/local/apr/include/apr-1   -o src/bb.lo -c 
src/bb.c && touch src/bb.lo
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2   
-DHAVE_CONFIG_H  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -DDARWIN_10   -g -O2 
-DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP   
-I/Users/wangtao/work/apache-tomcat/tcnative/trunk/native/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin 
-I/usr/local/openssl/include  -I/usr/local/apr/include/apr-1   -o src/dir.lo -c 
src/dir.c && touch src/dir.lo
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2   
-DHAVE_CONFIG_H  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -DDARWIN_10   -g -O2 
-DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP   
-I/Users/wangtao/work/apache-tomcat/tcnative/trunk/native/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin 
-I/usr/local/openssl/include  -I/usr/local/apr/include/apr-1   -o src/error.lo 
-c src/error.c && touch src/error.lo
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2   
-DHAVE_CONFIG_H  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -DDARWIN_10   -g -O2 
-DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP   
-I/Users/wangtao/work/apache-tomcat/tcnative/trunk/native/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin 
-I/usr/local/openssl/include  -I/usr/local/apr/include/apr-1   -o src/file.lo 
-c src/file.c && touch src/file.lo
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2  

Re: Tomcat Native 1.2.2

[Mark Thomas]

On 04/11/2015 09:32, jean-frederic clere wrote:
> On 11/04/2015 02:00 AM, Mark Thomas wrote:
>> I've just finished running the unit tests for APR on OSX with the
>> current 1.2.x trunk and 9.0.x, 8.0.x and 7.0.x and all pass.
>>
>> I plan to tag 1.2.2 tomorrow morning and will hopefully be able to start
>> a new vote later in the day.
> 
> I am trying some small changes to allow to use the keystore with the
> openssl engine, I need a few days more, do you want to wait or should we
> add that later.

I think we can add that later.

If you can get this working then I think we need to look very hard at a
Tomcat Native 2.0.0 that depends solely on OpenSSL (i.e. remove the APR
dependency).

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712528 - /tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java

[remm]

Author: remm
Date: Wed Nov  4 10:41:53 2015
New Revision: 1712528

URL: http://svn.apache.org/viewvc?rev=1712528&view=rev
Log:
Remove the programmatic login/logout override, as I don't see how JASPIC can 
interact with it.

Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java?rev=1712528&r1=1712527&r2=1712528&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
 Wed Nov  4 10:41:53 2015
@@ -29,7 +29,6 @@ import javax.security.auth.message.confi
 import javax.security.auth.message.config.AuthConfigProvider;
 import javax.security.auth.message.config.ServerAuthConfig;
 import javax.security.auth.message.config.ServerAuthContext;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.LifecycleException;
@@ -125,18 +124,6 @@ public class JaspicAuthenticator extends
 }
 
 
-@Override
-public void login(String userName, String password, Request request) 
throws ServletException {
-throw new IllegalStateException("not implemented yet!");
-}
-
-
-@Override
-public void logout(Request request) {
-throw new IllegalStateException("not implemented yet!");
-}
-
-
 private void handleUnauthorizedRequest(HttpServletResponse response, 
AuthException e)
 throws IOException {
 response.sendError(HttpServletResponse.SC_UNAUTHORIZED);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712529 - in /tomcat/tc8.0.x/trunk/java/org/apache: catalina/connector/ catalina/core/ coyote/ coyote/ajp/ coyote/http11/

[markt]

Author: markt
Date: Wed Nov  4 10:55:12 2015
New Revision: 1712529

URL: http://svn.apache.org/viewvc?rev=1712529&view=rev
Log:
Follow-up to r1712081.
Comet is not-blocking too, so it also needs to trigger a read on a call to 
available() if no bytes are in the buffer

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ActionCode.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java

tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1712529&r1=1712528&r2=1712529&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
Wed Nov  4 10:55:12 2015
@@ -519,15 +519,11 @@ public class CoyoteAdapter implements Ad
 
 if (request.isComet()) {
 if (!response.isClosed() && !response.isError()) {
+comet = true;
+res.action(ActionCode.COMET_BEGIN, null);
 if (request.getAvailable() || 
(request.getContentLength() > 0 && (!request.isParametersParsed( {
 // Invoke a read event right away if there are 
available bytes
-if (event(req, res, SocketStatus.OPEN_READ)) {
-comet = true;
-res.action(ActionCode.COMET_BEGIN, null);
-}
-} else {
-comet = true;
-res.action(ActionCode.COMET_BEGIN, null);
+event(req, res, SocketStatus.OPEN_READ);
 }
 } else {
 // Clear the filter chain, as otherwise it will not be 
reset elsewhere
@@ -535,8 +531,8 @@ public class CoyoteAdapter implements Ad
 request.setFilterChain(null);
 }
 }
-
 }
+
 AsyncContextImpl asyncConImpl = 
(AsyncContextImpl)request.getAsyncContext();
 if (asyncConImpl != null) {
 async = true;

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1712529&r1=1712528&r2=1712529&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java 
Wed Nov  4 10:55:12 2015
@@ -22,6 +22,7 @@ import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.servlet.ReadListener;
 
@@ -241,7 +242,14 @@ public class InputBuffer extends Reader
 available = cb.getLength();
 }
 if (available == 0) {
-coyoteRequest.action(ActionCode.AVAILABLE, 
Boolean.valueOf(coyoteRequest.getReadListener() != null));
+// Written this way to avoid use of IS_COMET action where possible
+boolean readForAvailable = coyoteRequest.getReadListener() != null;
+if (!readForAvailable) {
+AtomicBoolean isComet = new AtomicBoolean();
+coyoteRequest.action(ActionCode.IS_COMET, isComet);
+readForAvailable = isComet.get();
+}
+coyoteRequest.action(ActionCode.AVAILABLE, 
Boolean.valueOf(readForAvailable));
 available = (coyoteRequest.getAvailable() > 0) ? 1 : 0;
 }
 return available;

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1712529&r1=1712528&r2=1712529&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
Wed Nov  4 10:55:12 2015
@@ -181,9 +181,6 @@ final class StandardWrapperValve
 ApplicationFilterChain filterChain =
  

Re: svn commit: r1712529 - in /tomcat/tc8.0.x/trunk/java/org/apache: catalina/connector/ catalina/core/ coyote/ coyote/ajp/ coyote/http11/

[Rémy Maucherat]

2015-11-04 11:55 GMT+01:00 :

> Author: markt
> Date: Wed Nov  4 10:55:12 2015
> New Revision: 1712529
>
> URL: http://svn.apache.org/viewvc?rev=1712529&view=rev
> Log:
> Follow-up to r1712081.
> Comet is not-blocking too, so it also needs to trigger a read on a call to
> available() if no bytes are in the buffer
>
> Sorry I missed that interaction, which is no longer there in 9.

Rémy

Re: websocket tomcat listener API?

[Romain Manni-Bucau]

Here is the use case: we make these endpoints go through the javee instance
manager. Being a ee server we support @Inject and in some cases - sadly the
most common one - we need a cleanup hook once the endpoint is no more used.

Strictly at tomcat level think to postconstruct/predestroy support for
instance.

Side note: when i spoke about timeout i thought to WsTimeout. Main point is
to know when to release the instance.

Note also it would be awesome to have it for tomcat 8 :).

Le 4 nov. 2015 00:57, "Rémy Maucherat"  a écrit :
>
> 2015-11-04 9:47 GMT+01:00 Mark Thomas :
>
> > On 04/11/2015 06:28, Romain Manni-Bucau wrote:
> > > Hi guys,
> >
> > So you only want the views of the male committers?
> >
> > > Would it be possible to add to tomcat codebase a way to register
custom
> > > websocket lifecycle listeners for technical integration. For instance
in
> > > TomEE we would need a clean way to listen for close() or timeout()
> > without
> > > modifying the user code side if possible.
> >
> > Why? What is the use case?
> >
> > Also, there is no timeout() method but there is an error() method. There
> > is no clear way to differentiate between timeout and any other errors.
> >
> > > wdyt?
> >
> > Looking at trunk, it appears to be doable with some refactoring but
> > there would be a (probably small) performance impact. It depends on the
> > justification.
> >
> > Maybe it could be the usual integration thing, for example at the moment
> the endpoint instances are not going through the InstanceManager. Not sure
> if that would be enough for him. Obviously a listener system would be much
> more annoying (configuration needed, etc ...).
>
> Rémy

svn commit: r1712547 - /tomcat/trunk/build.properties.default

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 13:59:48 2015
New Revision: 1712547

URL: http://svn.apache.org/viewvc?rev=1712547&view=rev
Log:
Update to Checkstyle 6.12

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1712547&r1=1712546&r2=1712547&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Nov  4 13:59:48 2015
@@ -215,7 +215,7 @@ objenesis.loc=https://objenesis.googleco
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
 # - Checkstyle, version 6.0 or later -
-checkstyle.version=6.11.2
+checkstyle.version=6.12
 checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
 
checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: websocket tomcat listener API?

[Rémy Maucherat]

2015-11-04 14:55 GMT+01:00 Romain Manni-Bucau :

> Here is the use case: we make these endpoints go through the javee instance
> manager. Being a ee server we support @Inject and in some cases - sadly the
> most common one - we need a cleanup hook once the endpoint is no more used.
>
> Strictly at tomcat level think to postconstruct/predestroy support for
> instance.
>
> Side note: when i spoke about timeout i thought to WsTimeout. Main point is
> to know when to release the instance.
>
> Note also it would be awesome to have it for tomcat 8 :).
>

So if websockets was using the instance manager to get/destroy endpoint
instances (it does for Servlets / JSP tags / etc, but not that at the
moment) it would likely work for you, right ?

Rémy

svn commit: r1712548 - /tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 14:15:46 2015
New Revision: 1712548

URL: http://svn.apache.org/viewvc?rev=1712548&view=rev
Log:
Minor fixes to TomcatURLStreamHandlerFactory in review of r1712489
1) Add a comment why List.remove() is used by r1712489
2) Simplify the code by using a for loop
3) Add null check for instance. An instance is created lazily. It is unlikely 
that the instance has not been created, but it is better for this cleanup 
method to be safe.
4) Correct javadoc typo

Modified:

tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java?rev=1712548&r1=1712547&r2=1712548&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
 Wed Nov  4 14:15:46 2015
@@ -19,7 +19,6 @@ package org.apache.catalina.webresources
 import java.net.URL;
 import java.net.URLStreamHandler;
 import java.net.URLStreamHandlerFactory;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -100,13 +99,18 @@ public class TomcatURLStreamHandlerFacto
  * @param classLoader The class loader to release
  */
 public static void release(ClassLoader classLoader) {
-Iterator iter = 
instance.userFactories.iterator();
-while (iter.hasNext()) {
-URLStreamHandlerFactory candidate = iter.next();
-ClassLoader factoryLoader = candidate.getClass().getClassLoader();
+if (instance == null) {
+return;
+}
+List factories = instance.userFactories;
+for (URLStreamHandlerFactory factory : factories) {
+ClassLoader factoryLoader = factory.getClass().getClassLoader();
 while (factoryLoader != null) {
 if (classLoader.equals(factoryLoader)) {
-instance.userFactories.remove(candidate);
+// Implementation note: userFactories is a
+// CopyOnWriteArrayList, so items are removed with
+// List.remove() instead of usual Iterator.remove()
+factories.remove(factory);
 break;
 }
 factoryLoader = factoryLoader.getParent();
@@ -138,7 +142,7 @@ public class TomcatURLStreamHandlerFacto
  * applications to register their own handlers.
  *
  * @param factory The user provided factory to add to the factories Tomcat
- *has alredy registered
+ *has already registered
  */
 public void addUserFactory(URLStreamHandlerFactory factory) {
 userFactories.add(factory);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: websocket tomcat listener API?

[Romain Manni-Bucau]

Yes, and would avoid a custom configurator :).
Le 4 nov. 2015 06:09, "Rémy Maucherat"  a écrit :

> 2015-11-04 14:55 GMT+01:00 Romain Manni-Bucau :
>
> > Here is the use case: we make these endpoints go through the javee
> instance
> > manager. Being a ee server we support @Inject and in some cases - sadly
> the
> > most common one - we need a cleanup hook once the endpoint is no more
> used.
> >
> > Strictly at tomcat level think to postconstruct/predestroy support for
> > instance.
> >
> > Side note: when i spoke about timeout i thought to WsTimeout. Main point
> is
> > to know when to release the instance.
> >
> > Note also it would be awesome to have it for tomcat 8 :).
> >
>
> So if websockets was using the instance manager to get/destroy endpoint
> instances (it does for Servlets / JSP tags / etc, but not that at the
> moment) it would likely work for you, right ?
>
> Rémy
>

svn commit: r1712549 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 14:21:58 2015
New Revision: 1712549

URL: http://svn.apache.org/viewvc?rev=1712549&view=rev
Log:
Update to Checkstyle 6.12
Merged r1712547 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 14:21:58 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,1649973,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,1655351,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,1657
 
609,1657682,1657907,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,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1

svn commit: r1712552 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 14:33:31 2015
New Revision: 1712552

URL: http://svn.apache.org/viewvc?rev=1712552&view=rev
Log:
Minor fixes to TomcatURLStreamHandlerFactory in review of r1712489
1) Add a comment why List.remove() is used by r1712489
2) Simplify the code by using a for loop
3) Add null check for instance. An instance is created lazily. It is unlikely 
that the instance has not been created, but it is better for this cleanup 
method to be safe.
4) Correct javadoc typo
Merged r1712548 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 14:33: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,1649973,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,1655351,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,1657
 
609,1657682,1657907,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,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-168934

[Bug 58581] New: StandardHostValve#custom throws NPE if custom error page is incorrectly configured

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58581

Bug ID: 58581
   Summary: StandardHostValve#custom throws NPE if custom error
page is incorrectly configured
   Product: Tomcat 9
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: huxing.zh...@gmail.com

Created attachment 33255
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33255&action=edit
proposed fix to avoid NPE

Minimal files to reproduce this issue:
1) create a directory named test and deploy it under webapps
test
├── WEB-INF
│   └── web.xml
├── error.html
└── test.html

the web.xml is as follows:




default
/test.html



404
/error.html


2 ) start tomcat and visit http://localhost:8080/test/abc.html

The exception is thrown as follows:

04-Nov-2015 22:24:04.984 SEVERE [http-nio-8080-exec-1]
org.apache.catalina.core.StandardHostValve.custom Exception Processing 
ErrorPage[errorCode=404, location=/error.html]
 java.lang.NullPointerException
at
org.apache.catalina.core.StandardHostValve.custom(StandardHostValve.java:391)
at
org.apache.catalina.core.StandardHostValve.status(StandardHostValve.java:257)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:180)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79)
at
org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:616)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:87)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:361)
at
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:1057)
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:75)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:737)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1531)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)

The exception is not user-friendly, and somehow misleading. From the stack
trace, user is likely to consider it as a tomcat bug. 

The solution might be adding url-pattern /error.html to the default servlet, or
just change the url-pattern to match all the html resources.

My suggestion is to avoid such NPE and tell user what to do.

I have attached a proposed fix against trunk.

-- 
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: websocket tomcat listener API?

[Rémy Maucherat]

2015-11-04 15:16 GMT+01:00 Romain Manni-Bucau :

> Yes, and would avoid a custom configurator :).
>
> In way the difficulty is that the configurator takes over the instance
creation, but doesn't care about its destruction. If the default Tomcat
configurator took care of newInstance, the tracking would fail if the
configurator is replaced. Not very good. So the
InstanceManager.newInstance(Object o) should always be used instead IMO
after delegating instance creation to whatever configurator is present.
Maybe from WsSession (since it's in a good position to call destroyInstance
as well).

Rémy

[Bug 58582] New: org.apache.catalina.realm.CombinedRealm should implement backgroundProcess

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58582

Bug ID: 58582
   Summary: org.apache.catalina.realm.CombinedRealm should
implement backgroundProcess
   Product: Tomcat 8
   Version: trunk
  Hardware: All
OS: All
Status: NEW
  Severity: minor
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: apa...@leocap.com

org.apache.catalina.realm.CombinedRealm should implement backgroundProcess() by
calling this method on each of the Realms it manages e.g.

@Override
public void backgroundProcess()
{
for( Realm r: realms )
r.backgroundProcess();

// for Tomcat9 ;-)
// realms.forEach( r -> r.backgroundProcess() );
}

Without this, the backgroundProcess() of a Realm that is wrapped by
CombinedRealm or LockOutRealm (which extends CombinedRealm) is not called.


Aidan.

-- 
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: websocket tomcat listener API?

[Romain Manni-Bucau]

That is what I thought but extending WsSession in t8 is hard.
Le 4 nov. 2015 06:45, "Rémy Maucherat"  a écrit :

> 2015-11-04 15:16 GMT+01:00 Romain Manni-Bucau :
>
> > Yes, and would avoid a custom configurator :).
> >
> > In way the difficulty is that the configurator takes over the instance
> creation, but doesn't care about its destruction. If the default Tomcat
> configurator took care of newInstance, the tracking would fail if the
> configurator is replaced. Not very good. So the
> InstanceManager.newInstance(Object o) should always be used instead IMO
> after delegating instance creation to whatever configurator is present.
> Maybe from WsSession (since it's in a good position to call destroyInstance
> as well).
>
> Rémy
>

[Bug 58582] org.apache.catalina.realm.CombinedRealm should implement backgroundProcess

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58582

Aidan  changed:

   What|Removed |Added

 CC||apa...@leocap.com

-- 
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: r1712571 - in /tomcat/tc6.0.x/trunk: STATUS.txt extras.xml webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 15:55:02 2015
New Revision: 1712571

URL: http://svn.apache.org/viewvc?rev=1712571&view=rev
Log:
Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar.
Reported by Benjamin Gandon on the dev list
Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui

It it true that 6.0.44/extras/tomcat-juli-adapters.jar did not include 
LogFactoryImpl.class,
but it erroneously included its inner classes - LogFactoryImpl$1, *$2, *$3.

I am aligning  patterns with Tomcat 7. (Actually Tomcat 7 ones are 
used both for .jar and -src.jar, thus they end with * instead of explicit 
*.class)

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712571&r1=1712570&r2=1712571&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov  4 15:55:02 2015
@@ -28,14 +28,7 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar.
-  Reported by Benjamin Gandon on the dev list
-  Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui
-  https://svn.apache.org/r1707054
-  - to be applied to extras.xml line 220
-  +1: kkolinko, markt
-  -1:
-
+None. Tomcat 6 is Commit-Than-Review since 2015-11-02.
   
 PATCHES/ISSUES THAT ARE STALLED:
 

Modified: tomcat/tc6.0.x/trunk/extras.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1712571&r1=1712570&r2=1712571&view=diff
==
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Nov  4 15:55:02 2015
@@ -215,9 +215,9 @@
 
   
-
-
-
+
+
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1712571&r1=1712570&r2=1712571&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov  4 15:55:02 2015
@@ -112,6 +112,15 @@
   
 
   
+  
+
+  
+Ensure JULI adapters JAR in Tomcat extras package does not include
+the LogFactoryImpl[$*] classes. Based on patch provided by
+Benjamin Gandon. (kkolinko)
+  
+
+  
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Minor issue in jar packaging of tomcat-juli-adapters, in extras

[Konstantin Kolinko]

2015-10-06 16:43 GMT+03:00 Mark Thomas :
> On 06/10/2015 14:14, Benjamin Gandon wrote:
>> Hi there,
>>
>> Working on my JULI-to-SLF4J bridge library (see 
>> ),
>> I have identified a small and invisible issue in the jar packaging of 
>> tomcat-juli-adapters in the extras.
>>
>> Indeed, the LogFactoryImpl is shipped with the adapters, but it is not 
>> supposed to.
>> 1. Because it is already shipped with the tomcat-juli jar.
>> 2. Because the ${files.tomcat-extras-juli-adapters} in build.xml specifies 
>> an exclusion on it.
>>
>> But the exclusion is ineffective because it lacks a star at the end.
>>
>> The issue is invisible because of class loading delegation. Children class 
>> loaders accessing the adapters favor delegation to the System loader.
>> So the LogFactoryImpl from tomcat-juli (System classpath) always masks the 
>> one erroneously shipped with tomcat-juli-adapters (Catalina classpath).
>>
>
>> Do you need a BZ issue for this?
>
> No need. If a patch isn't picked up fairly quickly (say within 24 hours)
> I'd recommend using a pull request or opening a Bugzilla issue since
> both those mechanisms reduce the chances of an issue being forgotten about.
>
>> Or could someone just commit the fix for me please? I include the diff below.
>
> Done. For trunk, 8.0.x and 7.0.x.
>

Fixed for Tomcat 6 as well (r1712571)

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712575 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsSession.java WsWebSocketContainer.java server/WsServerContainer.java

[remm]

Author: remm
Date: Wed Nov  4 16:09:17 2015
New Revision: 1712575

URL: http://svn.apache.org/viewvc?rev=1712575&view=rev
Log:
Use InstanceManager for server endpoint instances. For client instances, it 
sounds more complex if it is required since it is static stuff independent of 
the Servlet container.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1712575&r1=1712574&r2=1712575&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Wed 
Nov  4 16:09:17 2015
@@ -99,6 +99,8 @@ wsSession.sendCloseFail=Failed to send c
 wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not 
registered with this session
 wsSession.unknownHandler=Unable to add the message handler [{0}] as it was for 
the unrecognised type [{1}]
 wsSession.unknownHandlerType=Unable to add the message handler [{0}] as it was 
wrapped as the unrecognised type [{1}]
+wsSession.instanceNew=Endpoint instance registration failed
+wsSession.instanceDestroy=Endpoint instance unregistration failed
 
 # Note the following message is used as a close reason in a WebSocket control
 # frame and therefore must be 123 bytes (not characters) or less in length.

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1712575&r1=1712574&r2=1712575&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Wed Nov  4 
16:09:17 2015
@@ -47,6 +47,7 @@ import javax.websocket.WebSocketContaine
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -179,6 +180,15 @@ public class WsSession implements Sessio
 this.userProperties.putAll(endpointConfig.getUserProperties());
 this.id = Long.toHexString(ids.getAndIncrement());
 
+InstanceManager instanceManager = 
webSocketContainer.getInstanceManager();
+if (instanceManager != null) {
+try {
+instanceManager.newInstance(localEndpoint);
+} catch (Exception e) {
+throw new 
DeploymentException(sm.getString("wsSession.instanceNew"), e);
+}
+}
+
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("wsSession.created", id));
 }
@@ -519,11 +529,15 @@ public class WsSession implements Sessio
 private void fireEndpointOnClose(CloseReason closeReason) {
 
 // Fire the onClose event
+InstanceManager instanceManager = 
webSocketContainer.getInstanceManager();
 Thread t = Thread.currentThread();
 ClassLoader cl = t.getContextClassLoader();
 t.setContextClassLoader(applicationClassLoader);
 try {
 localEndpoint.onClose(this, closeReason);
+if (instanceManager != null) {
+instanceManager.destroyInstance(localEndpoint);
+}
 } catch (Throwable throwable) {
 ExceptionUtils.handleThrowable(throwable);
 localEndpoint.onError(this, throwable);

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1712575&r1=1712574&r2=1712575&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Wed 
Nov  4 16:09:17 2015
@@ -64,6 +64,7 @@ import javax.websocket.WebSocketContaine
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.apache.tomcat.util.res.StringManager;
@@ -96,6 +97,15 @@ public class WsWebSocketContainer implem
 private int backgroundProcessCount = 0;
 private int processPeriod = Constants.DEFAULT_PROCESS_PERIOD;
 
+private Inst

svn commit: r1712582 - in /tomcat/tc6.0.x/branches/tomcat6-testing: BRANCH-README.txt BRANCH-diff.diff

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 16:17:09 2015
New Revision: 1712582

URL: http://svn.apache.org/viewvc?rev=1712582&view=rev
Log:
For historical reference, diff file between the branch and 6.0.x/trunk @1444299.

r1444299 was the last catch-up merge and the last commit to this branch.

svn diff "^/tomcat/tc6.0.x/trunk@1444299" 
"^/tomcat/tc6.0.x/branches/tomcat6-testing@1444299" >BRANCH-diff.diff

Added:
tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-diff.diff
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt

Modified: tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt?rev=1712582&r1=1712581&r2=1712582&view=diff
==
--- tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt Wed Nov  4 
16:17:09 2015
@@ -9,6 +9,9 @@ Last catch-up merge: 2013-02-09, merged
 Revisions in 6.0.x/trunk that are merges from this branch:
 r1417826,1444292
 
+Diff file after the last catch-up merge:
+svn diff "^/tomcat/tc6.0.x/trunk@1444299" 
"^/tomcat/tc6.0.x/branches/tomcat6-testing@1444299" >BRANCH-diff.diff
+
 
 TODO:
 

Added: tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-diff.diff
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-diff.diff?rev=1712582&view=auto
==
--- tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-diff.diff (added)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-diff.diff Wed Nov  4 
16:17:09 2015
@@ -0,0 +1,537 @@
+Index: build.xml
+===
+--- build.xml  (.../trunk) (revision 1444299)
 build.xml  (.../branches/tomcat6-testing)  (revision 1444299)
+@@ -58,8 +58,9 @@
+   
+   
+   
+-  
+-  
++  
++  
++  
+ 
+   
+   
+@@ -93,12 +94,28 @@
+   
+   
+ 
++  
++  
++  
++
+   
+-  
++  
+ 
+ 
+   
+ 
++  
++
++  
++
++  
++
++
++
++
++
++  
++
+   
+   
+ 
+@@ -135,7 +152,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+  -->
+-  
++  
+   
+ 
+ 
+@@ -653,6 +670,116 @@
+ 
+   
+ 
++  
++
++  
++
++
++  
++  
++  
++
++
++  
++
++  
++
++
++
++  
++  
++  
++
++  
++
++  
++  
++  
++  
++
++  
++
++
++  
++  
++  
++
++  
++  
++  
++
++  
++  
++  
++
++  
++  
++  
++
++  
++
++  
++
++
++
++
++  
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++  
++
++
++
++
++
++
++  
++
++  
++
++  
++
++  
++
+   
+  
+@@ -662,8 +789,12 @@
+ 
+ 
+ 
++
++
+   
+ 
++  
++
+   
+   
+ 
+Index: BRANCH-README.txt
+===
+--- BRANCH-README.txt  (.../trunk) (revision 0)
 BRANCH-README.txt  (.../branches/tomcat6-testing)  (revision 1444299)
+@@ -0,0 +1,47 @@
++This branch is created with the goal to improve JUnit tests in Tomcat 6.
++
++It is maintained as a reintegrate-able branch with regular catch-up
++merges from tc6.0.x/trunk.
++
++Created: 2012-11-12 from r1408230
++Last catch-up merge: 2013-02-09, merged up to r1444297
++
++Revisions in 6.0.x/trunk that are merges from this branch:
++r1417826,1444292
++
++
++TODO:
++
++ * Backport support for running JUnit tests to the main /build.xml
++   file from Tomcat 7. Add .[Done]
++
++   Notes:
++ - The < if="${execute.test.bio}"> construct requires Ant >= 1.8.0
++   http://ant.apache.org/manual/properties.html#if+unless
++
++ - Separate "test-bio", "test-nio", "test-apr" targets are there,
++   but they do not make much sense as the tests do not start Tomcat.
++
++ - "test.jvmarg.egd=-Djava.security.egd=file:/dev/./urandom"
++   property was not ported, as it is not needed for Tomcat 6.
++
++ * Drop useless test/build.xml  [Not 
Started]
++
++ * Review existing tests, align with Tomcat 7, convert to JUnit 4.  [Not 
Started]
++
++ * Update BUILDING.txt. [Not 
Started]
++
++ * The results at this point can be proposed to be merged back to
++   tc6.0.x/trunk.
++
++ * Maybe it will be possible to backport the tests that start a Tomcat
++   server instance, using an idea from [1]. [Not 
Started]
++
++   [1]  http://tomcat.markmail.org/thread/ko7ip7obvyaftwe4
++
++ * Configure Apache Gump to run the tests.  [Not 
Started]
++
++
++(Regarding BRANCH-README files - see Apache Subversion Community Guide
++ http://subversion.apache.org/docs/community

svn commit: r1712583 - /tomcat/trunk/res/checkstyle/org-import-control.xml

[remm]

Author: remm
Date: Wed Nov  4 16:18:40 2015
New Revision: 1712583

URL: http://svn.apache.org/viewvc?rev=1712583&view=rev
Log:
Import checkstyle for websockets.

Modified:
tomcat/trunk/res/checkstyle/org-import-control.xml

Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1712583&r1=1712582&r2=1712583&view=diff
==
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Wed Nov  4 16:18:40 2015
@@ -160,6 +160,7 @@
 
   
   
+  
   
   
   



-
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

[Bill Barker]

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
 -WARNING- No directory 
[/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: 38 mins 49 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.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151104-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151104/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151104.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151104-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-20151104/bin/openssl
 -Dexecute.test.bio=false -Dexecute.test.apr=true 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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.

Re: svn commit: r1712457 - in /tomcat/native/trunk/native/src: ssl.c sslnetwork.c sslutils.c

[Konstantin Kolinko]

2015-11-04 5:25 GMT+03:00  :
> Author: billbarker
> Date: Wed Nov  4 02:25:05 2015
> New Revision: 1712457
>
> URL: http://svn.apache.org/viewvc?rev=1712457&view=rev
> Log:
> Forward port r1712199 align with OpenSSL master. Just deleted the SSLeay 
> check since any OS I know will raise an UnsatifiedLinkError if you try to 
> load this with such an old version when 1.0.2x is required. Otherwise no 
> change if compiling against 1.0.2x
>
> Modified:
> tomcat/native/trunk/native/src/ssl.c
> tomcat/native/trunk/native/src/sslnetwork.c
> tomcat/native/trunk/native/src/sslutils.c
>

> Modified: tomcat/native/trunk/native/src/sslnetwork.c
> URL: 
> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1712457&r1=1712456&r2=1712457&view=diff
> ==
> --- tomcat/native/trunk/native/src/sslnetwork.c (original)
> +++ tomcat/native/trunk/native/src/sslnetwork.c Wed Nov  4 02:25:05 2015
> @@ -650,6 +650,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
>  #endif
>  return APR_EGENERAL;
>  }
> +#if OPENSSL_VERSION_NUMBER < 0x1010L
>  SSL_set_state(con->ssl, SSL_ST_ACCEPT);
>
>  apr_socket_timeout_get(con->sock, &timeout);
> @@ -669,14 +670,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
>  break;
>  }
>  con->reneg_state = RENEG_REJECT;
> -#if OPENSSL_VERSION_NUMBER < 0x1010L
> +
>  if (SSL_get_state(con->ssl) != SSL_ST_OK) {
> -#else
> -if (SSL_get_state(con->ssl) != TLS_ST_OK) {
> -#endif
>  return APR_EGENERAL;
>  }
> -
> +#endif
>  return APR_SUCCESS;
>  }


Regarding the above change in SSLSocket.renegotiate()
TCN_IMPLEMENT_CALL(jint, SSLSocket, renegotiate)(TCN_STDARGS,
 jlong sock)

As a comment there says,

/* Sequence to renegotiate is
 *  SSL_renegotiate()
 *  SSL_do_handshake()
 *  ssl->state = SSL_ST_ACCEPT
 *  SSL_do_handshake()
 */

The change is that the second handshake attempt (starting with
ssl->state) is removed on OpenSSL 1.1+.

Can it be removed completely -- on the old library as well?  I think
that the first SSL_do_handshake() shall be enough.

Actually we do not have tests for renegotiation, as
org.apache.tomcat.util.net.TesterSupport does

protected static boolean isRenegotiationSupported(Tomcat tomcat) {
String protocol = tomcat.getConnector().getProtocolHandlerClassName();
if (protocol.contains("Apr")) {
// Disabled by default in 1.1.20 windows binary (2010-07-27)
return false;
}
if (protocol.contains("NioProtocol") ||
(protocol.contains("Nio2Protocol") && isMacOs())) {
// Doesn't work on all platforms - see BZ 56448.
return false;
}

return true;
}


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: websocket tomcat listener API?

[Rémy Maucherat]

2015-11-04 15:59 GMT+01:00 Romain Manni-Bucau :

> That is what I thought but extending WsSession in t8 is hard.
>
> Probably.

So I'll see about porting it to Tomcat 8 if feedback is ok.

However, I have two new problems:
- I noticed during testing that the upgrade handler instance is created
through the instance manager, but never destroyed
- the websockets client endpoint instances won't go through the instance
manager
For both of these situations, it would likely have to work through a static
CL map, like naming does.

Rémy

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/558

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1712583
Blamelist: remm

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: websocket tomcat listener API?

[Romain Manni-Bucau]

2015-11-04 8:43 GMT-08:00 Rémy Maucherat :

> 2015-11-04 15:59 GMT+01:00 Romain Manni-Bucau :
>
> > That is what I thought but extending WsSession in t8 is hard.
> >
> > Probably.
>
> So I'll see about porting it to Tomcat 8 if feedback is ok.
>
> However, I have two new problems:
> - I noticed during testing that the upgrade handler instance is created
> through the instance manager, but never destroyed
>

there is not only fireClose case I think, if the client disconnect brutally
you skip this part I think, isn't it?


> - the websockets client endpoint instances won't go through the instance
> manager
>

this is fine IMO as a first big step, client endpoints are easier to
integrate in client code since you - the user - handle the connection.


> For both of these situations, it would likely have to work through a static
> CL map, like naming does.
>
> Rémy
>

svn commit: r1712588 - /tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java

[remm]

Author: remm
Date: Wed Nov  4 16:50:36 2015
New Revision: 1712588

URL: http://svn.apache.org/viewvc?rev=1712588&view=rev
Log:
Websockets now need this method.

Modified:
tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java

Modified: 
tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java?rev=1712588&r1=1712587&r2=1712588&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java Wed 
Nov  4 16:50:36 2015
@@ -171,7 +171,8 @@ public class TesterServletContext implem
 
 @Override
 public Object getAttribute(String name) {
-throw new RuntimeException("Not implemented");
+// Used by websockets
+return null;
 }
 
 @Override



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: websocket tomcat listener API?

[Rémy Maucherat]

2015-11-04 17:46 GMT+01:00 Romain Manni-Bucau :

> there is not only fireClose case I think, if the client disconnect brutally
> you skip this part I think, isn't it?
>

It is always called, but the websockets code isn't very rich on finally, so
if something really unexpected occurs during the close process, it won't
get called in some cases. It would need a finally on every line, so ...

Rémy

Re: websocket tomcat listener API?

[Romain Manni-Bucau]

I see, will it be "fixed" or should it be worked-around with a
BackgroundProcess - that is what we use ATM in TomEE SNAPSHOT code?


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Github  |
LinkedIn  | Tomitriber


2015-11-04 8:57 GMT-08:00 Rémy Maucherat :

> 2015-11-04 17:46 GMT+01:00 Romain Manni-Bucau :
>
> > there is not only fireClose case I think, if the client disconnect
> brutally
> > you skip this part I think, isn't it?
> >
>
> It is always called, but the websockets code isn't very rich on finally, so
> if something really unexpected occurs during the close process, it won't
> get called in some cases. It would need a finally on every line, so ...
>
> Rémy
>

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/559

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1712588
Blamelist: remm

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712593 - /tomcat/native/trunk/native/src/sslcontext.c

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 17:14:58 2015
New Revision: 1712593

URL: http://svn.apache.org/viewvc?rev=1712593&view=rev
Log:
Explicitly cleanup jstring reference in callback method 
ssl_callback_ServerNameIndication().

I think it is better to cleanup it explicitly, as it is a callback method,
although stacktraces in BZ 58566 indicate that invocation chain starts with a 
java method, org.apache.tomcat.jni.SSLSocket.handshake().

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=1712593&r1=1712592&r2=1712593&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Nov  4 17:14:58 2015
@@ -119,10 +119,14 @@ int ssl_callback_ServerNameIndication(SS
original_ssl_context,
hostname);
 
+// Delete the local reference as this method is called via callback.
+// Otherwise local references are only freed once jni method returns.
+(*env)->DeleteLocalRef(env, hostname);
+
 if (new_ssl_context != 0 && new_ssl_context != original_ssl_context) {
 new_c = J2P(new_ssl_context, tcn_ssl_ctxt_t *);
 SSL_set_SSL_CTX(ssl, new_c->ctx);
-   }
+}
 
 return SSL_TLSEXT_ERR_OK;
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712594 - /tomcat/trunk/conf/server.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 17:23:18 2015
New Revision: 1712594

URL: http://svn.apache.org/viewvc?rev=1712594&view=rev
Log:
Correct a typo in a comment in default server.xml

Modified:
tomcat/trunk/conf/server.xml

Modified: tomcat/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=1712594&r1=1712593&r2=1712594&view=diff
==
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Wed Nov  4 17:23:18 2015
@@ -92,7 +92,7 @@
 
 

Re: websocket tomcat listener API?

[Rémy Maucherat]

2015-11-04 17:58 GMT+01:00 Romain Manni-Bucau :

> I see, will it be "fixed" or should it be worked-around with a
> BackgroundProcess - that is what we use ATM in TomEE SNAPSHOT code?
>
> I'd say it's not going to be improved further for now.

Rémy

[Bug 58585] New: Tomcat 9.0.0-dev (@r1712593) AccessControlException on first access via HTTPS

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58585

Bug ID: 58585
   Summary: Tomcat 9.0.0-dev (@r1712593) AccessControlException on
first access via HTTPS
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

Encountered while testing Tomcat-Native 1.2.1 release candidate with current
Tomcat 9 trunk (at revision 1712593)

For some reason this issue does not happen with http://localhost:8080/, but it
does happen with https://localhost:8443/

I am on Windows 7 using Java 8u66 32-bit

Steps to reproduce:
1. Copy tcnative-1.dll into ${catalina.home}/bin
2. Copy the following files from source directory
test\org\apache\tomcat\util\net\  into ${catalina.home}/conf:

localhost-cert.pem
localhost-key.pem

3. In conf/server.xml configure the following connector








(It is the same as commented example, but certificateKeyFile and
certificateFile are updated to match file names, s/-rsa-/-/ )

4. Set JAVA_HOME and start Tomcat with SecurityManager enabled.
cd bin
catalina.bat start -security

5. Access https://localhost:8443/
I am using Firefox 41.0.2

The page fails with error 500 during execution of JSP page.

 java.security.AccessControlException: access denied
("java.lang.RuntimePermission"
"accessClassInPackage.org.apache.tomcat.util.buf")
at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:472)
at
java.security.AccessController.checkPermission(AccessController.java:884)
at java.lang.SecurityManager.checkPermission(SecurityManager.java:549)
at java.lang.SecurityManager.checkPackageAccess(SecurityManager.java:1564)
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:311)
at java.lang.ClassLoader.loadClass(ClassLoader.java:411)
at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
at
org.apache.catalina.connector.OutputBuffer.setConverter(OutputBuffer.java:561)
at
org.apache.catalina.connector.OutputBuffer.checkConverter(OutputBuffer.java:546)
at org.apache.catalina.connector.Response.getWriter(Response.java:598)
at
org.apache.catalina.connector.ResponseFacade.getWriter(ResponseFacade.java:211)
at org.apache.jasper.runtime.JspWriterImpl.initOut(JspWriterImpl.java:115)
at
org.apache.jasper.runtime.JspWriterImpl.flushBuffer(JspWriterImpl.java:108)
at org.apache.jasper.runtime.JspWriterImpl.write(JspWriterImpl.java:326)
at java.io.Writer.write(Writer.java:157)
at org.apache.jsp.index_jsp._jspService(index_jsp.java:322)
at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:729)
at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:438)
at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:385)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:329)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:729)


If I refresh the page, it shows up successfully.

If I restart Tomcat, the first access to https://localhost:8443/ fails as well,
so JSP compilation does not affect it.

If the first access is via https://localhost:8080/, it shows up successfully.

-- 
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 58585] Tomcat 9.0.0-dev (@r1712593) AccessControlException on first access via HTTPS

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58585

Konstantin Kolinko  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Konstantin Kolinko  ---
Further testing, with HTTP,

The following page (A Servlet 4.0 push example) fails as well
http://localhost:8080/examples/servlets/serverpush/simpleimage

 java.security.AccessControlException: access denied
("java.lang.RuntimePermission" "accessClassInPackage.org.apache.catalina.core")
at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:472)
at
java.security.AccessController.checkPermission(AccessController.java:884)
at java.lang.SecurityManager.checkPermission(SecurityManager.java:549)
at java.lang.SecurityManager.checkPackageAccess(SecurityManager.java:1564)
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:311)
at java.lang.ClassLoader.loadClass(ClassLoader.java:411)
at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
at org.apache.catalina.connector.Request.getPushBuilder(Request.java:1832)
at
org.apache.catalina.connector.RequestFacade.getPushBuilder(RequestFacade.java:1125)
at http2.SimpleImagePush.doGet(SimpleImagePush.java:36)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:622)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:729)

-- 
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 58585] Tomcat 9.0.0-dev (@r1712593) AccessControlException on first access via HTTPS

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58585

--- Comment #2 from Konstantin Kolinko  ---
Created attachment 33257
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33257&action=edit
localhost.2015-11-04.log with full stacktrace for Comment 0

-- 
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 58585] Tomcat 9.0.0-dev (@r1712593) AccessControlException on first access via HTTPS

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58585

--- Comment #3 from Konstantin Kolinko  ---
Created attachment 33258
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33258&action=edit
localhost.2015-11-04.log with full stacktrace for Comment 1

For issue in Comment 1 refreshing the page does not help, access is still
denied.

-- 
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: r1712609 - /tomcat/native/trunk/java/org/apache/tomcat/

[markt]

Author: markt
Date: Wed Nov  4 18:29:48 2015
New Revision: 1712609

URL: http://svn.apache.org/viewvc?rev=1712609&view=rev
Log:
Update external

Modified:
tomcat/native/trunk/java/org/apache/tomcat/   (props changed)

Propchange: tomcat/native/trunk/java/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Wed Nov  4 18:29:48 2015
@@ -1 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/jni@1712012 jni
+^/tomcat/trunk/java/org/apache/tomcat/jni@1712041 jni



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712610 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_2: ./ build.properties.default native/include/tcn_version.h

[markt]

Author: markt
Date: Wed Nov  4 18:52:00 2015
New Revision: 1712610

URL: http://svn.apache.org/viewvc?rev=1712610&view=rev
Log:
Tag 1.2.2

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_2/
  - copied from r1712609, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_2/build.properties.default
tomcat/native/tags/TOMCAT_NATIVE_1_2_2/native/include/tcn_version.h

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_2/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_2/build.properties.default?rev=1712610&r1=1712609&r2=1712610&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_2/build.properties.default (original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_2/build.properties.default Wed Nov  4 
18:52:00 2015
@@ -20,7 +20,7 @@ version.major=1
 version.minor=2
 version.build=2
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_2/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_2/native/include/tcn_version.h?rev=1712610&r1=1712609&r2=1712610&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_2/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_2/native/include/tcn_version.h Wed Nov 
 4 18:52:00 2015
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r11028 - /dev/tomcat/tomcat-connectors/native/1.2.1/

[markt]

Author: markt
Date: Wed Nov  4 19:05:29 2015
New Revision: 11028

Log:
Drop 1.2.1

Removed:
dev/tomcat/tomcat-connectors/native/1.2.1/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r11029 - in /dev/tomcat/tomcat-connectors/native/1.2.2: ./ binaries/ source/

[markt]

Author: markt
Date: Wed Nov  4 19:07:27 2015
New Revision: 11029

Log:
Upload 1.2.2 source ready for voting

Added:
dev/tomcat/tomcat-connectors/native/1.2.2/
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/
dev/tomcat/tomcat-connectors/native/1.2.2/source/

dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz 
  (with props)

dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.asc
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.md5

dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.sha1

dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.asc
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.sha1

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz
--
svn:mime-type = application/x-gzip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.asc
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.md5
 Wed Nov  4 19:07:27 2015
@@ -0,0 +1 @@
+b942be2f6216142dd0dc42d69c54d148 *tomcat-native-1.2.2-src.tar.gz
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.sha1
 Wed Nov  4 19:07:27 2015
@@ -0,0 +1 @@
+e0956db3712592dfbbfeb4740dd0145ec84acb5a *tomcat-native-1.2.2-src.tar.gz
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip
--
svn:mime-type = application/zip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.md5
 Wed Nov  4 19:07:27 2015
@@ -0,0 +1 @@
+4f413415d8352e1c6bd8d8a7e543109a *tomcat-native-1.2.2-win32-src.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.sha1
 Wed Nov  4 19:07:27 2015
@@ -0,0 +1 @@
+61ba4c2244e118538c8973078ad437bf41fd8127 *tomcat-native-1.2.2-win32-src.zip
\ No newline at end of file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat Native 1.2.2

[Christopher Schultz]

Mark,

On 11/4/15 4:39 AM, Mark Thomas wrote:
> On 04/11/2015 09:32, jean-frederic clere wrote:
>> On 11/04/2015 02:00 AM, Mark Thomas wrote:
>>> I've just finished running the unit tests for APR on OSX with the
>>> current 1.2.x trunk and 9.0.x, 8.0.x and 7.0.x and all pass.
>>>
>>> I plan to tag 1.2.2 tomorrow morning and will hopefully be able to start
>>> a new vote later in the day.
>>
>> I am trying some small changes to allow to use the keystore with the
>> openssl engine, I need a few days more, do you want to wait or should we
>> add that later.
> 
> I think we can add that later.
> 
> If you can get this working then I think we need to look very hard at a
> Tomcat Native 2.0.0 that depends solely on OpenSSL (i.e. remove the APR
> dependency).

At some point, tcnative won't have to exist at all. There have been some
efforts to provide an OpenSSL-based JSSE provider, at which point little
needs to be done to use OpenSSL under the hood, and I think the APR
connector can be discarded.

JSSE w/OpenSSL + NIO(2) seems like it would be a great combination, and
it would remove a *lot* of code in Tomcat.

-chris

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712617 - /tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java

[schultz]

Author: schultz
Date: Wed Nov  4 19:31:17 2015
New Revision: 1712617

URL: http://svn.apache.org/viewvc?rev=1712617&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58582
Perform background-processing on sub-realms.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=1712617&r1=1712616&r2=1712617&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Wed Nov  4 
19:31:17 2015
@@ -292,6 +292,17 @@ public class CombinedRealm extends Realm
 super.destroyInternal();
 }
 
+/**
+ * Delegate the backgroundProcess call to all sub-realms.
+ */
+@Override
+public void backgroundProcess()
+{
+super.backgroundProcess();
+
+for( Realm r: realms )
+r.backgroundProcess();
+}
 
 /**
  * Return the Principal associated with the specified chain of X509



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712618 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/realm/CombinedRealm.java webapps/docs/changelog.xml

[schultz]

Author: schultz
Date: Wed Nov  4 19:35:47 2015
New Revision: 1712618

URL: http://svn.apache.org/viewvc?rev=1712618&view=rev
Log:
Back-port r1712617 to fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58582
Perform background-processing on sub-realms.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 19:35:47 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,1649973,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,1655351,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,1657
 
609,1657682,1657907,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,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,16

[Bug 58582] org.apache.catalina.realm.CombinedRealm should implement backgroundProcess

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58582

Christopher Schultz  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Christopher Schultz  ---
Thanks for the patch, which I modified slightly. Please let me know if you'd
prefer a name other than "Aidan" for your patch credit in the changelog.

Fixed in trunk in r1712617. Will be in Tomcat 9.0.0.
Back-ported to Tomcat 8 branch in r1712618. Will be in Tomcat 8.0.29.

-- 
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: r11030 - /dev/tomcat/tomcat-connectors/native/1.2.2/binaries/

[markt]

Author: markt
Date: Wed Nov  4 20:12:53 2015
New Revision: 11030

Log:
Upload Windows binaries for voting

Added:

dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.asc
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.sha1

dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.asc
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.sha1

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip
--
svn:mime-type = application/java-archive

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.md5
 Wed Nov  4 20:12:53 2015
@@ -0,0 +1 @@
+0306ac904b21b5b1b7dcdc4bb9d14189 *tomcat-native-1.2.2-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-ocsp-win32-bin.zip.sha1
 Wed Nov  4 20:12:53 2015
@@ -0,0 +1 @@
+c8a97acbcda22fca0cf67a550bd061b9c2da6be4 
*tomcat-native-1.2.2-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip
--
svn:mime-type = application/java-archive

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.md5
 Wed Nov  4 20:12:53 2015
@@ -0,0 +1 @@
+b1de305c5c577f61d205a12b5a24ffe3 *tomcat-native-1.2.2-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-conn

[VOTE] Release Apache Tomcat Native 1.2.2

[Mark Thomas]

OK. Here we go again :)

Thanks to everyone who has helped test 1.2.x so far. I'm hopeful that
this one will be good enough for the 9.0.0 RCs and - fingers crossed -
to replace 1.1.x as well.

Version 1.2.2 includes the following changes:
- Forward port some OpenSSL I/O changes from 1.1.x that fixed a
  number of unit tests failures

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.2 is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...

Thanks,

Mark


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.2/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_2

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712645 - /tomcat/trunk/BUILDING.txt

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 20:55:22 2015
New Revision: 1712645

URL: http://svn.apache.org/viewvc?rev=1712645&view=rev
Log:
Document java.net.preferIPv4Stack option, in followup to r1712491, r1712361, 
r1360433

Modified:
tomcat/trunk/BUILDING.txt

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1712645&r1=1712644&r2=1712645&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Wed Nov  4 20:55:22 2015
@@ -414,6 +414,11 @@ For example:
 
 test.relaxTiming=true
 
+ 8. It is known that some platforms (e.g. OSX El Capitan) require IPv4 to
+be the default for the multicast tests to work. This is configured by
+the following property:
+
+java.net.preferIPv4Stack=true
 
 (8) Source code checks
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712649 - in /tomcat/tc8.0.x/trunk: ./ BUILDING.txt

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 21:03:43 2015
New Revision: 1712649

URL: http://svn.apache.org/viewvc?rev=1712649&view=rev
Log:
Document java.net.preferIPv4Stack option, in followup to r1712492, r1712448, 
r1360433
Merged r1712645 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/BUILDING.txt

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 21:03:43 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,1649973,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,1655351,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,1657
 
609,1657682,1657907,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,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695

svn commit: r1712650 - in /tomcat/tc7.0.x/trunk: ./ BUILDING.txt

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 21:07:26 2015
New Revision: 1712650

URL: http://svn.apache.org/viewvc?rev=1712650&view=rev
Log:
Document java.net.preferIPv4Stack option, in followup to r1712493, r1712451, 
r1360433
Merged r1712649 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/BUILDING.txt

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 21:07:26 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1

Re: Tomcat Native 1.2.2

[Rémy Maucherat]

2015-11-04 20:22 GMT+01:00 Christopher Schultz :

> At some point, tcnative won't have to exist at all. There have been some
> efforts to provide an OpenSSL-based JSSE provider, at which point little
> needs to be done to use OpenSSL under the hood, and I think the APR
> connector can be discarded.
>

Are you talking about JCE ? If so, then you need to think about it some
more, everything about it is extremely complex. Including for the end user
setup.

>
> JSSE w/OpenSSL + NIO(2) seems like it would be a great combination, and
> it would remove a *lot* of code in Tomcat.
>
> The APR connector is not that much code, and it has somewhat different
characteristics, it could still be an interesting tool sometimes (like with
HTTP/2 recently).

Rémy

svn commit: r1712654 - /tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 21:19:04 2015
New Revision: 1712654

URL: http://svn.apache.org/viewvc?rev=1712654&view=rev
Log:
Fix formatting

Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=1712654&r1=1712653&r2=1712654&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Wed Nov  4 
21:19:04 2015
@@ -296,12 +296,12 @@ public class CombinedRealm extends Realm
  * Delegate the backgroundProcess call to all sub-realms.
  */
 @Override
-public void backgroundProcess()
-{
+public void backgroundProcess() {
 super.backgroundProcess();
 
-for( Realm r: realms )
+for (Realm r : realms) {
 r.backgroundProcess();
+}
 }
 
 /**



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712655 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/realm/CombinedRealm.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 21:21:24 2015
New Revision: 1712655

URL: http://svn.apache.org/viewvc?rev=1712655&view=rev
Log:
Fix formatting and changelog typo.
Merged r1712654 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 21:21:24 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,1649973,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,1655351,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,1657
 
609,1657682,1657907,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,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371

svn commit: r1712656 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/CombinedRealm.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 21:26:22 2015
New Revision: 1712656

URL: http://svn.apache.org/viewvc?rev=1712656&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58582
Perform background-processing on sub-realms.

Merged r1712618, r1712655 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 21:26:22 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712649
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,134451

svn commit: r1712663 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/realm/CombinedRealm.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 21:35:35 2015
New Revision: 1712663

URL: http://svn.apache.org/viewvc?rev=1712663&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58582
Perform background-processing on sub-realms.
Fix compilation warnings (add missing @Override annotations).

Backport of r1712656 from tomcat/tc7.0.x/trunk.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  4 21:35:35 2015
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541
 
,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1696381,1701945,1710353
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1693108,1694291,1694427,1696379,1701944,1710347
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,9286

[Bug 58582] org.apache.catalina.realm.CombinedRealm should implement backgroundProcess

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58582

--- Comment #2 from Konstantin Kolinko  ---
Fixed in Tomcat 7 and Tomcat 6 as well, will be in 7.0.66, 6.0.45.

-- 
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: r1712674 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 22:13:30 2015
New Revision: 1712674

URL: http://svn.apache.org/viewvc?rev=1712674&view=rev
Log:
Fix year in release note for mod_jk 1.2.41

Announcement e-mail is visible in the archive here:
http://mail-archives.apache.org/mod_mbox/tomcat-announce/201508.mbox/browser

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1712674&r1=1712673&r2=1712674&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Nov  4 22:13:30 2015
@@ -328,7 +328,7 @@ changelog.
 
 
 
-2014-08-11 Tomcat Connectors 1.2.41 
Released
+2015-08-11 Tomcat Connectors 1.2.41 
Released
 
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1712674&r1=1712673&r2=1712674&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Wed Nov  4 22:13:30 2015
@@ -103,7 +103,7 @@ changelog.
 
 
 
-
+
 
 The Apache Tomcat Project is proud to announce the release of version 1.2.41 of
 Apache Tomcat Connectors.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712681 - /tomcat/native/trunk/native/src/sslcontext.c

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 22:42:34 2015
New Revision: 1712681

URL: http://svn.apache.org/viewvc?rev=1712681&view=rev
Log:
Fix declaration of stub method used when compiling without OpenSSL support.

Noted when searching for "SSLExt".
It would be better to actually try compiling - there may be other discrepancies 
like this.
I cannot actually claim that the compilation issue has been fixed.

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=1712681&r1=1712680&r2=1712681&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Nov  4 22:42:34 2015
@@ -1749,8 +1749,8 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
 return JNI_FALSE;
 }
 
-TCN_IMPLEMENT_CALL(jint, SSLExt, setALPN)(TCN_STDARGS, jlong ctx,
-  jbyteArray buf, jint len)
+TCN_IMPLEMENT_CALL(jint, SSLContext, setALPN)(TCN_STDARGS, jlong ctx,
+  jbyteArray buf, jint len)
 {
 UNREFERENCED_STDARGS;
 UNREFERENCED(ctx);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58586] New: Classloader memory leak on Tomcat application .war file redeployment.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58586

Bug ID: 58586
   Summary: Classloader memory leak on Tomcat application .war
file redeployment.
   Product: Tomcat Modules
   Version: unspecified
  Hardware: All
OS: AIX
Status: NEW
  Severity: major
  Priority: P2
 Component: jdbc-pool
  Assignee: dev@tomcat.apache.org
  Reporter: bht...@gmail.com

The leak can be observed with the use of the latest version of an IBM jdbc
driver.

IBM support have worked on the issue for us. Their resolution is to deregister
the JDBC driver with a ServletContextListener.

Additionally they recommend to include the driver jar db2jcc4.jar in the web
archive WEB-INF/lib directory.  

Unfortunately while doing this as recommended, the exception below still
appears once per second in the log file:

java.lang.IllegalStateException: Illegal access: this web application instance
has been stopped already. Could not load [DB2JccConfiguration.properties]. The
following stack trace is thrown for debugging purposes as well as to attempt to
terminate the thread which caused the illegal access.
at
org.apache.catalina.loader.WebappClassLoaderBase.checkStateForResourceLoading(WebappClassLoaderBase.java:1327)
at
org.apache.catalina.loader.WebappClassLoaderBase.getResource(WebappClassLoaderBase.java:1023)
at com.ibm.db2.jcc.am.ud.run(Unknown Source)
at
java.security.AccessController.doPrivileged(AccessController.java:285)
at com.ibm.db2.jcc.am.GlobalProperties.a(Unknown Source)
at com.ibm.db2.jcc.am.GlobalProperties.d(Unknown Source)
at com.ibm.db2.jcc.am.mq.run(Unknown Source)
at java.util.TimerThread.mainLoop(Timer.java:567)
at java.util.TimerThread.run(Timer.java:517)

Environment information is as follows:

Tomcat version: 8.0

Operating system: AIX

java -version
java version "1.7.0"
Java(TM) SE Runtime Environment (build pap6470sr7-20140410_01(SR7))
IBM J9 VM (build 2.6, JRE 1.7.0 AIX ppc64-64 Compressed References
20140409_195732 (JIT enabled, AOT enabled)
J9VM - R26_Java726_SR7_20140409_1418_B195732
JIT  - r11.b06_20140409_61252
GC   - R26_Java726_SR7_20140409_1418_B195732_CMPRSS
J9CL - 20140409_195732)
JCL - 20140409_01 based on Oracle 7u55-b13


JDBC driver downloaded from:
http://www-01.ibm.com/support/docview.wss?uid=swg21363866
DB2 JDBC and SQLJ driver 10.5.0
v10.5fp5_jdbc_sqlj.tar.gz

Configuration is as follows:

A data source is defined in the Tomcat application context:

$CATALINA_BASE/conf/Catalina/localhost/db2test.xml as follows:






web.xml as follows:


http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";>
Leaky Application


30




connect.listener.DatabaseGetConnectionContextListener




connect.listener.DeregisterDriverServletContextListener




with listeners as follows:

public class DatabaseGetConnectionContextListener implements
ServletContextListener {

private static final Logger LOGGER =
LoggerFactory.getLogger(DatabaseGetConnectionContextListener.class);

public void contextInitialized(ServletContextEvent sce) {
LOGGER.info("contextInitialized trying to get connection...");
try {
Context initCtx = new InitialContext();
Context envCtx = (Context) initCtx.lookup("java:comp/env");
DataSource ds = (DataSource) envCtx.lookup("jdbc/db2test");
Connection con = null;
try {
con = ds.getConnection();
LOGGER.info("Opened connection: " + con);
} catch (SQLException ex) {
LOGGER.error("Cannot open connection", ex);
} finally {
if (con != null) {
try {
con.close();
LOGGER.info("Closed connection: " + con);
} catch (SQLException ex) {
throw new RuntimeException(ex);
}
}
}
} catch (NamingException ex) {
throw new RuntimeException(ex);
}
}

public void contextDestroyed(ServletContextEvent sce) {}

}


public class DeregisterDriverServletContextListener implements
ServletContextListener {

private static final Logger LOGGER =
LoggerFactory.getLogger(DeregisterDriverServletContextListener.class);

public void contextInitialized(ServletContextEvent sce) {}

@Override
public void contextDestroyed(ServletContextEvent sce) {

LOGGER.info("contextDestroyed() executing ...");
final ClassLoader classLoader =
Thread.currentThread().ge

svn commit: r1712683 - in /tomcat/trunk/java/org/apache/tomcat/jni: SSLExt.java socket/AprSocket.java socket/AprSocketContext.java socket/HostInfo.java

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 23:08:35 2015
New Revision: 1712683

URL: http://svn.apache.org/viewvc?rev=1712683&view=rev
Log:
Remove SSLExt and related classes.

SSLExt has a lot of native methods that are said to be implemented in Tomcat 
Native trunk,
but actually there in no implementation code for them in current native trunk.

It looks that some methods have already been moved elsewhere, e.g. into 
SSLContext class.

AprSocket, AprSocketContext rely on SSLExt.
I tried to selectively remove code, but calls like
SSLExt.sslSetMode(socket, SSLExt.SSL_MODE_ENABLE_PARTIAL_WRITE |
SSLExt.SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
cannot be replaced.

HostInfo is a simple serializable class that hold information on a host. Also 
related to unimplemented NPN support.

Removed:
tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/HostInfo.java


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712684 - /tomcat/trunk/java/org/apache/tomcat/jni/socket/

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 23:09:51 2015
New Revision: 1712684

URL: http://svn.apache.org/viewvc?rev=1712684&view=rev
Log:
Remove empty directory.
(Classes were removed by r1712683)

Removed:
tomcat/trunk/java/org/apache/tomcat/jni/socket/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1712683 - in /tomcat/trunk/java/org/apache/tomcat/jni: SSLExt.java socket/AprSocket.java socket/AprSocketContext.java socket/HostInfo.java

[Rémy Maucherat]

2015-11-05 0:08 GMT+01:00 :

> Author: kkolinko
> Date: Wed Nov  4 23:08:35 2015
> New Revision: 1712683
>
> URL: http://svn.apache.org/viewvc?rev=1712683&view=rev
> Log:
> Remove SSLExt and related classes.
>
> SSLExt has a lot of native methods that are said to be implemented in
> Tomcat Native trunk,
> but actually there in no implementation code for them in current native
> trunk.
>
> This stuff in the "socket" folder is rather fun, it's an async IO
implementation on top of APR. This is likely better than the direct APR use
in the APR connector, but of course nobody is going to rewrite it at this
point (I think). Obviously, I never tried this, so no idea if it *really*
works, apparently some stuff is missing then.

Rémy

svn commit: r1712688 - in /tomcat/native/trunk: java/org/apache/tomcat/ xdocs/miscellaneous/changelog.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 23:30:11 2015
New Revision: 1712688

URL: http://svn.apache.org/viewvc?rev=1712688&view=rev
Log:
Update external. Add changelog for r1712683 and r1712681.

Modified:
tomcat/native/trunk/java/org/apache/tomcat/   (props changed)
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Propchange: tomcat/native/trunk/java/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Wed Nov  4 23:30:11 2015
@@ -1 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/jni@1712041 jni
+^/tomcat/trunk/java/org/apache/tomcat/jni@1712684 jni

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1712688&r1=1712687&r2=1712688&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Nov  4 23:30:11 
2015
@@ -34,6 +34,20 @@
   This is the Changelog for Tomcat Native 1.2.
   
 
+
+  
+
+  Remove Java classes that do not have C implementation code
+  for their native methods in the current library. They were
+  used for NPN support which is superseded by ALPN support
+  in the current code. (kkolinko)
+
+
+  Fix typo in declaration of a stub method used when the library is
+  compiled without OpenSSL support. (kkolinko)
+
+  
+
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1712683 - in /tomcat/trunk/java/org/apache/tomcat/jni: SSLExt.java socket/AprSocket.java socket/AprSocketContext.java socket/HostInfo.java

[Konstantin Kolinko]

2015-11-05 2:16 GMT+03:00 Rémy Maucherat :
> 2015-11-05 0:08 GMT+01:00 :
>
>> Author: kkolinko
>> Date: Wed Nov  4 23:08:35 2015
>> New Revision: 1712683
>>
>> URL: http://svn.apache.org/viewvc?rev=1712683&view=rev
>> Log:
>> Remove SSLExt and related classes.
>>
>> SSLExt has a lot of native methods that are said to be implemented in
>> Tomcat Native trunk,
>> but actually there in no implementation code for them in current native
>> trunk.
>>
>
> This stuff in the "socket" folder is rather fun, it's an async IO
> implementation on top of APR. This is likely better than the direct APR use
> in the APR connector, but of course nobody is going to rewrite it at this
> point (I think). Obviously, I never tried this, so no idea if it *really*
> works, apparently some stuff is missing then.
>

Those SSLExt.sslSetMode() calls look as crucial to their
implementation (are executed when a socket is opened), so I removed
the classes as they cannot be compiled without SSLExt class being
present.

Searching my archives, they were originally added in
http://svn.apache.org/r1686276

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712690 - /tomcat/native/trunk/CMakeLists.txt

[kkolinko]

Author: kkolinko
Date: Wed Nov  4 23:57:27 2015
New Revision: 1712690

URL: http://svn.apache.org/viewvc?rev=1712690&view=rev
Log:
Remove mention of sslext.c. That file was removed some time ago.

I do not know what this CMakeLists.txt file is used for.
The list of file names that I corrected is OK: it matches the actual files in 
src/*, none are omitted.

Modified:
tomcat/native/trunk/CMakeLists.txt

Modified: tomcat/native/trunk/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/CMakeLists.txt?rev=1712690&r1=1712689&r2=1712690&view=diff
==
--- tomcat/native/trunk/CMakeLists.txt (original)
+++ tomcat/native/trunk/CMakeLists.txt Wed Nov  4 23:57:27 2015
@@ -826,7 +826,6 @@ native/src/sslnetwork.c
 native/src/dir.c
 native/src/shm.c
 native/src/multicast.c
-native/src/sslext.c
 native/src/sslcontext.c
 native/src/user.c
 native/src/pool.c



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58587] New: Can adding workers to worker.list and balance_workers cause an issue?

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58587

Bug ID: 58587
   Summary: Can adding workers to worker.list and balance_workers
cause an issue?
   Product: Tomcat Connectors
   Version: 1.2.37
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: mod_jk
  Assignee: dev@tomcat.apache.org
  Reporter: jfon...@xtime.com

What would happen if I add workers into worker.list and balance_workers?

Option1:
worker.list=node1,node2,loadbalancer,status

worker.loadbalancer.balance_workers=node1,node2


VS

Option2:
worker.list=loadbalancer,status

worker.loadbalancer.balance_workers=node1,node2



If I went with Option1 will that cause errors with the apache LB like cause
blank page loads or perhaps slow down performance?

What I am looking for is, what is the repercussions with going with Option1?

-- 
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: r1712683 - in /tomcat/trunk/java/org/apache/tomcat/jni: SSLExt.java socket/AprSocket.java socket/AprSocketContext.java socket/HostInfo.java

[Konstantin Kolinko]

2015-11-05 2:35 GMT+03:00 Konstantin Kolinko :
> 2015-11-05 2:16 GMT+03:00 Rémy Maucherat :
>> 2015-11-05 0:08 GMT+01:00 :
>>
>>> Author: kkolinko
>>> Date: Wed Nov  4 23:08:35 2015
>>> New Revision: 1712683
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1712683&view=rev
>>> Log:
>>> Remove SSLExt and related classes.
>>>
>>> SSLExt has a lot of native methods that are said to be implemented in
>>> Tomcat Native trunk,
>>> but actually there in no implementation code for them in current native
>>> trunk.
>>>
>>
>> This stuff in the "socket" folder is rather fun, it's an async IO
>> implementation on top of APR. This is likely better than the direct APR use
>> in the APR connector, but of course nobody is going to rewrite it at this
>> point (I think). Obviously, I never tried this, so no idea if it *really*
>> works, apparently some stuff is missing then.
>>
>
> Those SSLExt.sslSetMode() calls look as crucial to their
> implementation (are executed when a socket is opened), so I removed
> the classes as they cannot be compiled without SSLExt class being
> present.
>
> Searching my archives, they were originally added in
> http://svn.apache.org/r1686276

Correction: these classes are older than r1686276 (June 2015)

They were removed in r1672142. (April 2015)
They were originally added by costin in r1299980 (March 2012)

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn propchange: r1694293 - svn:log

[kkolinko]

Author: kkolinko
Revision: 1694293
Modified property: svn:log

Modified: svn:log at Thu Nov  5 00:22:03 2015
--
--- svn:log (original)
+++ svn:log Thu Nov  5 00:22:03 2015
@@ -0,0 +1 @@
+Better document the inconsistent return values.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn propchange: r1694291 - svn:log

[kkolinko]

Author: kkolinko
Revision: 1694291
Modified property: svn:log

Modified: svn:log at Thu Nov  5 00:23:03 2015
--
--- svn:log (original)
+++ svn:log Thu Nov  5 00:23:03 2015
@@ -0,0 +1 @@
+Better document the inconsistent return values.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712695 - in /tomcat/trunk: build.xml res/findbugs/filter-false-positives.xml

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 00:31:20 2015
New Revision: 1712695

URL: http://svn.apache.org/viewvc?rev=1712695&view=rev
Log:
Update exclusions, since jni.socket.* classes were removed by r1712683

Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1712695&r1=1712694&r2=1712695&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Nov  5 00:31:20 2015
@@ -1542,8 +1542,6 @@
 
 
 
-
-
   
   
 

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1712695&r1=1712694&r2=1712695&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Thu Nov  5 00:31:20 
2015
@@ -369,12 +369,6 @@
 
   
   
-
-
-
-
-  
-  
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1712696 - in /tomcat/tc8.0.x/trunk: ./ build.xml res/findbugs/filter-false-positives.xml

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 00:35:16 2015
New Revision: 1712696

URL: http://svn.apache.org/viewvc?rev=1712696&view=rev
Log:
Update exclusions
jni.socket.* classes were removed from Tomcat 8 by r1671806 (April 2015, in 
8.0.22) and from trunk by r1712683.

Merged r1712695 from tomcat/trunk:

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/res/findbugs/filter-false-positives.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 00:35:16 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,1649973,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,1655351,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,1657
 
609,1657682,1657907,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,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1

svn commit: r1712702 - in /tomcat/tc7.0.x/trunk/test/webapp-3.0: WEB-INF/tags/bug58178.tag bug5nnnn/bug58178.jsp

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 00:50:22 2015
New Revision: 1712702

URL: http://svn.apache.org/viewvc?rev=1712702&view=rev
Log:
Remove svn:mergeinfo property from files.

Modified:
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags/bug58178.tag   (props 
changed)
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug58178.jsp   (props changed)

Propchange: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags/bug58178.tag
('svn:mergeinfo' removed)

Propchange: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug58178.jsp
('svn:mergeinfo' removed)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58588] New: Remove extras/juli from Tomcat 9 build and deliveries as Log4J 1.x has reached EOL.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58588

Bug ID: 58588
   Summary: Remove extras/juli from Tomcat 9 build and deliveries
as Log4J 1.x has reached EOL.
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

In August 2015 there was an announcement that Apache LogJ 1.x has reached EOL.

Link: http://s.apache.org/Wzn

As such, I propose to drop building and providing
extras/tomcat-juli.jar
extras/tomcat-juli-adapters.jar

as main goal for these libraries is to support plugging Log4J 1.x directly into
Apache Commons Logging layer of Tomcat logging.

In my understanding Log4J 2, Logback can be plugged directly into
java.util.logging layer. Though our documentation does not yet describe this.

-- 
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 58586] Classloader memory leak on Tomcat application .war file redeployment.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58586

--- Comment #1 from bernard  ---
Created attachment 33259
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33259&action=edit
Test case in zip archive

I had to remove the driver file db2jcc4.jar from the WEB-INF/lib directory
because of bugzilla upload file size restriction

-- 
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: r1712703 - in /tomcat/site/trunk: docs/migration-7.html docs/migration-8.html xdocs/migration-7.xml xdocs/migration-8.xml

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 01:51:10 2015
New Revision: 1712703

URL: http://svn.apache.org/viewvc?rev=1712703&view=rev
Log:
Mention maxPostSize change in Tomcat 7 and 8.
This caused several (~5) threads on users.
Some people reported facing it when upgrading from an old Tomcat 7 version to 
current Tomcat 8. (reported via documentation comments)

Overall this change is not so important, but it is hard to debug it and match 
the observed behaviour with changelog.

Modified:
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/migration-8.xml

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1712703&r1=1712702&r2=1712703&view=diff
==
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Thu Nov  5 01:51:10 2015
@@ -985,6 +985,17 @@ of Apache Tomcat.
   
 In 7.0.51 onwards, the web application class loader is now a higher
   priority for loading classes than the system class loader.
+  
+
+In 7.0.63 onwards, the meaning of value 0 for maxPostSize
+attribute on connectors was changed to mean a limit of zero rather
+than no limit to align it with maxSavePostSize and to
+be more intuitive.
+
+Reference: HTTP connector,
+AJP connector.
+  
+
 
 
   

Modified: tomcat/site/trunk/docs/migration-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1712703&r1=1712702&r2=1712703&view=diff
==
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Thu Nov  5 01:51:10 2015
@@ -247,6 +247,9 @@
 Upgrading 8.0.x
 
 
+Tomcat 8.0.x noteable changes
+
+
 Tomcat 8.0.x 
configuration file differences
 
 
@@ -648,6 +651,35 @@ of Apache Tomcat.
   as part of the upgrade. To assist with the identification of these changes,
   the form below may be used to view the differences between the configuration
   files in different versions of Tomcat 8.
+
+  
+
+Tomcat 8.0.x noteable changes
+
+
+The Tomcat developers aim for each patch release to be fully backwards
+   compatible with the previous release.  Occassionally, it is necessary to
+   break backwards compatibility in order to fix a bug. In most cases, 
these
+   changes will go unnoticed. This section lists changes that are not fully
+   backwards compatible and might cause breakage when upgrading.
+
+
+  
+
+In 8.0.24 onwards, the meaning of value 0 for maxPostSize
+attribute on connectors was changed to mean a limit of zero rather
+than no limit to align it with maxSavePostSize and to
+be more intuitive.
+
+Reference: HTTP connector,
+AJP connector.
+  
+
+
+
+  
+
+
   
   
 

Modified: tomcat/site/trunk/xdocs/migration-7.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1712703&r1=1712702&r2=1712703&view=diff
==
--- tomcat/site/trunk/xdocs/migration-7.xml (original)
+++ tomcat/site/trunk/xdocs/migration-7.xml Thu Nov  5 01:51:10 2015
@@ -484,6 +484,13 @@ of Apache Tomcat.
 
   In 7.0.51 onwards, the web application class loader is now a higher
   priority for loading classes than the system class loader.
+  In 7.0.63 onwards, the meaning of value 0 for 
maxPostSize
+attribute on connectors was changed to mean a limit of zero rather
+than no limit to align it with maxSavePostSize and to
+be more intuitive.
+Reference: HTTP 
connector,
+AJP connector.
+  
 
   
   

Modified: tomcat/site/trunk/xdocs/migration-8.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1712703&r1=1712702&r2=1712703&view=diff
==
--- tomcat/site/trunk/xdocs/migration-8.xml (original)
+++ tomcat/site/trunk/xdocs/migration-8.xml Thu Nov  5 01:51:10 2015
@@ -268,6 +268,23 @@ of Apache Tomcat.
   as part of the upgrade. To assist with the identification of these changes,
   the form below may be used to view the differences between the configuration
   files in different versions of Tomcat 8.
+
+  
+The Tomcat developers aim for each patch release to be fully backwards
+   compatible with the previous release.  Occassionally, it is necessary to
+   break backwards compatibility in order to fix a bug. In most cases, 
these
+   changes will go unnoticed. This section lists changes that are not fully
+   backwards compatible and might cause breakage when upgrading.
+
+  In 8.0.24 onwards, the meaning of valu

[doc][patch} User proper windows line continuation for windows-service howto

[Bernd Eckenfels]

Hello,

for some time now there are comments in the documentation site, that
the syntax used for line-continuation in the Windows Service howto is
wrong.

Please find attached a patch to correct this. I changed the
continuation prompt to the correct style (even when I think this way
makes copy and paste harder, but since the original version had those
prompts as well, I went with the original style).

BTW: I think the site doc is outdated compared to the 8.0 branch. So
maybe you can refresh that as well after the trunk patch is applied and
backported.

Gruss
Bernd

Index: webapps/docs/windows-service-howto.xml
===
--- webapps/docs/windows-service-howto.xml  (Revision 1712703)
+++ webapps/docs/windows-service-howto.xml  (Arbeitskopie)
@@ -360,11 +360,11 @@
 If using tomcat.exe, you need to use the //IS// 
parameter.
 
 Install the service named 'Tomcat'
-C:\> tomcat //IS//Tomcat --DisplayName="Apache 
Tomcat " \
-C:\> --Install="C:\Program Files\Tomcat\bin\tomcat.exe" 
--Jvm=auto \
-C:\> --StartMode=jvm --StopMode=jvm \
-C:\> --StartClass=org.apache.catalina.startup.Bootstrap --StartParams=start \
-C:\> --StopClass=org.apache.catalina.startup.Bootstrap 
--StopParams=stop
+C:\> tomcat //IS//Tomcat --DisplayName="Apache 
Tomcat " ^
+more? --Install="C:\Program Files\Tomcat\bin\tomcat.exe" 
--Jvm=auto ^
+more? --StartMode=jvm --StopMode=jvm ^
+more? --StartClass=org.apache.catalina.startup.Bootstrap --StartParams=start ^
+more? --StopClass=org.apache.catalina.startup.Bootstrap 
--StopParams=stop
 
 
 
@@ -373,15 +373,15 @@
 
 
 Update the service named 'Tomcat'
-C:\> tomcat //US//Tomcat --Description="Apache 
Tomcat Server - http://tomcat.apache.org/ " \
-C:\> --Startup=auto 
--Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar
+C:\> tomcat //US//Tomcat --Description="Apache 
Tomcat Server - http://tomcat.apache.org/ " ^
+more? --Startup=auto 
--Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar
 
 If you gave the service an optional name, you need to specify it like this:
 
 
 Update the service named 'MyService'
-C:\> tomcat //US//MyService --Description="Apache Tomcat 
Server - http://tomcat.apache.org/ " \
-C:\> --Startup=auto 
--Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar
+C:\> tomcat //US//MyService --Description="Apache Tomcat 
Server - http://tomcat.apache.org/ " ^
+more? --Startup=auto 
--Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar
 
 
 

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1712571 - in /tomcat/tc6.0.x/trunk: STATUS.txt extras.xml webapps/docs/changelog.xml

[Huxing Zhang]

Hi kkolinko,

There seems to be a typo in the commit:

+None. Tomcat 6 is Commit-Than-Review since 2015-11-02.

Commit-Than-Review should be Commit-Then-Review.
--
From:kkolinko 
Send Time:2015年11月4日(星期三) 23:55
To:dev 
Subject:svn commit: r1712571 - in /tomcat/tc6.0.x/trunk: STATUS.txt extras.xml 
webapps/docs/changelog.xml


Author: kkolinko
Date: Wed Nov  4 15:55:02 2015
New Revision: 1712571

URL: http://svn.apache.org/viewvc?rev=1712571&view=rev
Log:
Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar.
Reported by Benjamin Gandon on the dev list
Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui

It it true that 6.0.44/extras/tomcat-juli-adapters.jar did not include 
LogFactoryImpl.class,
but it erroneously included its inner classes - LogFactoryImpl$1, *$2, *$3.

I am aligning  patterns with Tomcat 7. (Actually Tomcat 7 ones are 
used both for .jar and -src.jar, thus they end with * instead of explicit 
*.class)

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712571&r1=1712570&r2=1712571&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov  4 15:55:02 2015
@@ -28,14 +28,7 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar.
-  Reported by Benjamin Gandon on the dev list
-  Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui
-  https://svn.apache.org/r1707054
-  - to be applied to extras.xml line 220
-  +1: kkolinko, markt
-  -1:
-
+None. Tomcat 6 is Commit-Than-Review since 2015-11-02.
   
 PATCHES/ISSUES THAT ARE STALLED:
 

Modified: tomcat/tc6.0.x/trunk/extras.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1712571&r1=1712570&r2=1712571&view=diff
==
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Nov  4 15:55:02 2015
@@ -215,9 +215,9 @@
 
   
-
-
-
+
+
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1712571&r1=1712570&r2=1712571&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov  4 15:55:02 2015
@@ -112,6 +112,15 @@
   
 
   
+  
+
+  
+Ensure JULI adapters JAR in Tomcat extras package does not include
+the LogFactoryImpl[$*] classes. Based on patch provided by
+Benjamin Gandon. (kkolinko)
+  
+
+  
 
 
   



-
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

tomcat timeout handling

[Bernd Eckenfels]

Hello,

in this bug https://bz.apache.org/bugzilla/show_bug.cgi?id=58565 there
was some dicussion on download timeouts.

I had noticed that tomcat does close slow/hanging downloads after the
connectTimeout=20s even when the documentation
(http://tomcat.apache.org/tomcat-8.0-doc/config/http.html) reads:

connectionTimeout   

The number of milliseconds this Connector will wait, after accepting a
connection, for the request URI line to be presented. Use a value of -1
to indicate no (i.e. infinite) timeout. The default value is 6
(i.e. 60 seconds) but note that the standard server.xml that ships with
Tomcat sets this to 2 (i.e. 20 seconds). Unless
disableUploadTimeout is set to false, this timeout will also be used
when reading the request body (if any).


I think this is wrong, it does not only apply to the initial line but
also the output. Maybe this could be clarified, especially in relation
with uploadTimeout and keepAliveTimeout. Especially when does the
connector transition from one to the other.

Greetings
Bernd


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1712457 - in /tomcat/native/trunk/native/src: ssl.c sslnetwork.c sslutils.c

[Bill Barker]

It is likely that the entire second handshake can be removed.  But I would 
have to clone the 1.0.2 branch and look to be sure.  The 
accept-after-handshake in the code is a work-around for a very old bug 
(which used to be in JSSE as well in Java 1.4).


There has been a lot of refactoring on the master branch of OpenSSL recently 
regarding the state machine for the SSL object.  It is simply not possible 
in the public API to do the second handshake in 1.1.0+ anymore.


I knew we had a test case for renegotiate, but didn't realize that it was 
disabled for APR.  I'll look into enabling it on a local test environment to 
see what happens.


"Konstantin Kolinko"  wrote in message 
news:CABzHfVkC-5yZLADQE=O4ds7=0dontmu2golai_llg8rg2o7...@mail.gmail.com...


2015-11-04 5:25 GMT+03:00  :

Author: billbarker
Date: Wed Nov  4 02:25:05 2015
New Revision: 1712457

URL: http://svn.apache.org/viewvc?rev=1712457&view=rev
Log:
Forward port r1712199 align with OpenSSL master. Just deleted the SSLeay 
check since any OS I know will raise an UnsatifiedLinkError if you try to 
load this with such an old version when 1.0.2x is required. Otherwise no 
change if compiling against 1.0.2x


Modified:
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/native/src/sslnetwork.c
tomcat/native/trunk/native/src/sslutils.c




Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1712457&r1=1712456&r2=1712457&view=diff

==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Wed Nov  4 02:25:05 2015
@@ -650,6 +650,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
 #endif
 return APR_EGENERAL;
 }
+#if OPENSSL_VERSION_NUMBER < 0x1010L
 SSL_set_state(con->ssl, SSL_ST_ACCEPT);

 apr_socket_timeout_get(con->sock, &timeout);
@@ -669,14 +670,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
 break;
 }
 con->reneg_state = RENEG_REJECT;
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+
 if (SSL_get_state(con->ssl) != SSL_ST_OK) {
-#else
-if (SSL_get_state(con->ssl) != TLS_ST_OK) {
-#endif
 return APR_EGENERAL;
 }
-
+#endif
 return APR_SUCCESS;
 }



Regarding the above change in SSLSocket.renegotiate()
TCN_IMPLEMENT_CALL(jint, SSLSocket, renegotiate)(TCN_STDARGS,
jlong sock)

As a comment there says,

   /* Sequence to renegotiate is
*  SSL_renegotiate()
*  SSL_do_handshake()
*  ssl->state = SSL_ST_ACCEPT
*  SSL_do_handshake()
*/

The change is that the second handshake attempt (starting with
ssl->state) is removed on OpenSSL 1.1+.

Can it be removed completely -- on the old library as well?  I think
that the first SSL_do_handshake() shall be enough.

Actually we do not have tests for renegotiation, as
org.apache.tomcat.util.net.TesterSupport does

   protected static boolean isRenegotiationSupported(Tomcat tomcat) {
   String protocol = 
tomcat.getConnector().getProtocolHandlerClassName();

   if (protocol.contains("Apr")) {
   // Disabled by default in 1.1.20 windows binary (2010-07-27)
   return false;
   }
   if (protocol.contains("NioProtocol") ||
(protocol.contains("Nio2Protocol") && isMacOs())) {
   // Doesn't work on all platforms - see BZ 56448.
   return false;
   }

   return true;
   }


Best regards,
Konstantin Kolinko 




-
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-bio (in module tomcat-8.0.x) failed

[Bill Barker]

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-bio 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-bio :  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-bio/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-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 36 mins 48 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.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151105-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151105.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151105-native-src.tar.gz
 -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151105/bin/o
 penssl -Dexecute.test.bio=true -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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-jn

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

[Bill Barker]

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-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 4 runs.
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-nio2 :  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-nio2/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-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 38 mins 42 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.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151105-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151105.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151105-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151105/bin
 /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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

svn commit: r1712707 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 03:57:30 2015
New Revision: 1712707

URL: http://svn.apache.org/viewvc?rev=1712707&view=rev
Log:
Correct a typo. Thanks to Huxing Zhang for noting.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712707&r1=1712706&r2=1712707&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov  5 03:57:30 2015
@@ -28,7 +28,7 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-None. Tomcat 6 is Commit-Than-Review since 2015-11-02.
+None. Tomcat 6 is CTR (Commit-Then-Review) since 2015-11-02.
   
 PATCHES/ISSUES THAT ARE STALLED:
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58587] Can adding workers to worker.list and balance_workers cause an issue?

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58587

Chuck Caldarale  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Chuck Caldarale  ---
Bugzilla is not a support forum.  Post your query on the Tomcat users mailing
list.

-- 
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

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Bill Barker]

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,
 and has been outstanding for 2 runs.
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
 -WARNING- No directory 
[/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: 38 mins 39 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.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151105-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151105/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151105.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151105-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-20151105/bin/openssl
 -Dexecute.test.bio=false -Dexecute.test.apr=true 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/worksp

svn commit: r1712709 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/ webapps/docs/config/ webapps/docs/funcspecs/ webapps/docs/tribes/

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 04:34:31 2015
New Revision: 1712709

URL: http://svn.apache.org/viewvc?rev=1712709&view=rev
Log:
Correct double "the"s in the documentation.

Backport of r1694875 from tomcat/tc7.0.x/trunk.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-default.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-invoker.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-jdbc-realm.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-jndi-realm.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-memory-realm.xml
tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/tribes/introduction.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 04:34:31 2015
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541
 
,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1696381,1701945,1710353,1712656
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1693108,1694291,1694427,1696379,1701944,1710347,1712618,1712655
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,9

svn commit: r1712710 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 04:35:41 2015
New Revision: 1712710

URL: http://svn.apache.org/viewvc?rev=1712710&view=rev
Log:
Correct double "the"s in the documentation.

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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=1712710&r1=1712709&r2=1712710&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Nov  5 04:35:41 2015
@@ -5542,7 +5542,7 @@
 returns to the container). (markt)
   
   
-53863: Ensure the the implicit servlets (JSP and default) 
are
+53863: Ensure that the implicit servlets (JSP and default) 
are
 marked as override-able when using embedded mode. (markt)
   
   
@@ -7297,7 +7297,7 @@
 RemoteAddrValve via JMX are thread-safe. (markt)
   
   
-Ensure the the memory leak protection for the HttpClient keep-alive
+Ensure that the memory leak protection for the HttpClient keep-alive
 always operates even if the thread has already stopped. (markt)
   
   
@@ -8156,7 +8156,7 @@
 (kkolinko)
   
   
-Add information to the security page of the the documentation web
+Add information to the security page of the documentation web
 application for the ciphers attribute of the Connector element. (markt)
   
 
@@ -9006,7 +9006,7 @@
   
   
 51099: Correctly implement non-default login configurations
-(configured via the loginConfigName attribute) for the the SPNEGO
+(configured via the loginConfigName attribute) for the SPNEGO
 authenticator. (fhanik/markt)
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org