[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) 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-trunk-test-nio 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-trunk-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/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-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 57 mins 37 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20150316/bin/openssl
 
 -Dexecute.test.apr=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/gump/public/wo

Re: Is it mandatory to create a bug to submit a patch (minor spell changes in the code comments)

[Mark Thomas]

On 16/03/2015 03:42, Raghavendran N wrote:
> Team,
> Is it mandatory to create a bug to submit a patch?

No. Very simple patches can be posted in-line (in diff-u format) in an
e-mail to the dev list. Note that if it isn't picked up straight away
(the same day) then there is a risk that it gets forgotten.

We also accept patches via github pull requests.

The advantage of creating a Bugzilla entry is that the patch won't get
forgotten. Not that isn't the same as the patch being acted on instantly.

> I have made a very minor
> change (corrected a sentence in a comment) towards my first patch.

For trivial patches (no more than a couple of lines), I'd suggest just
sending them in-line to this list. Anything bigger than that should have
a bugzilla entry.

Mark


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

[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) 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-trunk-test-nio2 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-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 55 mins 32 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-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/dest-20150316/bin/opens
 sl -Dexecute.test.apr=false -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/g

Re: svn commit: r1664875 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/ test/org/apache/catalina/startup/ test/org/apache/coyote/ajp/ webapps/docs/

[Mark Thomas]

On 15/03/2015 18:52, Konstantin Kolinko wrote:
> 2015-03-07 18:33 GMT+03:00  :
>> Author: markt
>> Date: Sat Mar  7 15:33:01 2015
>> New Revision: 1664875
>>
>> URL: http://svn.apache.org/r1664875
>> Log:
>> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57638
>> Avoid an IllegalArgumentException when an AJP request body chunk larger than 
>> the socket read buffer is being read. This typically requires a larger than 
>> default AJP packetSize.
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/   (props changed)
>> tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
>> tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
>> tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
>> 
>> tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>
> 
> 
>> Modified: 
>> tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1664875&r1=1664874&r2=1664875&view=diff
>> ==
>> --- 
>> tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
>> (original)
>> +++ 
>> tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
>> Sat Mar  7 15:33:01 2015
>> @@ -56,6 +56,7 @@ import org.apache.catalina.session.Manag
>>  import org.apache.catalina.session.StandardManager;
>>  import org.apache.catalina.valves.AccessLogValve;
>>  import org.apache.tomcat.util.buf.ByteChunk;
>> +import org.apache.tomcat.websocket.CaseInsensitiveKeyMap;
> 
> -1 to the above import.
> 
> It makes TomcatBaseTest to depend on WebSocket which in turn requires Java 7.
> 
> One should be able to build and run the tests (minus Websocket) using Java 6.

Fair point. I'll copy that class into a test util package for Tomcat 7.

Mark



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

svn commit: r1666964 - in /tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup: CaseInsensitiveKeyMap.java TomcatBaseTest.java

[markt]

Author: markt
Date: Mon Mar 16 11:27:03 2015
New Revision: 1666964

URL: http://svn.apache.org/r1666964
Log:
Follow up to r1664875.
Don't depend on class in option WebSocket module for unit tests.

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java
  - copied, changed from r1666099, 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Copied: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java
 (from r1666099, 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java&p1=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java&r1=1666099&r2=1666964&rev=1666964&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java
 Mon Mar 16 11:27:03 2015
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.websocket;
+package org.apache.catalina.startup;
 
 import java.util.AbstractMap;
 import java.util.AbstractSet;
@@ -24,8 +24,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.tomcat.util.res.StringManager;
-
 /**
  * A Map implementation that uses case-insensitive (using {@link
  * Locale#ENGLISH}) strings as keys.
@@ -39,9 +37,6 @@ import org.apache.tomcat.util.res.String
  */
 public class CaseInsensitiveKeyMap extends AbstractMap {
 
-private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
-
 private final Map map = new HashMap();
 
 
@@ -55,7 +50,7 @@ public class CaseInsensitiveKeyMap ex
 public V put(String key, V value) {
 Key caseInsensitiveKey = Key.getInstance(key);
 if (caseInsensitiveKey == null) {
-throw new 
NullPointerException(sm.getString("caseInsensitiveKeyMap.nullKey"));
+throw new NullPointerException("Null key not permitted");
 }
 return map.put(caseInsensitiveKey, value);
 }

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1666964&r1=1666963&r2=1666964&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
Mon Mar 16 11:27:03 2015
@@ -56,7 +56,6 @@ import org.apache.catalina.session.Manag
 import org.apache.catalina.session.StandardManager;
 import org.apache.catalina.valves.AccessLogValve;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.websocket.CaseInsensitiveKeyMap;
 
 /**
  * Base test case that provides a Tomcat instance for each test - mainly so we



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

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

[markt]

Author: markt
Date: Mon Mar 16 11:37:13 2015
New Revision: 1666966

URL: http://svn.apache.org/r1666966
Log:
Use correct capitalisation.

Modified:
tomcat/trunk/BUILDING.txt

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1666966&r1=1666965&r2=1666966&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Mon Mar 16 11:37:13 2015
@@ -249,7 +249,7 @@ You can build them by using the followin
 
 A full release includes the Windows installer which requires a Windows
 environment to be available to create it. If not building in a Windows
-environment, the build scripts assume that WINE is available. If this is 
not
+environment, the build scripts assume that Wine is available. If this is 
not
 the case, the skip.installer property may be set to skip the creation of 
the
 Windows installer.
 



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

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

[markt]

Author: markt
Date: Mon Mar 16 11:37:51 2015
New Revision: 1666967

URL: http://svn.apache.org/r1666967
Log:
Use the correct capitalisation.

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 Mon Mar 16 11:37:51 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,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,1663324,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,137,1
 49,1666757
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,165397

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

[markt]

Author: markt
Date: Mon Mar 16 11:38:29 2015
New Revision: 1666968

URL: http://svn.apache.org/r1666968
Log:
Use the correct capitalisation.

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 Mon Mar 16 11:38:29 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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759
-/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,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370

svn commit: r1666971 - in /tomcat/tc6.0.x/trunk: ./ BUILDING.txt

[markt]

Author: markt
Date: Mon Mar 16 11:46:35 2015
New Revision: 1666971

URL: http://svn.apache.org/r1666971
Log:
Use the correct capitalisation.

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 11:46: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
-/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
-/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,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95
 
0164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452

svn commit: r1666972 - in /tomcat/trunk: java/org/apache/catalina/realm/DigestCredentialHandlerBase.java webapps/docs/realm-howto.xml

[markt]

Author: markt
Date: Mon Mar 16 12:01:20 2015
New Revision: 1666972

URL: http://svn.apache.org/r1666972
Log:
Use short form of digest output when compatible with input settings (makes it 
simpler to use with DIGEDT auth).
Update notes on digest auth to add that no salt and one iteration must be used.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
tomcat/trunk/webapps/docs/realm-howto.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java?rev=1666972&r1=1666971&r2=1666972&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java 
Mon Mar 16 12:01:20 2015
@@ -120,15 +120,20 @@ public abstract class DigestCredentialHa
 
 String serverCredential = mutate(userCredential, salt, iterations);
 
-StringBuilder result =
-new StringBuilder((saltLength << 1) + 10 + 
serverCredential.length() + 2);
-result.append(HexUtils.toHexString(salt));
-result.append('$');
-result.append(iterations);
-result.append('$');
-result.append(serverCredential);
+if (saltLength == 0 && iterations == 1) {
+// Output the simple/old format for backwards compatibility
+return serverCredential;
+} else {
+StringBuilder result =
+new StringBuilder((saltLength << 1) + 10 + 
serverCredential.length() + 2);
+result.append(HexUtils.toHexString(salt));
+result.append('$');
+result.append(iterations);
+result.append('$');
+result.append(serverCredential);
 
-return result.toString();
+return result.toString();
+}
 }
 
 

Modified: tomcat/trunk/webapps/docs/realm-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/realm-howto.xml?rev=1666972&r1=1666971&r2=1666972&view=diff
==
--- tomcat/trunk/webapps/docs/realm-howto.xml (original)
+++ tomcat/trunk/webapps/docs/realm-howto.xml Mon Mar 16 12:01:20 2015
@@ -199,10 +199,11 @@ techniques are supported:
 
 
 If using digested passwords with DIGEST authentication, the cleartext used
-   to generate the digest is different and the digest must use the MD5
-   algorithm. In the examples above {cleartext-password} must be
-   replaced with {username}:{realm}:{cleartext-password}. For
-   example, in a development environment this might take the form
+   to generate the digest is different and the digest must use one iteration of
+   the MD5 algorithm with no salt. In the examples above
+   {cleartext-password} must be replaced with
+   {username}:{realm}:{cleartext-password}. For example, in a
+   development environment this might take the form
testUser:Authentication required:testPassword. The value for
{realm} is taken from the 
element of the web application's . If
@@ -216,6 +217,10 @@ are supported using
 digester. The digester returns {input}:{digest}. If the input
 appears corrupted in the return, the digest will be invalid.
 
+The output format of the digest is 
{salt}${iterations}${digest}.
+If the salt length is zero and the iteration count is one, the output is
+simplified to {digest}.
+
 The full syntax of CATALINA_HOME/bin/digest.[bat|sh] is:
 CATALINA_HOME/bin/digest.[bat|sh] [-a ] [-e 
]
 [-i ] [-s ] [-k 
]



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

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

[markt]

Author: markt
Date: Mon Mar 16 12:04:32 2015
New Revision: 1666973

URL: http://svn.apache.org/r1666973
Log:
Use short form of digest output when compatible with input settings (makes it 
simpler to use with DIGEDT auth).
Update notes on digest auth to add that no salt and one iteration must be used.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/realm-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 12:04:32 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,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,1663324,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,137,1
 49,1666757,1666966
+/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

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) 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-trunk-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-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 53 mins 29 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150316/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-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/dest-20150316/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/wo

[Bug 57707] Execute failed: java.io.IOException: Cannot run program "wine"

[bugzilla]

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

--- Comment #6 from Graham Leggett  ---
Come on guys, the big exception you get screams "this is broken". Throw the end
user a bone and give them a message of some kind, even if that message is "this
is intentional".

The idea that you have to go off and read some obscure document before you can
build something is totally unreasonable. In the automake world I just run "make
dist" and I have a release. In the maven world I run "mvn release:prepare
release:perform" and I have a release.

Obviously the release is incomplete if you've added a "skip" option, that's not
a justification for wasting the end user's time.

-- 
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-tc7.0.x-test-nio (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-nio 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-nio :  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-nio/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-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 44 mins 15 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-20150316-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-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.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dexecute.test.nio=true -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/wor
 kspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150316.jar
 -Dtest.temp=output/test-tmp-NIO 
-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/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/pub

svn commit: r1666985 - /tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd

[markt]

Author: markt
Date: Mon Mar 16 13:28:08 2015
New Revision: 1666985

URL: http://svn.apache.org/r1666985
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57703
Update http-method definition as per Servlet 2.5 MR6

Modified:
tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd

Modified: tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd?rev=1666985&r1=1666984&r2=1666985&view=diff
==
--- tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd Mon Mar 16 
13:28:08 2015
@@ -475,7 +475,7 @@ http://java.sun.com/xml/ns/javaee/web-ap
 
 
 
-
+
 
 
 



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

svn commit: r1666988 - in /tomcat/tc8.0.x/trunk: ./ java/javax/servlet/resources/web-app_2_5.xsd webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Mar 16 13:29:59 2015
New Revision: 1666988

URL: http://svn.apache.org/r1666988
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57703
Update http-method definition as per Servlet 2.5 MR6

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 13:29:59 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,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,1663324,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,137,1
 49,1666757,1666966,1666972
+/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,1648

svn commit: r1666989 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/resources/web-app_2_5.xsd webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Mar 16 13:30:34 2015
New Revision: 1666989

URL: http://svn.apache.org/r1666989
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57703
Update http-method definition as per Servlet 2.5 MR6

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 13:30:34 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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967
-/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,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,13

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

[markt]

Author: markt
Date: Mon Mar 16 13:31:35 2015
New Revision: 1666990

URL: http://svn.apache.org/r1666990
Log:
Proposal

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=1666990&r1=1666989&r2=1666990&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 16 13:31:35 2015
@@ -75,6 +75,11 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt
   -1:
 
+* Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57703
+  Update http-method definition as per Servlet 2.5 MR6
+  http://svn.apache.org/r1666989
+  +1: markt
+  -1:
 
 
 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 57703] Update http-methodType definition in web-app_2_5.xsd according with Servlet 2.5 mrel2

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Mark Thomas  ---
Fixed in trunk, 8.0.x (for 8.0.21 onwards) and 7.0.x (for 7.0.60 onwards).

Proposed for 6.0.x

-- 
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: r1666995 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[markt]

Author: markt
Date: Mon Mar 16 13:46:50 2015
New Revision: 1666995

URL: http://svn.apache.org/r1666995
Log:
Until we have a better understanding of BZ 56313, always merge regardless of OS

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1666995&r1=1666994&r2=1666995&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Mar 16 
13:46:50 2015
@@ -1920,29 +1920,27 @@ public class AprEndpoint extends Abstrac
 
 
 private int mergeDescriptors(long[] desc, int startCount) {
-if (OS.IS_BSD || OS.IS_MACOSX) {
-/*
- * Notes: Only the first startCount * 2 elements of the array
- *are populated.
- *The array is event, socket, event, socket etc.
- */
-HashMap merged = new HashMap<>(startCount);
-for (int n = 0; n < startCount; n++) {
-merged.merge(Long.valueOf(desc[2*n+1]), 
Long.valueOf(desc[2*n]),
-(v1, v2) -> Long.valueOf(v1.longValue() | 
v2.longValue()));
-}
-int i = 0;
-for (Map.Entry entry : merged.entrySet()) {
-desc[i++] = entry.getValue().longValue();
-desc[i++] = entry.getKey().longValue();
-}
-return merged.size();
-} else {
-// Other OS's do not (as far as it is known) return multiple
-// entries for the same socket when the socket is registered 
for
-// multiple events.
-return startCount;
+/*
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=57653#c6 suggests
+ * this merging is only necessary on OSX and BSD.
+ *
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=56313 suggests 
the
+ * same, or a similar, issue is happening on Windows.
+ * Notes: Only the first startCount * 2 elements of the array
+ *are populated.
+ *The array is event, socket, event, socket etc.
+ */
+HashMap merged = new HashMap<>(startCount);
+for (int n = 0; n < startCount; n++) {
+merged.merge(Long.valueOf(desc[2*n+1]), 
Long.valueOf(desc[2*n]),
+(v1, v2) -> Long.valueOf(v1.longValue() | 
v2.longValue()));
 }
+int i = 0;
+for (Map.Entry entry : merged.entrySet()) {
+desc[i++] = entry.getValue().longValue();
+desc[i++] = entry.getKey().longValue();
+}
+return merged.size();
 }
 }
 



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

svn commit: r1666997 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java LocalStrings.properties

[markt]

Author: markt
Date: Mon Mar 16 13:51:33 2015
New Revision: 1666997

URL: http://svn.apache.org/r1666997
Log:
Add debug logging for poller event merge

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1666997&r1=1666996&r2=1666997&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Mar 16 
13:51:33 2015
@@ -1932,8 +1932,14 @@ public class AprEndpoint extends Abstrac
  */
 HashMap merged = new HashMap<>(startCount);
 for (int n = 0; n < startCount; n++) {
-merged.merge(Long.valueOf(desc[2*n+1]), 
Long.valueOf(desc[2*n]),
+Long newValue = merged.merge(Long.valueOf(desc[2*n+1]), 
Long.valueOf(desc[2*n]),
 (v1, v2) -> Long.valueOf(v1.longValue() | 
v2.longValue()));
+if (log.isDebugEnabled()) {
+if (newValue.longValue() != desc[2*n]) {
+log.debug(sm.getString("endpoint.apr.pollMergeEvents",
+Long.valueOf(desc[2*n+1]), 
Long.valueOf(desc[2*n]), newValue));
+}
+}
 }
 int i = 0;
 for (Map.Entry entry : merged.entrySet()) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1666997&r1=1666996&r2=1666997&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon 
Mar 16 13:51:33 2015
@@ -65,6 +65,7 @@ endpoint.apr.noSendfileWithSSL=Sendfile
 endpoint.apr.noSslCertFile=Connector attribute SSLCertificateFile must be 
defined when using SSL with APR
 endpoint.apr.pollAddInvalid=Invalid attempted to add a socket [{0}] to the 
poller
 endpoint.apr.pollError=Poller failed with error [{0}] : [{1}]
+endpoint.apr.pollMergeEvents=Merge poller events [{1}] and [{2}] for socket 
[{0}]
 endpoint.apr.pollUnknownEvent=A socket was returned from the poller with an 
unrecognized event [{0}]
 endpoint.apr.remoteport=APR socket [{0}] opened with remote port [{1}]
 endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller



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

svn commit: r1666999 - /tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties

[markt]

Author: markt
Date: Mon Mar 16 13:54:06 2015
New Revision: 1666999

URL: http://svn.apache.org/r1666999
Log:
Correct message

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1666999&r1=1666998&r2=1666999&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon 
Mar 16 13:54:06 2015
@@ -65,7 +65,7 @@ endpoint.apr.noSendfileWithSSL=Sendfile
 endpoint.apr.noSslCertFile=Connector attribute SSLCertificateFile must be 
defined when using SSL with APR
 endpoint.apr.pollAddInvalid=Invalid attempted to add a socket [{0}] to the 
poller
 endpoint.apr.pollError=Poller failed with error [{0}] : [{1}]
-endpoint.apr.pollMergeEvents=Merge poller events [{1}] and [{2}] for socket 
[{0}]
+endpoint.apr.pollMergeEvents=Merge poller event [{1}] for socket [{0}] to 
create merged event [{2}]
 endpoint.apr.pollUnknownEvent=A socket was returned from the poller with an 
unrecognized event [{0}]
 endpoint.apr.remoteport=APR socket [{0}] opened with remote port [{1}]
 endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller



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

svn commit: r1667000 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/res/LocalStrings.properties

[markt]

Author: markt
Date: Mon Mar 16 13:56:08 2015
New Revision: 1667000

URL: http://svn.apache.org/r1667000
Log:
Until we have a better understanding of BZ 56313, always merge regardless of OS
Add some debug logging for event merges.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 13:56:08 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,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,1663324,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,137,1
 49,1666757,1666966,1666972,1666985
+/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,164

[Bug 57653] APR/native crash during HTTP upgrade

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #11 from Mark Thomas  ---
This has been fixed for Tomcat 8.0.21 and tc-native 1.1.33 onwards. i.e. you
need at least these versions of both components to avoid this bug.

It would be helpful if folks experiencing these issues on platforms other than
OSX and BSD installed the above versions (when available) and enabled debug
logging for AprEndpoint and reported any poller event merge messages that are
logged.

-- 
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: r1667010 - /tomcat/native/branches/1.1.x/java/org/apache/tomcat/

[markt]

Author: markt
Date: Mon Mar 16 14:17:59 2015
New Revision: 1667010

URL: http://svn.apache.org/r1667010
Log:
Update external to pick up fixes

Modified:
tomcat/native/branches/1.1.x/java/org/apache/tomcat/   (props changed)

Propchange: tomcat/native/branches/1.1.x/java/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Mon Mar 16 14:17:59 2015
@@ -1 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/jni@1632988 jni
+^/tomcat/trunk/java/org/apache/tomcat/jni@1659384 jni



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

[Bug 57715] New: Finding security constraints can fail when HTTP methods are specified

[bugzilla]

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

Bug ID: 57715
   Summary: Finding security constraints can fail when HTTP
methods are specified
   Product: Tomcat 9
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: marklundb...@gmail.com

Created attachment 32576
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=32576&action=edit
Unit test to demonstrate the problem and a fix to the RealmBase

Finding security constraints can fail when HTTP methods are specified.  When
HTTP methods are defined in the security constraints, the
RealmBase.findSecurityConstraints() method can terminate early without adding a
constraint to the results.

A simple case that demonstrates this problem is to define security constraints
such that the entire web site requires authentication.  Then add one additional
constraint that allows the GET HTTP method for a specific URL to bypass
authentication:



Authenticated Access

Restricted Access
/*



*





Unauthenticated Public Access


PublicSOAPWsdlURLs
/services/*

GET




If an HTTP POST request is sent to the /service/foo uri, the
findSecurityConstraints() method matches the ‘/service/*’ URL and flags the
search status as having found a match. However, when the HTTP method is
examined it is found not to match and the security constraint is not added to
the results. Even though the HTTP method didn’t match, the search was still
flagged as finding a match and the search is terminated, returning zero
constraints. This allows the POST request to proceed without authentication.

A patch is attached that includes a unit test to demonstrate the problem and a
fix to the RealmBase.

-- 
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: r1667016 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Mon Mar 16 14:36:15 2015
New Revision: 1667016

URL: http://svn.apache.org/r1667016
Log:
Add missing entries to changelog

Modified:
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1667016&r1=1667015&r2=1667016&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Mar 16 
14:36:15 2015
@@ -42,6 +42,21 @@
   Fix compilation failures with master branch of OpenSSL. Replace access
   to OpenSSL internals by accessor functions. (rjung/kkolinko)
 
+
+  Fix a zero-boundary-check compiler warning and simplify code in the
+  process. (rjung)
+
+
+  Remove superfluous semicolons after close-braces to eliminate compiler
+  warnings. (cshultz)
+
+
+  57653: Fix crash when multiple events for same socket are
+  returned via separate apr_pollfd_t structures. (markt)
+
+
+  Enable building with OpenSSL 1.0.2 onwards. (billbarker)
+
   
 
 



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

Re: Is it mandatory to create a bug to submit a patch (minor spell changes in the code comments)

[Raghavendran N]

Thank you Mark. I will send the patch in a separate email to this list.
-raghav

On Mon, Mar 16, 2015 at 3:00 PM, Mark Thomas  wrote:

> On 16/03/2015 03:42, Raghavendran N wrote:
> > Team,
> > Is it mandatory to create a bug to submit a patch?
>
> No. Very simple patches can be posted in-line (in diff-u format) in an
> e-mail to the dev list. Note that if it isn't picked up straight away
> (the same day) then there is a risk that it gets forgotten.
>
> We also accept patches via github pull requests.
>
> The advantage of creating a Bugzilla entry is that the patch won't get
> forgotten. Not that isn't the same as the patch being acted on instantly.
>
> > I have made a very minor
> > change (corrected a sentence in a comment) towards my first patch.
>
> For trivial patches (no more than a couple of lines), I'd suggest just
> sending them in-line to this list. Anything bigger than that should have
> a bugzilla entry.
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[Bug 57715] Finding security constraints can fail when HTTP methods are specified

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
See the section in the servlet spec on uncovered HTTP methods.

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

[patch] WsServerContainer.java on trunk

[Raghavendran N]

diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index d2c824c..a663e8e 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -166,7 +166,7 @@ public class WsServerContainer extends
WsWebSocketContainer
  * must be called before calling this method.
  *
  * @param sec   The configuration to use when creating endpoint
instances
- * @throws DeploymentException if the endpoint can not be published as
+ * @throws DeploymentException if the endpoint cannot be published as
  * requested
  */
 @Override

[Tomcat Wiki] Update of "BuildTcNativeWin" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "BuildTcNativeWin" page has been changed by markt:
https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=28&rev2=29

Comment:
OpenSSL 1.0.1j -> 1.0.1l

  
  cd ..\openssl
  }}}
- Unpack the OpenSSL 1.0.1j source distribution in this directory 
({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
+ Unpack the OpenSSL 1.0.1l source distribution in this directory 
({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
  
  Apply openssl-msvcrt.patch
  {{{
@@ -102, +102 @@

  
  mkdir \deps-x86\apr-1.5.1\include
  mkdir \deps-x86\apr-1.5.1\lib
- mkdir \deps-x86\openssl-1.0.1j\include
+ mkdir \deps-x86\openssl-1.0.1l\include
- mkdir \deps-x86\openssl-1.0.1j\lib
+ mkdir \deps-x86\openssl-1.0.1l\lib
  xcopy /E \deps-x86 \deps-x64\
  xcopy /E \deps-x86 \deps-i64\
  
@@ -115, +115 @@

  copy apr\WINXP_X64_LIB_RELEASE\apr-1.lib \deps-x64\apr-1.5.1\lib
  copy apr\WINXP_I64_LIB_RELEASE\apr-1.lib \deps-i64\apr-1.5.1\lib
  
- xcopy /E openssl\inc32 \deps-x86\openssl-1.0.1j\include\
+ xcopy /E openssl\inc32 \deps-x86\openssl-1.0.1l\include\
- xcopy /E openssl\inc32 \deps-x64\openssl-1.0.1j\include\
+ xcopy /E openssl\inc32 \deps-x64\openssl-1.0.1l\include\
- xcopy /E openssl\inc32 \deps-i64\openssl-1.0.1j\include\
+ xcopy /E openssl\inc32 \deps-i64\openssl-1.0.1l\include\
  
- copy openssl\out32-x86\*.lib \deps-x86\openssl-1.0.1j\lib\
+ copy openssl\out32-x86\*.lib \deps-x86\openssl-1.0.1l\lib\
- copy openssl\out32-x64\*.lib \deps-x64\openssl-1.0.1j\lib\
+ copy openssl\out32-x64\*.lib \deps-x64\openssl-1.0.1l\lib\
- copy openssl\out32-i64\*.lib \deps-i64\openssl-1.0.1j\lib\
+ copy openssl\out32-i64\*.lib \deps-i64\openssl-1.0.1l\lib\
  
  cd ..
  SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_71
  
  c:\cmsc\setenv.bat /x86
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
  move WINXP_X86_DLL_RELEASE WINXP_X86_OCSP_DLL_RELEASE
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1j APR_DECLARE_STATIC=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1l APR_DECLARE_STATIC=1
  
  c:\cmsc\setenv.bat /x64
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
  move WINXP_X64_DLL_RELEASE WINXP_X64_OCSP_DLL_RELEASE
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1j APR_DECLARE_STATIC=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1l APR_DECLARE_STATIC=1
  
  c:\cmsc\setenv.bat /i64
- nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
  move WINXP_I64_DLL_RELEASE WINXP_I64_OCSP_DLL_RELEASE
- nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1j APR_DECLARE_STATIC=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1l APR_DECLARE_STATIC=1
  }}}
  Tomcat Native Connector DLLs may then be found in 
C:\tomcat-native-1.1.x\native\WINXP_*_[OCSP_]DLL_RELEASE
  

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

[Bug 57653] APR/native crash during HTTP upgrade

[bugzilla]

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

--- Comment #12 from Pavel  ---
where can I download from the new version of tomcat and the dll? do I need to
compile it myself?

-- 
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: r1667023 - in /tomcat/native/branches/1.1.x: native/srclib/VERSIONS xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Mon Mar 16 14:58:59 2015
New Revision: 1667023

URL: http://svn.apache.org/r1667023
Log:
Update preferred OpenSSL version

Modified:
tomcat/native/branches/1.1.x/native/srclib/VERSIONS
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/VERSIONS?rev=1667023&r1=1667022&r2=1667023&view=diff
==
--- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original)
+++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Mon Mar 16 14:58:59 2015
@@ -1,4 +1,4 @@
 Use the following version of the libraries
 
 - APR 1.5.1, http://apr.apache.org
-- OpenSSL 1.0.1j, http://www.openssl.org
+- OpenSSL 1.0.1l, http://www.openssl.org

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1667023&r1=1667022&r2=1667023&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Mar 16 
14:58:59 2015
@@ -57,6 +57,9 @@
 
   Enable building with OpenSSL 1.0.2 onwards. (billbarker)
 
+
+  Use OpenSSL 1.0.1l with Windows binaries. (markt)
+
   
 
 



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

[Bug 57653] APR/native crash during HTTP upgrade

[bugzilla]

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

--- Comment #13 from Mark Thomas  ---
(In reply to Pavel from comment #12)
> where can I download from the new version of tomcat and the dll? do I need
> to compile it myself?

I'm working on the tc-native 1.1.33 release at the moment. A release candidate
will hopefully be available for testing later today (otherwise tomorrow). Keep
an eye on the dev list for details.

A 8.0.21 release will follow once we have a successful 1.1.33 release.

-- 
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: r1667025 - in /tomcat/tags/TOMCAT_NATIVE_1_1_33: ./ native/include/tcn_version.h

[markt]

Author: markt
Date: Mon Mar 16 15:05:36 2015
New Revision: 1667025

URL: http://svn.apache.org/r1667025
Log:
Tag 1.1.33

Added:
tomcat/tags/TOMCAT_NATIVE_1_1_33/   (props changed)
  - copied from r1667024, tomcat/native/branches/1.1.x/
Modified:
tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h

Propchange: tomcat/tags/TOMCAT_NATIVE_1_1_33/
--
--- svn:ignore (added)
+++ svn:ignore Mon Mar 16 15:05:36 2015
@@ -0,0 +1 @@
+dist

Propchange: tomcat/tags/TOMCAT_NATIVE_1_1_33/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 15:05:36 2015
@@ -0,0 +1,3 @@
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724
+/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
+/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083

Modified: tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h?rev=1667025&r1=1667024&r2=1667025&view=diff
==
--- tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h (original)
+++ tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h Mon Mar 16 
15:05:36 2015
@@ -75,7 +75,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: r1667026 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Mon Mar 16 15:06:13 2015
New Revision: 1667026

URL: http://svn.apache.org/r1667026
Log:
Fix typo.

Modified:
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1667026&r1=1667025&r2=1667026&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Mar 16 
15:06:13 2015
@@ -48,7 +48,7 @@
 
 
   Remove superfluous semicolons after close-braces to eliminate compiler
-  warnings. (cshultz)
+  warnings. (schultz)
 
 
   57653: Fix crash when multiple events for same socket are



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

svn commit: r1667027 - in /tomcat: native/tags/TOMCAT_NATIVE_1_1_33/ tags/TOMCAT_NATIVE_1_1_33/

[markt]

Author: markt
Date: Mon Mar 16 15:08:30 2015
New Revision: 1667027

URL: http://svn.apache.org/r1667027
Log:
Correct location

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_1_33/   (props changed)
  - copied from r1667026, tomcat/tags/TOMCAT_NATIVE_1_1_33/
Removed:
tomcat/tags/TOMCAT_NATIVE_1_1_33/

Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_33/
--
--- svn:ignore (added)
+++ svn:ignore Mon Mar 16 15:08:30 2015
@@ -0,0 +1 @@
+dist

Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_33/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 15:08:30 2015
@@ -0,0 +1,3 @@
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724
+/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
+/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083



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

svn commit: r1667028 - /tomcat/native/tags/TOMCAT_NATIVE_1_1_33/

[markt]

Author: markt
Date: Mon Mar 16 15:09:23 2015
New Revision: 1667028

URL: http://svn.apache.org/r1667028
Log:
Need to pick up typo fix

Removed:
tomcat/native/tags/TOMCAT_NATIVE_1_1_33/


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

svn commit: r1667029 - in /tomcat/native/tags/TOMCAT_NATIVE_1_1_33: ./ native/include/tcn_version.h

[markt]

Author: markt
Date: Mon Mar 16 15:09:38 2015
New Revision: 1667029

URL: http://svn.apache.org/r1667029
Log:
Tag 1.1.33

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_1_33/   (props changed)
  - copied from r1667027, tomcat/native/branches/1.1.x/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h

Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_33/
--
--- svn:ignore (added)
+++ svn:ignore Mon Mar 16 15:09:38 2015
@@ -0,0 +1 @@
+dist

Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_33/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 16 15:09:38 2015
@@ -0,0 +1,3 @@
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724
+/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
+/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h?rev=1667029&r1=1667027&r2=1667029&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h Mon 
Mar 16 15:09:38 2015
@@ -75,7 +75,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: r1667048 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/a

[markt]

Author: markt
Date: Mon Mar 16 15:55:56 2015
New Revision: 1667048

URL: http://svn.apache.org/r1667048
Log:
s/can not/cannot/

Modified:
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/tribes/Channel.java

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java

tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/realm.xml
tomcat/trunk/webapps/docs/config/valve.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/trunk/webapps/docs/realm-howto.xml

Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Mon Mar 16 
15:55:56 2015
@@ -55,7 +55,7 @@ public interface WebSocketContainer {
  *
  * @return The WebSocket session for the connection
  *
- * @throws DeploymentException  If the connection can not be established
+ * @throws DeploymentException  If the connection cannot be established
  * @throws IOException If an I/O occurred while trying to establish the
  * connection
  */
@@ -76,7 +76,7 @@ public interface WebSocketContainer {
  *
  * @return The WebSocket session for the connection
  *
- * @throws DeploymentException  If the connection can not be established
+ * @throws DeploymentException  If the connection cannot be established
  * @throws IOException If an I/O occurred while trying to establish the
  * connection
  */

Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Mon Mar 16 15:55:56 2015
@@ -136,7 +136,7 @@ public interface Wrapper extends Contain
  * @return Array of names of the methods supported by the underlying
  * servlet
  *
- * @throws ServletException If the target servlet can not be loaded
+ * @throws ServletException If the target servlet cannot be loaded
  */
 public String[] getServletMethods() throws ServletException;
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Mar 
16 15:55:56 2015
@@ -570,7 +570,7 @@ public class CoyoteAdapter implements

Re: [patch] WsServerContainer.java on trunk

[Mark Thomas]

On 16/03/2015 14:50, Raghavendran N wrote:
> diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
> b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
> index d2c824c..a663e8e 100644
> --- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
> +++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
> @@ -166,7 +166,7 @@ public class WsServerContainer extends
> WsWebSocketContainer
>   * must be called before calling this method.
>   *
>   * @param sec   The configuration to use when creating endpoint
> instances
> - * @throws DeploymentException if the endpoint can not be published as
> + * @throws DeploymentException if the endpoint cannot be published as
>   * requested
>   */
>  @Override
> 

Both are technically correct. Which to use is a style choice although
cannot is certainly the more common.

There were rather more instances than the one you highlighted. I have no
string preference for one over the other so I did a global search and
replace for 9.0.x.

Personally, I don't think it is worth back-porting. If someone wants to
do that work, got for it.

Mark

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

[Tomcat Wiki] Update of "BuildTcNativeWin" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "BuildTcNativeWin" page has been changed by markt:
https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=29&rev2=30

Comment:
Update tc-native version

  
  Construct the binary distributions
  {{{
- set VER=1.1.32
+ set VER=1.1.33
  mkdir tomcat-native-%VER%-win32-bin
  copy ..\LICENSE tomcat-native-%VER%-win32-bin\
  copy ..\NOTICE tomcat-native-%VER%-win32-bin\

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

Re: Is it mandatory to create a bug to submit a patch (minor spell changes in the code comments)

[Konstantin Kolinko]

2015-03-16 12:30 GMT+03:00 Mark Thomas :
> On 16/03/2015 03:42, Raghavendran N wrote:
>> Team,
>> Is it mandatory to create a bug to submit a patch?
>
> No. Very simple patches can be posted in-line (in diff-u format) in an
> e-mail to the dev list. Note that if it isn't picked up straight away
> (the same day) then there is a risk that it gets forgotten.
>
> We also accept patches via github pull requests.
>
> The advantage of creating a Bugzilla entry is that the patch won't get
> forgotten. Not that isn't the same as the patch being acted on instantly.
>
>> I have made a very minor
>> change (corrected a sentence in a comment) towards my first patch.
>
> For trivial patches (no more than a couple of lines), I'd suggest just
> sending them in-line to this list. Anything bigger than that should have
> a bugzilla entry.
>


1. If something deserves a line in changelog, it is better to create
an issue in Bugzilla.

Try to read the changelog by yourself.  Items that do not have a
bugzilla number are harder to follow.

I think that pull requests need a bugzilla entry as well.

2. Mailing list rules:
http://tomcat.apache.org/lists.html#tomcat-users
- No attachments
- Do not top-post.

Best regards,
Konstantin Kolinko

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

Re: Tomcat native 1.1.33 release

[Rainer Jung]

Am 13.03.2015 um 12:17 schrieb Mark Thomas:

On 12/03/2015 19:09, Christopher Schultz wrote:

Konstantin,

On 3/12/15 2:22 PM, Konstantin Kolinko wrote:

2015-03-12 18:59 GMT+03:00 Rainer Jung :

Am 12.03.2015 um 14:04 schrieb Mark Thomas:


Given bug 57653 [1], the next 8.0.x release (which is already over due
from when I wanted to get it out) is going to need a new Tomcat native
release. This would also be an opportunity to update the OpenSSl
dependency in the Windows binaries.

One question is whether Tomcat native should switch to the 1.0.2 branch
or stick with 1.0.1. Thoughts?



A related question: when moving forward it would be easier if we could
require 0.9.8 as the minimum supported version so we could try to
(partially) stay in sync with mod_ssl. I'd say 0.9.8 (min) is fine, people
able to build tcnative themselves should be in a position to use a still
maintained version of OpenSSL and not rely on 0.9.7 (our current minimum
version).




Note that their January security announcement [1] mentions that
OpenSSL 0.9.8 and 1.0.0 are both approaching an EOL:

[1] https://www.openssl.org/news/secadv_20150108.txt

[quote]
As per our previous announcements and our Release Strategy
(https://www.openssl.org/about/releasestrat.html), support for OpenSSL versions
1.0.0 and 0.9.8 will cease on 31st December 2015. No security updates for these
releases will be provided after that date. Users of these releases are advised
to upgrade.
[/quote]


Perhaps we should add a warning to tcnative if it detects an OpenSSL
less than 1.0.1. Just a warning, at least for now. When 0.9.8 and 1.0.0
both go EOL, we can bump-up the required version in tcnative to 1.0.1
(at least).


1.0.2 would be better if it provides some additional ciphers, for
better security options. I agree that we would better wait a bit for
1.0.2a, b, or c.


We should definitely /support/ 1.0.2 (which I believe we do), but
OpenSSL is the kind of library that we probably want to let others beta
test first :)


So...

Stick with building with 1.0.1 for now.
No takers for doing the release - I'll start this today.


Just for information: the OpenSSL project has published an announcement 
this evening:


== 8>< 

Forthcoming OpenSSL releases


The OpenSSL project team would like to announce the forthcoming release
of OpenSSL versions 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf.

These releases will be made available on 19th March. They will fix a
number of security defects. The highest severity defect fixed by these
releases is classified as "high" severity.

== 8>< 

So that means 1.0.1l will be outdated in 4 days. We don't know yet, 
whether the security issues apply to tcnative, so I don't have a strong 
suggestion whether to better proceed and get this tcnative release done 
or wait another 3 days for 1.0.1m. But I wanted to let you know, that a 
new OpenSSL release is expected.


Regards,

Rainer

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

Re: [Tomcat Wiki] Update of "BuildTcNativeWin" by markt

[Christopher Schultz]

Mark,

On 3/16/15 10:57 AM, Apache Wiki wrote:
> Dear Wiki user,
> 
> You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for 
> change notification.
> 
> The "BuildTcNativeWin" page has been changed by markt:
> https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=28&rev2=29
> 
> Comment:
> OpenSSL 1.0.1j -> 1.0.1l
> 
>   
>   cd ..\openssl
>   }}}
> - Unpack the OpenSSL 1.0.1j source distribution in this directory 
> ({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
> + Unpack the OpenSSL 1.0.1l source distribution in this directory 
> ({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
>   
>   Apply openssl-msvcrt.patch
>   {{{
> @@ -102, +102 @@
> 
>   
>   mkdir \deps-x86\apr-1.5.1\include
>   mkdir \deps-x86\apr-1.5.1\lib
> - mkdir \deps-x86\openssl-1.0.1j\include
> + mkdir \deps-x86\openssl-1.0.1l\include
> - mkdir \deps-x86\openssl-1.0.1j\lib
> + mkdir \deps-x86\openssl-1.0.1l\lib
>   xcopy /E \deps-x86 \deps-x64\
>   xcopy /E \deps-x86 \deps-i64\
>   
> @@ -115, +115 @@
> 
>   copy apr\WINXP_X64_LIB_RELEASE\apr-1.lib \deps-x64\apr-1.5.1\lib
>   copy apr\WINXP_I64_LIB_RELEASE\apr-1.lib \deps-i64\apr-1.5.1\lib
>   
> - xcopy /E openssl\inc32 \deps-x86\openssl-1.0.1j\include\
> + xcopy /E openssl\inc32 \deps-x86\openssl-1.0.1l\include\
> - xcopy /E openssl\inc32 \deps-x64\openssl-1.0.1j\include\
> + xcopy /E openssl\inc32 \deps-x64\openssl-1.0.1l\include\
> - xcopy /E openssl\inc32 \deps-i64\openssl-1.0.1j\include\
> + xcopy /E openssl\inc32 \deps-i64\openssl-1.0.1l\include\
>   
> - copy openssl\out32-x86\*.lib \deps-x86\openssl-1.0.1j\lib\
> + copy openssl\out32-x86\*.lib \deps-x86\openssl-1.0.1l\lib\
> - copy openssl\out32-x64\*.lib \deps-x64\openssl-1.0.1j\lib\
> + copy openssl\out32-x64\*.lib \deps-x64\openssl-1.0.1l\lib\
> - copy openssl\out32-i64\*.lib \deps-i64\openssl-1.0.1j\lib\
> + copy openssl\out32-i64\*.lib \deps-i64\openssl-1.0.1l\lib\
>   
>   cd ..
>   SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_71
>   
>   c:\cmsc\setenv.bat /x86
> - nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
> WITH_OPENSSL=C:\deps-x86\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
> + nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
> WITH_OPENSSL=C:\deps-x86\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>   move WINXP_X86_DLL_RELEASE WINXP_X86_OCSP_DLL_RELEASE
> - nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
> WITH_OPENSSL=C:\deps-x86\openssl-1.0.1j APR_DECLARE_STATIC=1
> + nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
> WITH_OPENSSL=C:\deps-x86\openssl-1.0.1l APR_DECLARE_STATIC=1
>   
>   c:\cmsc\setenv.bat /x64
> - nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
> WITH_OPENSSL=C:\deps-x64\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
> + nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
> WITH_OPENSSL=C:\deps-x64\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>   move WINXP_X64_DLL_RELEASE WINXP_X64_OCSP_DLL_RELEASE
> - nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
> WITH_OPENSSL=C:\deps-x64\openssl-1.0.1j APR_DECLARE_STATIC=1
> + nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
> WITH_OPENSSL=C:\deps-x64\openssl-1.0.1l APR_DECLARE_STATIC=1
>   
>   c:\cmsc\setenv.bat /i64
> - nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
> WITH_OPENSSL=C:\deps-i64\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
> + nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
> WITH_OPENSSL=C:\deps-i64\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>   move WINXP_I64_DLL_RELEASE WINXP_I64_OCSP_DLL_RELEASE
> - nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
> WITH_OPENSSL=C:\deps-i64\openssl-1.0.1j APR_DECLARE_STATIC=1
> + nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
> WITH_OPENSSL=C:\deps-i64\openssl-1.0.1l APR_DECLARE_STATIC=1
>   }}}
>   Tomcat Native Connector DLLs may then be found in 
> C:\tomcat-native-1.1.x\native\WINXP_*_[OCSP_]DLL_RELEASE
>   
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 

Any interest in just making this into a batch (or powershell?) script?

That's what I was working a while back, and my script would fetch the
dependencies like APR, etc. and was easily configurable by setting
environment variables for the various versions, etc.

-chris



signature.asc
Description: OpenPGP digital signature

Re: [Tomcat Wiki] Update of "BuildTcNativeWin" by markt

[Mark Thomas]

On 16/03/2015 20:19, Christopher Schultz wrote:
> Mark,
> 
> On 3/16/15 10:57 AM, Apache Wiki wrote:
>> Dear Wiki user,
>>
>> You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for 
>> change notification.
>>
>> The "BuildTcNativeWin" page has been changed by markt:
>> https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=28&rev2=29
>>
>> Comment:
>> OpenSSL 1.0.1j -> 1.0.1l
>>
>>   
>>   cd ..\openssl
>>   }}}
>> - Unpack the OpenSSL 1.0.1j source distribution in this directory 
>> ({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
>> + Unpack the OpenSSL 1.0.1l source distribution in this directory 
>> ({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
>>   
>>   Apply openssl-msvcrt.patch
>>   {{{
>> @@ -102, +102 @@
>>
>>   
>>   mkdir \deps-x86\apr-1.5.1\include
>>   mkdir \deps-x86\apr-1.5.1\lib
>> - mkdir \deps-x86\openssl-1.0.1j\include
>> + mkdir \deps-x86\openssl-1.0.1l\include
>> - mkdir \deps-x86\openssl-1.0.1j\lib
>> + mkdir \deps-x86\openssl-1.0.1l\lib
>>   xcopy /E \deps-x86 \deps-x64\
>>   xcopy /E \deps-x86 \deps-i64\
>>   
>> @@ -115, +115 @@
>>
>>   copy apr\WINXP_X64_LIB_RELEASE\apr-1.lib \deps-x64\apr-1.5.1\lib
>>   copy apr\WINXP_I64_LIB_RELEASE\apr-1.lib \deps-i64\apr-1.5.1\lib
>>   
>> - xcopy /E openssl\inc32 \deps-x86\openssl-1.0.1j\include\
>> + xcopy /E openssl\inc32 \deps-x86\openssl-1.0.1l\include\
>> - xcopy /E openssl\inc32 \deps-x64\openssl-1.0.1j\include\
>> + xcopy /E openssl\inc32 \deps-x64\openssl-1.0.1l\include\
>> - xcopy /E openssl\inc32 \deps-i64\openssl-1.0.1j\include\
>> + xcopy /E openssl\inc32 \deps-i64\openssl-1.0.1l\include\
>>   
>> - copy openssl\out32-x86\*.lib \deps-x86\openssl-1.0.1j\lib\
>> + copy openssl\out32-x86\*.lib \deps-x86\openssl-1.0.1l\lib\
>> - copy openssl\out32-x64\*.lib \deps-x64\openssl-1.0.1j\lib\
>> + copy openssl\out32-x64\*.lib \deps-x64\openssl-1.0.1l\lib\
>> - copy openssl\out32-i64\*.lib \deps-i64\openssl-1.0.1j\lib\
>> + copy openssl\out32-i64\*.lib \deps-i64\openssl-1.0.1l\lib\
>>   
>>   cd ..
>>   SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_71
>>   
>>   c:\cmsc\setenv.bat /x86
>> - nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-x86\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>> + nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-x86\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>>   move WINXP_X86_DLL_RELEASE WINXP_X86_OCSP_DLL_RELEASE
>> - nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-x86\openssl-1.0.1j APR_DECLARE_STATIC=1
>> + nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-x86\openssl-1.0.1l APR_DECLARE_STATIC=1
>>   
>>   c:\cmsc\setenv.bat /x64
>> - nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-x64\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>> + nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-x64\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>>   move WINXP_X64_DLL_RELEASE WINXP_X64_OCSP_DLL_RELEASE
>> - nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-x64\openssl-1.0.1j APR_DECLARE_STATIC=1
>> + nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-x64\openssl-1.0.1l APR_DECLARE_STATIC=1
>>   
>>   c:\cmsc\setenv.bat /i64
>> - nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-i64\openssl-1.0.1j APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>> + nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-i64\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
>>   move WINXP_I64_DLL_RELEASE WINXP_I64_OCSP_DLL_RELEASE
>> - nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-i64\openssl-1.0.1j APR_DECLARE_STATIC=1
>> + nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1 
>> WITH_OPENSSL=C:\deps-i64\openssl-1.0.1l APR_DECLARE_STATIC=1
>>   }}}
>>   Tomcat Native Connector DLLs may then be found in 
>> C:\tomcat-native-1.1.x\native\WINXP_*_[OCSP_]DLL_RELEASE
>>   
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
> 
> Any interest in just making this into a batch (or powershell?) script?
> 
> That's what I was working a while back, and my script would fetch the
> dependencies like APR, etc. and was easily configurable by setting
> environment variables for the various versions, etc.

+0. It isn't annoying me enough to want to script it all (yet) but I'm
not going to complain if someone else does wants to do the work.

Mark


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

Re: Tomcat native 1.1.33 release

[Mark Thomas]

On 16/03/2015 20:17, Rainer Jung wrote:
> Am 13.03.2015 um 12:17 schrieb Mark Thomas:
>> On 12/03/2015 19:09, Christopher Schultz wrote:
>>> Konstantin,
>>>
>>> On 3/12/15 2:22 PM, Konstantin Kolinko wrote:
 2015-03-12 18:59 GMT+03:00 Rainer Jung :
> Am 12.03.2015 um 14:04 schrieb Mark Thomas:
>>
>> Given bug 57653 [1], the next 8.0.x release (which is already over
>> due
>> from when I wanted to get it out) is going to need a new Tomcat
>> native
>> release. This would also be an opportunity to update the OpenSSl
>> dependency in the Windows binaries.
>>
>> One question is whether Tomcat native should switch to the 1.0.2
>> branch
>> or stick with 1.0.1. Thoughts?
>
>
> A related question: when moving forward it would be easier if we could
> require 0.9.8 as the minimum supported version so we could try to
> (partially) stay in sync with mod_ssl. I'd say 0.9.8 (min) is fine,
> people
> able to build tcnative themselves should be in a position to use a
> still
> maintained version of OpenSSL and not rely on 0.9.7 (our current
> minimum
> version).
>


 Note that their January security announcement [1] mentions that
 OpenSSL 0.9.8 and 1.0.0 are both approaching an EOL:

 [1] https://www.openssl.org/news/secadv_20150108.txt

 [quote]
 As per our previous announcements and our Release Strategy
 (https://www.openssl.org/about/releasestrat.html), support for
 OpenSSL versions
 1.0.0 and 0.9.8 will cease on 31st December 2015. No security
 updates for these
 releases will be provided after that date. Users of these releases
 are advised
 to upgrade.
 [/quote]
>>>
>>> Perhaps we should add a warning to tcnative if it detects an OpenSSL
>>> less than 1.0.1. Just a warning, at least for now. When 0.9.8 and 1.0.0
>>> both go EOL, we can bump-up the required version in tcnative to 1.0.1
>>> (at least).
>>>
 1.0.2 would be better if it provides some additional ciphers, for
 better security options. I agree that we would better wait a bit for
 1.0.2a, b, or c.
>>>
>>> We should definitely /support/ 1.0.2 (which I believe we do), but
>>> OpenSSL is the kind of library that we probably want to let others beta
>>> test first :)
>>
>> So...
>>
>> Stick with building with 1.0.1 for now.
>> No takers for doing the release - I'll start this today.
> 
> Just for information: the OpenSSL project has published an announcement
> this evening:
> 
> == 8>< 
> 
> Forthcoming OpenSSL releases
> 
> 
> The OpenSSL project team would like to announce the forthcoming release
> of OpenSSL versions 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf.
> 
> These releases will be made available on 19th March. They will fix a
> number of security defects. The highest severity defect fixed by these
> releases is classified as "high" severity.
> 
> == 8>< 
> 
> So that means 1.0.1l will be outdated in 4 days. We don't know yet,
> whether the security issues apply to tcnative, so I don't have a strong
> suggestion whether to better proceed and get this tcnative release done
> or wait another 3 days for 1.0.1m. But I wanted to let you know, that a
> new OpenSSL release is expected.

I think we have to wait.

I'll finish my various local checks but not go as far as uploading the
RC for voting.

I'll drop the 1.1.33 tag at some point as well.

Mark


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

svn commit: r1667124 - /tomcat/native/tags/TOMCAT_NATIVE_1_1_33/

[markt]

Author: markt
Date: Mon Mar 16 20:35:56 2015
New Revision: 1667124

URL: http://svn.apache.org/r1667124
Log:
Need to update OpenSSL version

Removed:
tomcat/native/tags/TOMCAT_NATIVE_1_1_33/


-
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



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: 53 mins 56 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-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-20150316/bin/o
 penssl -Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/gump/pub

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

[schultz]

Author: schultz
Date: Mon Mar 16 21:34:29 2015
New Revision: 1667135

URL: http://svn.apache.org/r1667135
Log:
Votes

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=1667135&r1=1667134&r2=1667135&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 16 21:34:29 2015
@@ -59,13 +59,13 @@ PATCHES PROPOSED TO BACKPORT:
   Also prevent multiple changes at the same time triggering multiple reloads
   rather than just one
   http://people.apache.org/~markt/patches/2015-03-05-bug56608-tc6-v1.patch
-  +1: markt
+  +1: markt, schultz
   -1:
 
 * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57675
   Correctly quote strings when using the extended access log
   http://svn.apache.org/r1665087
-  +1: markt
+  +1: markt, schultz
   -1:
 
 * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57570
@@ -78,7 +78,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57703
   Update http-method definition as per Servlet 2.5 MR6
   http://svn.apache.org/r1666989
-  +1: markt
+  +1: markt, schultz
   -1:
 
 



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



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: 53 mins 57 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-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-20150316/bin
 /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.

Re: svn commit: r1665888 - /tomcat/native/branches/1.1.x/native/src/poll.c

[Konstantin Kolinko]

2015-03-11 17:44 GMT+03:00  :
> Author: markt
> Date: Wed Mar 11 14:44:23 2015
> New Revision: 1665888
>
> URL: http://svn.apache.org/r1665888
> Log:
> Fix 57653. Crash when multiple events for same socket are returned via 
> separate apr_pollfd_t structures
>
> Modified:
> tomcat/native/branches/1.1.x/native/src/poll.c
>
> Modified: tomcat/native/branches/1.1.x/native/src/poll.c
> URL: 
> http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1665888&r1=1665887&r2=1665888&view=diff
> ==
> --- tomcat/native/branches/1.1.x/native/src/poll.c (original)
> +++ tomcat/native/branches/1.1.x/native/src/poll.c Wed Mar 11 14:44:23 2015
> @@ -360,7 +360,13 @@ TCN_IMPLEMENT_CALL(jint, Poll, poll)(TCN
>  tcn_socket_t *s = (tcn_socket_t *)fd->client_data;
>  p->set[i*2+0] = (jlong)(fd->rtnevents);
>  p->set[i*2+1] = P2J(s);
> -if (remove) {
> +/* If a socket is registered for multiple events and the poller 
> has
> +   multiple events to return it may do as a single pair in this
> +   array or as multiple pairs depending on implementation. On 
> OSX at
> +   least, multiple pairs have been observed. In this case do not 
> try
> +   and remove socket from the pollset for a second time else a 
> crash
> +   will result. */
> +if (remove && s->pe) {
>  apr_pollset_remove(p->pollset, fd);
>  APR_RING_REMOVE(s->pe, link);
>  APR_RING_INSERT_TAIL(&p->dead_ring, s->pe, tcn_pfde_t, link);

There shall be a separate nested "if (s->pe)" block instead of
combined condition.  This "if" is followed by an "else" branch, which
is now executed in an unexpected way.

Lines 357-356 before the changed code:
if (!remove)
now = apr_time_now();

Line 379-385 the "else" branch:
else {
/* Update last active with the current time
 * after the poll call.
 */
s->last_active = now;
}

Note how "now" is uninitialized when "remove" flag is false.

Also, there is a question of porting this fix to Native trunk.

Best regards,
Konstantin Kolinko

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

[Bug 57708] [Patch] Authentication by reverse proxy, authorization by Tomcat

[bugzilla]

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

--- Comment #3 from Mark Thomas  ---
I've taken a quick look at the patch for 9.0.x. I suspect that my comments will
apply equally to the back-ports.

Overall, +1. I'd change some of the details (see below) but the general
approach looks sound.

I'm happy fixing the details when I apply the patch so no need to re-submit.

On those details:
- 'remote user' has a specific meaning in a servlet container. I think this
  needs to be changed to 'AJP authenticated user'or something similar.
- The indentation is inconsistent (it should be four spaces). Some of that is
  because the patch is trying to follow the existing code which itself is not
  very consistent. In particular, the continuation lines look odd.
- There is clearly some scope for refactoring to reduce duplication in the
  authenticators. That should be completed first.

I'm a little wary of adding a new method to Realm but, we have done that before
when the need arose and there is an implementation in RealmBase so the impact
should be minimal.

Thanks for the patch. This is on my todo list for tomorrow.

-- 
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: r1667025 - in /tomcat/tags/TOMCAT_NATIVE_1_1_33: ./ native/include/tcn_version.h

[Konstantin Kolinko]

2015-03-16 18:05 GMT+03:00  :
> Author: markt
> Date: Mon Mar 16 15:05:36 2015
> New Revision: 1667025
>
> URL: http://svn.apache.org/r1667025
> Log:
> Tag 1.1.33
>
> Added:
> tomcat/tags/TOMCAT_NATIVE_1_1_33/   (props changed)
>   - copied from r1667024, tomcat/native/branches/1.1.x/

Note that this went to a wrong location.

(I know that this tag has already been deleted by r1667124, but it
makes sense to avoid this error when re-tagging).

Expected location:
https://svn.apache.org/repos/asf/tomcat/native/tags/


> Modified:
> tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h
>
> Propchange: tomcat/tags/TOMCAT_NATIVE_1_1_33/
> --
> --- svn:ignore (added)
> +++ svn:ignore Mon Mar 16 15:05:36 2015
> @@ -0,0 +1 @@
> +dist
>
> Propchange: tomcat/tags/TOMCAT_NATIVE_1_1_33/
> --
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Mon Mar 16 15:05:36 2015
> @@ -0,0 +1,3 @@
> +/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724
> +/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
> +/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
>
> Modified: tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h
> URL: 
> http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h?rev=1667025&r1=1667024&r2=1667025&view=diff
> ==
> --- tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h (original)
> +++ tomcat/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h Mon Mar 16 
> 15:05:36 2015
> @@ -75,7 +75,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
>

-
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



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: 53 mins
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150316/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-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-20150316/bin/openssl
 -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/wo

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (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-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-tc7.0.x-test-bio :  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-bio/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-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 42 mins 35 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-20150316-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-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.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dexecute.test.nio=false -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/wo
 rkspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150316.jar
 -Dtest.temp=output/test-tmp-BIO 
-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/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/pub

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (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-nio 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-nio :  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-nio/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-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 55 mins 44 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150316.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150316-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150316/bin/op
 enssl -Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/gump/pub

svn commit: r1667166 - /tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java

[kfujino]

Author: kfujino
Date: Tue Mar 17 02:56:57 2015
New Revision: 1667166

URL: http://svn.apache.org/r1667166
Log:
Add support for LAST_ACCESS_AT_START system property to SingleSignOn.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1667166&r1=1667165&r2=1667166&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Tue 
Mar 17 02:56:57 2015
@@ -314,8 +314,7 @@ public class SingleSignOn extends ValveB
 // session was logged out, we'll log out of all session associated with
 // the SSO.
 if (((session.getMaxInactiveInterval() > 0)
-&& (System.currentTimeMillis() - 
session.getThisAccessedTimeInternal() >=
-session.getMaxInactiveInterval() * 1000))
+&& (session.getIdleTimeInternal() >= 
session.getMaxInactiveInterval() * 1000))
 || (!session.getManager().getContext().getState().isAvailable())) {
 if (containerLog.isDebugEnabled()) {
 
containerLog.debug(sm.getString("singleSignOn.debug.sessionTimeout",



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

svn commit: r1667168 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/authenticator/SingleSignOn.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Tue Mar 17 02:58:43 2015
New Revision: 1667168

URL: http://svn.apache.org/r1667168
Log:
Add support for LAST_ACCESS_AT_START system property to SingleSignOn.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1667168&r1=1667167&r2=1667168&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
Tue Mar 17 02:58:43 2015
@@ -314,8 +314,7 @@ public class SingleSignOn extends ValveB
 // session was logged out, we'll log out of all session associated with
 // the SSO.
 if (((session.getMaxInactiveInterval() > 0)
-&& (System.currentTimeMillis() - 
session.getThisAccessedTimeInternal() >=
-session.getMaxInactiveInterval() * 1000))
+&& (session.getIdleTimeInternal() >= 
session.getMaxInactiveInterval() * 1000))
 || (!session.getManager().getContext().getState().isAvailable())) {
 if (containerLog.isDebugEnabled()) {
 
containerLog.debug(sm.getString("singleSignOn.debug.sessionTimeout",

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1667168&r1=1667167&r2=1667168&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Mar 17 02:58:43 2015
@@ -124,6 +124,10 @@
 digests with no salt and a single iteration to make it easier to use
 with DIGEST authentication. (markt)
   
+  
+Add support for LAST_ACCESS_AT_START system property to
+SingleSignOn. (kfujino)
+  
 
   
   



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

svn commit: r1667169 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/authenticator/SingleSignOn.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Tue Mar 17 03:00:50 2015
New Revision: 1667169

URL: http://svn.apache.org/r1667169
Log:
Add support for LAST_ACCESS_AT_START system property to SingleSignOn.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1667169&r1=1667168&r2=1667169&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
Tue Mar 17 03:00:50 2015
@@ -27,6 +27,7 @@ import java.util.Map;
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 
+import org.apache.catalina.Globals;
 import org.apache.catalina.Realm;
 import org.apache.catalina.Session;
 import org.apache.catalina.SessionEvent;
@@ -58,6 +59,19 @@ import org.apache.tomcat.util.res.String
  */
 public class SingleSignOn extends ValveBase implements SessionListener {
 
+protected static final boolean LAST_ACCESS_AT_START;
+
+static {
+String lastAccessAtStart = System.getProperty(
+
"org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START");
+if (lastAccessAtStart == null) {
+LAST_ACCESS_AT_START = Globals.STRICT_SERVLET_COMPLIANCE;
+} else {
+LAST_ACCESS_AT_START =
+Boolean.valueOf(lastAccessAtStart).booleanValue();
+}
+}
+
 //-- Constructor
 public SingleSignOn() {
 super(true);
@@ -237,9 +251,14 @@ public class SingleSignOn extends ValveB
 // If so, we'll just remove the expired session from the
 // SSO.  If the session was logged out, we'll log out
 // of all session associated with the SSO.
+long idle;
+if (LAST_ACCESS_AT_START) {
+idle = session.getLastAccessedTimeInternal();
+} else {
+idle = session.getThisAccessedTimeInternal();
+}
 if (((session.getMaxInactiveInterval() > 0)
-&& (System.currentTimeMillis() - 
session.getThisAccessedTimeInternal() >=
-session.getMaxInactiveInterval() * 1000)) 
+&& idle >= session.getMaxInactiveInterval() * 1000) 
 || (Session.SESSION_PASSIVATED_EVENT.equals(event.getType()))
 || 
(!session.getManager().getContainer().getState().isAvailable())) {
 removeSession(ssoId, session);

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=1667169&r1=1667168&r2=1667169&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 17 03:00:50 2015
@@ -159,6 +159,10 @@
 when org.apache.tomcat.InstanceManager is not initialized.
 (violetagg)
   
+  
+Add support for LAST_ACCESS_AT_START system property to
+SingleSignOn. (kfujino)
+  
 
   
   



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

svn commit: r1667176 - in /tomcat/sandbox/niofs: src/META-INF/ src/META-INF/services/ src/META-INF/services/java.nio.file.spi.FileSystemProvider src/niofs/ArchiveFileSystemProvider.java tst/niofs/Clas

[jboynes]

Author: jboynes
Date: Tue Mar 17 05:46:48 2015
New Revision: 1667176

URL: http://svn.apache.org/r1667176
Log:
NIOFS URI support and tests with URLClassLoader

Added:
tomcat/sandbox/niofs/src/META-INF/
tomcat/sandbox/niofs/src/META-INF/services/

tomcat/sandbox/niofs/src/META-INF/services/java.nio.file.spi.FileSystemProvider
tomcat/sandbox/niofs/tst/niofs/ClassLoaderTest.java   (with props)
Modified:
tomcat/sandbox/niofs/src/niofs/ArchiveFileSystemProvider.java

Added: 
tomcat/sandbox/niofs/src/META-INF/services/java.nio.file.spi.FileSystemProvider
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/niofs/src/META-INF/services/java.nio.file.spi.FileSystemProvider?rev=1667176&view=auto
==
--- 
tomcat/sandbox/niofs/src/META-INF/services/java.nio.file.spi.FileSystemProvider 
(added)
+++ 
tomcat/sandbox/niofs/src/META-INF/services/java.nio.file.spi.FileSystemProvider 
Tue Mar 17 05:46:48 2015
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+niofs.ArchiveFileSystemProvider

Modified: tomcat/sandbox/niofs/src/niofs/ArchiveFileSystemProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/niofs/src/niofs/ArchiveFileSystemProvider.java?rev=1667176&r1=1667175&r2=1667176&view=diff
==
--- tomcat/sandbox/niofs/src/niofs/ArchiveFileSystemProvider.java (original)
+++ tomcat/sandbox/niofs/src/niofs/ArchiveFileSystemProvider.java Tue Mar 17 
05:46:48 2015
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
 import java.nio.channels.NonWritableChannelException;
 import java.nio.channels.SeekableByteChannel;
@@ -29,6 +30,7 @@ import java.nio.file.CopyOption;
 import java.nio.file.DirectoryStream;
 import java.nio.file.FileStore;
 import java.nio.file.FileSystem;
+import java.nio.file.FileSystemNotFoundException;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.NoSuchFileException;
@@ -36,6 +38,7 @@ import java.nio.file.NotDirectoryExcepti
 import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
+import java.nio.file.Paths;
 import java.nio.file.ProviderMismatchException;
 import java.nio.file.ReadOnlyFileSystemException;
 import java.nio.file.StandardOpenOption;
@@ -55,37 +58,61 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import static java.net.URLEncoder.encode;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 /**
  * A provider for read-only filesystems based on an underlying archive file in 
ZIP format.
  */
 public class ArchiveFileSystemProvider extends FileSystemProvider {
+private static final String UTF8 = UTF_8.toString();
+
+private final Map fileSystems = new 
ConcurrentHashMap<>();
 
 @Override
 public String getScheme() {
 return "archive";
 }
 
-// TODO: We will need to support URIs in order to support converting paths 
to URLs.
 @Override
-public FileSystem newFileSystem(URI uri, Map env) throws 
IOException {
-throw new UnsupportedOperationException();
+public ArchiveFileSystem newFileSystem(URI uri, Map env) throws 
IOException {
+String name = uri.getAuthority();
+ArchiveFileSystem fileSystem = fileSystems.get(name);
+if (fileSystem == null) {
+fileSystem = newFileSystem(Paths.get(URI.create(name)), env);
+fileSystems.put(name, fileSystem);
+}
+return fileSystem;
 }
 
 @Override
-public FileSystem getFileSystem(URI uri) {
-throw new UnsupportedOperationException();
+public ArchiveFileSystem getFileSystem(URI uri) {
+ArchiveFileSystem fileSystem = fileSystems.get(uri.getAuthority());
+if (fileSystem == null) {
+throw new FileSystemNotFoundException();
+}
+return fileSystem;
 }
 
 @Override
 pu

Re: [patch] WsServerContainer.java on trunk

[Raghavendran N]

On 16/03/2015 14:50, Raghavendran N wrote:
>> diff --git a/java/org/apache/tomcat
/websocket/server/WsServerContainer.java
>> b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
>> index d2c824c..a663e8e 100644
>> --- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
>> +++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
>> @@ -166,7 +166,7 @@ public class WsServerContainer extends
>> WsWebSocketContainer
>>   * must be called before calling this method.
>>   *
>>   * @param sec   The configuration to use when creating endpoint
>> instances
>> - * @throws DeploymentException if the endpoint can not be published
as
>> + * @throws DeploymentException if the endpoint cannot be published
as
>>   * requested
>>   */
>>  @Override
>>

>Both are technically correct. Which to use is a style choice although
>cannot is certainly the more common.
I thought cannot was a more common usage and sent the patch.
I also wanted to keep it very small and make a small beginning.

>There were rather more instances than the one you highlighted. I have no
>string preference for one over the other so I did a global search and
>replace for 9.0.x.
Thank you for taking it up. I did a git pull and saw your commit :) Also for
fixing the other occurrences. I wanted to send a very small patch and I
picked this one. I guess I should have picked all the occurrences.

>Personally, I don't think it is worth back-porting. If someone wants to
>do that work, got for it.

>Mark
Thank you Mark.
-raghav
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57718] None of the ciphers specified are supported by the SSL engine

[bugzilla]

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

Chandu  changed:

   What|Removed |Added

   Severity|critical|blocker
   Priority|P2  |P1
 CC||sheka...@gmail.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

[Bug 57718] New: None of the ciphers specified are supported by the SSL engine

[bugzilla]

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

Bug ID: 57718
   Summary: None of the ciphers specified are supported by the SSL
engine
   Product: Tomcat Connectors
   Version: unspecified
  Hardware: Other
OS: Linux
Status: NEW
  Severity: critical
  Priority: P2
 Component: Common
  Assignee: dev@tomcat.apache.org
  Reporter: sheka...@gmail.com

Hi

We are using Tomcat as webserver.
We set the tomcat connector like this

connector = new Connector("HTTP/1.1");
connector.setPort(httpsPort);
connector.setSecure(true);
connector.setProperty("clientAuth", "false");
connector.setAllowTrace(false);
  connector.setProperty("server", "Server Hardware Management Console");
connector.setEnableLookups(true); // -27
connector.setProperty("SSLEnabled", "true");
connector.setProperty("backlog", "10");
connector.setProperty("maxThreads", "75");
connector.setProperty("minSpareThreads", "5");
connector.setProperty("maxSpareThreads", "20");
connector.setProperty("soTimeout", "2");
connector.setScheme("https");
connector.setProperty("algorithm", KeyManagerFactory
.getDefaultAlgorithm());
connector.setProperty("keystoreFile", CertUtils
.getConfiguredKeyStoreFileName());
connector.setProperty("keystorePass", "password");
connector.setProperty("keystoreType", "JKS");
if("nist_sp800_131a".equals(sm.getSecurityMode())){
connector.setProperty("sslProtocol", "TLSv1.2");
}else{
 connector.setProperty("sslProtocol", "TLS");

 connector.setProperty("sslEnabledProtocols","TLSv1,TLSv1.1,TLSv1.2");
}
connector.setProperty("ciphers", sm.getCiphers());
<--- Here we set the Cipher.

tomcat.getService().addConnector(connector);
commonSystem.setListeningOnHttps(true);

This is the Cipher list we have and we set the below Cipher to Tomcat (
Check the above code.)
availablTLSv11CipherList.add("TLS_RSA_WITH_AES_128_CBC_SHA");
  availablTLSv11CipherList.add("TLS_RSA_WITH_3DES_EDE_CBC_SHA");
  availablTLSv11CipherList.add("TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA");
  availablTLSv11CipherList.add("TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA");
  availablTLSv11CipherList.add("TLS_DHE_RSA_WITH_AES_128_CBC_SHA");

availablTLSv12CipherList.add("TLS_RSA_WITH_AES_128_CBC_SHA256");
  availablTLSv12CipherList.add("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
);
  availablTLSv12CipherList.add("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256");
  availablTLSv12CipherList.add("TLS_RSA_WITH_AES_128_GCM_SHA256");
  availablTLSv12CipherList.add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
);

I am using the Cipher list starting with TLS for ex:
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", Earlier everything was
working fine, but after Tomcat update to 7.0.59 from 7.0.29, I see that if I
set the above Cipher
list I am getting below error

WARNING: None of the ciphers specified are supported
by the SSL engine : TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,TLS_DHE_DS
S_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,TLS_DHE_DSS_W
ITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,TLS_DH
E_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_R
SA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SH
A,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_
SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WI
TH_3DES_EDE_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WIT
H_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_
ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,TLS
_ECDH_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDH_ECDSA_WITH_AES_128
_GCM_SHA256,TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,TLS_ECDH_RSA_WITH_AES_128
_CBC_SHA,TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDH_RSA_WITH
_AES_128_GCM_SHA256,TLS_RSA_FIPS_WITH_3DES_EDE_CBC_SHA,TLS_RSA_WITH_3DES
_EDE_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_128_

If I set the Cipher name to SSL it works. I mean to say Instead of
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" to
SSL_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256. I want to know why this
behaviour got changed.

We are using IBM JAVA 6.

-- 
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: WAR FileSystem for fast nested JAR access?

[Jeremy Boynes]

On Mar 7, 2015, at 10:13 AM, Jeremy Boynes  wrote:
> 
> On Mar 6, 2015, at 7:43 AM, Mark Thomas  wrote:
>> Interesting. The deciding factor for me will be performance. Keep in
>> mind that we might not need all the API. As long as there is enough to
>> implement WebResourceSet and WebResource, we probably have all we need.
> 
> I ran a micro-benchmark using the greenhouse WAR associated with the original 
> bug. I instrumented JarWarResource to log all resources opened during startup 
> and record the time. On my system it took ~21,000ms to start the application 
> of which ~16,000ms was spent in getJarInputStreamWrapper(). 2935 resources 
> were opened, primarily class files.
> 
> I then replayed the log against the sandbox FS. With the current 
> implementation it took ~300ms to open the war, ~350ms to open all the jars, 
> and ~5ms to open all the entries with newInputStream().
> 
> I interpret that to mean that there is pretty constant time taken to inflate 
> 15MB of data - the 300ms to scan the archive and the ~350ms to scan each of 
> the jars within (each one that was used at least). The speed up here comes 
> because we only scan each archive once, the downside is the extra memory used 
> to store the inflated data.
> 
> This is promising enough to me that I’m going to keep exploring.
> 
> Konstantin’s patch, AIUI, creates an index for each jar which eliminates the 
> need to scan jars on the classpath that don’t contain the class being 
> requested. However, once the classloader has determined the jar file to use 
> we still need to stream through that jar until we reach the desired entry.
> 
> I think we can avoid that here by digging into the zip file’s internal 
> metadata. Where I am currently  streaming the jar to build the directory, 
> with random access I can build an index just by reading the central directory 
> structure. An index entry would contain the name, metadata, and the offset in 
> the archive of the entry’s data. When an entry is opened would we inflate the 
> data so that it could be used to underpin the channel. When the channel is 
> closed the memory would be released.
> 
> In general, I don’t think there’s a need for the FileSystem to retain 
> inflated data after the channel is closed. This would be particularly true 
> for the leaf resources which are not likely to be reused; for example, once a 
> ClassLoader has used the .class file to define the Class or once a framework 
> has processed a .xml config file then neither will need it again.
> 
> However, I think the WAR ClassLoader would benefit from keeping the JAR files 
> on the classpath open to avoid re-inflating them. The pattern though would be 
> bursty e.g. lots of class loads during startup followed by quiescence. I can 
> think of two ways to handle that:
> 1) FileSystem has maintains a cache of inflated entries much like a disk 
> filesystem has buffers
>   The FileSystem would be responsible for evictions, perhaps on a LRU or 
> timed basis.
> 2) Having the classloader keep the JARs opened/mounted after loading a 
> resource until such time as it thinks quiescence is reached. It would then 
> unmount JARs to free the memory.
> We could do both as they don’t conflict.
> 
> Next step will be to look into building the index directly from the archive’s 
> central directory rather than by streaming it.

Next step was actually just to verify that we could make a URLClassLoader work 
with this API. I got this to work by turning the path URIs into collection URLs 
(ending in ‘/‘) which prevented the classloader from trying to open them as 
JarFiles.

The classloader works but the classpath search is pretty inefficient relying on 
UrlConnection#getInputStream throwing an Exception to detect if a resource 
exists. Using it to load the 2935 resources from before took ~1900ms even after 
the jars had been indexed. getInputStream() was called ~120,000 times as the 
classpath was scanned, i.e. 15us per check with an average of ~40 checks per 
resource which seems about right for a classpath that contains 73 jars.

An obvious solution to avoid the repeated search would be to union the jars’ 
directories into a single index. I may try this with a PathClassLoader that 
operates using a list of Paths rather than URLs.

Cheers
Jeremy



signature.asc
Description: Message signed with OpenPGP using GPGMail

svn commit: r1667177 - in /tomcat/trunk/java/org/apache/catalina/ha/session: LocalStrings.properties LocalStrings_es.properties

[kfujino]

Author: kfujino
Date: Tue Mar 17 06:54:58 2015
New Revision: 1667177

URL: http://svn.apache.org/r1667177
Log:
Remove unused message.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1667177&r1=1667176&r2=1667177&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
Tue Mar 17 06:54:58 2015
@@ -79,7 +79,6 @@ jvmRoute.set.orignalsessionid=Set Orgina
 standardSession.notSerializable=Cannot serialize session attribute {0} for 
session {1}
 standardSession.removeAttribute.ise=removeAttribute: Session already 
invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be 
null
-serializablePrincipal.readPrincipal.cnfe=readPrincipal: Failed to recreate 
user Principal
 backupManager.noCluster=no cluster associated with this context: [{0}]
 backupManager.startUnable=Unable to start BackupManager: [{0}]
 backupManager.startFailed=Failed to start BackupManager: [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=1667177&r1=1667176&r2=1667177&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
Tue Mar 17 06:54:58 2015
@@ -76,4 +76,3 @@ jvmRoute.set.orignalsessionid = Puesta i
 standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n 
{0} para sesi\u00F3n {1}
 standardSession.removeAttribute.ise = removeAttribute\: Sesi\u00F3n ya 
invalidada
 standardSession.setAttribute.namenull = setAttribute\: par\u00E1metro de 
nombre no puede ser nulo
-serializablePrincipal.readPrincipal.cnfe = readPrincipal\: No pude volver a 
crea el usuario Principal



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

svn commit: r1667178 - in /tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session: LocalStrings.properties LocalStrings_es.properties

[kfujino]

Author: kfujino
Date: Tue Mar 17 06:55:34 2015
New Revision: 1667178

URL: http://svn.apache.org/r1667178
Log:
Remove unused message.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1667178&r1=1667177&r2=1667178&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
 Tue Mar 17 06:55:34 2015
@@ -79,7 +79,6 @@ jvmRoute.set.orignalsessionid=Set Orgina
 standardSession.notSerializable=Cannot serialize session attribute {0} for 
session {1}
 standardSession.removeAttribute.ise=removeAttribute: Session already 
invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be 
null
-serializablePrincipal.readPrincipal.cnfe=readPrincipal: Failed to recreate 
user Principal
 backupManager.noCluster=no cluster associated with this context: [{0}]
 backupManager.startUnable=Unable to start BackupManager: [{0}]
 backupManager.startFailed=Failed to start BackupManager: [{0}]

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=1667178&r1=1667177&r2=1667178&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
 Tue Mar 17 06:55:34 2015
@@ -76,4 +76,3 @@ jvmRoute.set.orignalsessionid = Puesta i
 standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n 
{0} para sesi\u00F3n {1}
 standardSession.removeAttribute.ise = removeAttribute\: Sesi\u00F3n ya 
invalidada
 standardSession.setAttribute.namenull = setAttribute\: par\u00E1metro de 
nombre no puede ser nulo
-serializablePrincipal.readPrincipal.cnfe = readPrincipal\: No pude volver a 
crea el usuario Principal



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