svn commit: r1713126 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: kkolinko
Date: Sat Nov 7 13:49:42 2015
New Revision: 1713126
URL: http://svn.apache.org/viewvc?rev=1713126&view=rev
Log:
Mark helper methods as static.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1713126&r1=1713125&r2=1713126&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Sat Nov 7
13:49:42 2015
@@ -349,7 +349,7 @@ public class Http11Processor extends Abs
* @param sArray the StringArray
* @param value string
*/
-private boolean startsWithStringArray(String sArray[], String value) {
+private static boolean startsWithStringArray(String sArray[], String
value) {
if (value == null) {
return false;
}
@@ -1570,7 +1570,7 @@ public class Http11Processor extends Abs
}
-private boolean isConnectionClose(MimeHeaders headers) {
+private static boolean isConnectionClose(MimeHeaders headers) {
MessageBytes connection = headers.getValue(Constants.CONNECTION);
if (connection == null) {
return false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713128 - /tomcat/trunk/java/org/apache/coyote/Response.java
Author: kkolinko
Date: Sat Nov 7 13:59:06 2015
New Revision: 1713128
URL: http://svn.apache.org/viewvc?rev=1713128&view=rev
Log:
Fix typo from javadoc update in r1712993
Modified:
tomcat/trunk/java/org/apache/coyote/Response.java
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1713128&r1=1713127&r2=1713128&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Sat Nov 7 13:59:06 2015
@@ -395,7 +395,7 @@ public final class Response {
/**
* Return the content language.
*
- * @return The language code foe the language currently associated with
this
+ * @return The language code for the language currently associated with
this
* response
*/
public String getContentLanguage() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713129 - /tomcat/trunk/res/findbugs/filter-false-positives.xml
Author: violetagg Date: Sat Nov 7 14:00:33 2015 New Revision: 1713129 URL: http://svn.apache.org/viewvc?rev=1713129&view=rev Log: Add generated code to the findbugs exclusions. Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1713129&r1=1713128&r2=1713129&view=diff == --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original) +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sat Nov 7 14:00:33 2015 @@ -544,30 +544,26 @@ - - - - - - - - - - - - - - - + + + + + + + + + + - - - + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713133 - in /tomcat/tc6.0.x/trunk/test/org/apache/el: TestELEvaluation.java lang/TestELArithmetic.java lang/TestELSupport.java
Author: kkolinko
Date: Sat Nov 7 14:35:52 2015
New Revision: 1713133
URL: http://svn.apache.org/viewvc?rev=1713133&view=rev
Log:
Convert test classes to JUnit 4, copy some additional tests from Tomcat 7.
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java
tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java
tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
Modified: tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java?rev=1713133&r1=1713132&r2=1713133&view=diff
==
--- tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java Sat Nov 7
14:35:52 2015
@@ -22,26 +22,31 @@ import java.lang.reflect.Method;
import java.util.Date;
import javax.el.ELException;
-import javax.el.ValueExpression;
import javax.el.FunctionMapper;
+import javax.el.ValueExpression;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
-import org.apache.el.ExpressionFactoryImpl;
import org.apache.el.lang.ELSupport;
-import org.apache.jasper.compiler.TestAttributeParser;
import org.apache.jasper.el.ELContextImpl;
-import junit.framework.TestCase;
-
/**
* Tests the EL engine directly. Similar tests may be found in
- * {@link TestAttributeParser} and {@link TestELInJsp}.
+ * {@link org.apache.jasper.compiler.TestAttributeParser} and
+ * {@link TestELInJsp}.
*/
-public class TestELEvaluation extends TestCase {
+public class TestELEvaluation {
/**
* Test use of spaces in ternary expressions. This was primarily an EL
* parser bug.
*/
+@Test
public void testBug42565() {
assertEquals("false", evaluateExpression("${false?true:false}"));
assertEquals("false", evaluateExpression("${false?true: false}"));
@@ -63,8 +68,9 @@ public class TestELEvaluation extends Te
/**
- * Test use nested ternary expressions. This was primarily an EL parser
bug.
+ * Test use nested ternary expressions. This was primarily an EL parser
bug.
*/
+@Test
public void testBug44994() {
assertEquals("none", evaluateExpression(
"${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}"));
@@ -74,7 +80,7 @@ public class TestELEvaluation extends Te
"${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}"));
}
-
+@Test
public void testParserBug45511() {
// Test cases provided by OP
assertEquals("true", evaluateExpression("${empty ('')}"));
@@ -83,18 +89,20 @@ public class TestELEvaluation extends Te
assertEquals("false", evaluateExpression("${(true)and(false)}"));
}
+@Test
public void testBug48112() {
// bug 48112
assertEquals("{world}", evaluateExpression("${fn:trim('{world}')}"));
}
+@Test
public void testParserLiteralExpression() {
// Inspired by work on bug 45451, comments from kkolinko on the dev
// list and looking at the spec to find some edge cases
// '\' is only an escape character inside a StringLiteral
assertEquals("", evaluateExpression(""));
-
+
/*
* LiteralExpresions can only contain ${ or #{ if escaped with \
* \ is not an escape character in any other circumstances including \\
@@ -119,10 +127,11 @@ public class TestELEvaluation extends Te
assertEquals("", evaluateExpression(""));
}
+@Test
public void testParserStringLiteral() {
// Inspired by work on bug 45451, comments from kkolinko on the dev
// list and looking at the spec to find some edge cases
-
+
// The only characters that can be escaped inside a String literal
// are \ " and '. # and $ are not escaped inside a String literal.
assertEquals("\\", evaluateExpression("${''}"));
@@ -141,9 +150,8 @@ public class TestELEvaluation extends Te
assertEquals("\\$", evaluateExpression("${'$'}"));
assertEquals("$", evaluateExpression("${'$'}"));
-
-
-
+
+
// Can use ''' inside '"' when quoting with '"' and vice versa without
// escaping
assertEquals("\\\"", evaluateExpression("${'\"'}"));
@@ -163,12 +171,13 @@ public class TestELEvaluation extends Te
assertEquals(msg,expected, -i2);
}
+@Test
public void testElSupportCompare(){
compareBoth("Nulls should compare equal", 0, null, null);
compareBoth("Null should compare equal to \"\"", 0, "", null);
compareBoth("Null should be less than File()",-1, null, new File(""));
compareBo
svn commit: r1713134 - in /tomcat/tc8.0.x/trunk: ./ res/findbugs/filter-false-positives.xml
Author: violetagg Date: Sat Nov 7 14:39:28 2015 New Revision: 1713134 URL: http://svn.apache.org/viewvc?rev=1713134&view=rev Log: Merged revision 1713129 from tomcat/trunk: Add generated code to the findbugs exclusions. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/res/findbugs/filter-false-positives.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 7 14:39:28 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,
svn commit: r1713135 - /tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
Author: kkolinko
Date: Sat Nov 7 14:44:12 2015
New Revision: 1713135
URL: http://svn.apache.org/viewvc?rev=1713135&view=rev
Log:
Convert test class to JUnit 4, copy an additional test from Tomcat 7.
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java?rev=1713135&r1=1713134&r2=1713135&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
Sat Nov 7 14:44:12 2015
@@ -22,23 +22,25 @@ import java.lang.reflect.Method;
import javax.el.FunctionMapper;
import javax.el.ValueExpression;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
import org.apache.el.ExpressionFactoryImpl;
-import org.apache.el.TestELEvaluation;
import org.apache.el.TesterFunctions;
import org.apache.jasper.el.ELContextImpl;
-import junit.framework.TestCase;
-
/**
* Test the EL processing from JSP attributes. Similar tests may be found in
- * {@link TestELEvaluation}.
+ * {@link org.apache.el.TestELEvaluation} and {@link
org.apache.el.TestELInJsp}.
*/
-public class TestAttributeParser extends TestCase {
+public class TestAttributeParser {
/**
* Test use of spaces in ternary expressions. This was primarily an EL
* parser bug.
*/
+@Test
public void testBug42565() {
assertEquals("false", evalAttr("${false?true:false}", '\"'));
assertEquals("false", evalAttr("${false?true: false}", '\"'));
@@ -61,9 +63,10 @@ public class TestAttributeParser extends
/**
* Test use nested ternary expressions. Full tests in
- * {@link TestELEvaluation}. This is just a smoke test to ensure JSP
- * attribute processing doesn't cause any additional issues.
+ * {@link org.apache.el.TestELEvaluation}. This is just a smoke test to
+ * ensure JSP attribute processing doesn't cause any additional issues.
*/
+@Test
public void testBug44994() {
assertEquals("none",
evalAttr("${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}", '\"'));
@@ -73,12 +76,13 @@ public class TestAttributeParser extends
evalAttr("${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}", '\"'));
}
-
+
/**
* Test the quoting requirements of JSP attributes. This doesn't make use
of
* EL. See {@link #testBug45451()} for a test that combines JSP attribute
* quoting and EL quoting.
*/
+@Test
public void testBug45015() {
// Warning: Java String quoting vs. JSP attribute quoting
assertEquals("hello 'world'", evalAttr("hello 'world'", '\"'));
@@ -91,7 +95,7 @@ public class TestAttributeParser extends
assertEquals("hello world\"", evalAttr("hello world\"", '\"'));
assertEquals("hello world'", evalAttr("hello world\\'", '\"'));
assertEquals("hello world\"", evalAttr("hello world\\\"", '\"'));
-
+
assertEquals("hello 'world'", evalAttr("hello 'world'", '\''));
assertEquals("hello 'world", evalAttr("hello 'world", '\''));
assertEquals("hello world'", evalAttr("hello world'", '\''));
@@ -104,14 +108,20 @@ public class TestAttributeParser extends
assertEquals("hello world\"", evalAttr("hello world\\\"", '\''));
}
-
+@Test
public void testBug45451() {
assertEquals("2", evalAttr("${1+1}", '\"'));
assertEquals("${1+1}", evalAttr("\\${1+1}", '\"'));
assertEquals("\\2", evalAttr("${1+1}", '\"'));
}
-
+
+@Test
+public void testBug49081() {
+assertEquals("#2", evalAttr("#${1+1}", '\"'));
+}
+
+@Test
public void testLiteral() {
// Inspired by work on bug 45451, comments from kkolinko on the dev
// list and looking at the spec to find some edge cases
@@ -151,6 +161,7 @@ public class TestAttributeParser extends
assertEquals("foo\\bar\\baz",
evalAttr("${\"foo\"}${\\\'bar\\\'}${\"baz\"}", '\''));
}
+@Test
public void testScriptExpressionLiterals() {
assertEquals(" \"hello world\" ", parseScriptExpression(
" \"hello world\" ", (char) 0));
@@ -159,7 +170,7 @@ public class TestAttributeParser extends
}
private String evalAttr(String expression, char quote) {
-
+
ELContextImpl ctx = new ELContextImpl();
ctx.setFunctionMapper(new FMapper());
ExpressionFactoryImpl exprFactory = new ExpressionFactoryImpl();
@@ -169,7 +180,7 @@ public class TestAttributeParser extends
String.class);
return (String) ve.getValue(ctx);
}
-
+
private String parseS
svn commit: r1713137 - in /tomcat/tc7.0.x/trunk: ./ res/findbugs/filter-false-positives.xml
Author: violetagg Date: Sat Nov 7 14:45:34 2015 New Revision: 1713137 URL: http://svn.apache.org/viewvc?rev=1713137&view=rev Log: Merged revision 1713129 from tomcat/trunk: Add generated code to the findbugs exclusions. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 7 14:45: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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975 -/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,1345
svn commit: r1713138 - /tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java
Author: kkolinko
Date: Sat Nov 7 14:50:47 2015
New Revision: 1713138
URL: http://svn.apache.org/viewvc?rev=1713138&view=rev
Log:
Convert test class to JUnit 4
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java
Modified: tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=1713138&r1=1713137&r2=1713138&view=diff
==
--- tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java
(original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java Sat
Nov 7 14:50:47 2015
@@ -15,38 +15,13 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.http;
+package org.apache.tomcat.util.http;
-import org.apache.tomcat.util.http.Cookies;
-import org.apache.tomcat.util.http.ServerCookie;
+import org.junit.Test;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import java.lang.Exception;
-
-
-public class TestCookies extends TestCase {
-public static void main( String args[] ) {
- TestRunner.run(suite());
-}
-public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new TestSuite(TestCookies.class));
- return suite;
-}
-/*
- int i = 1000;
- // These tests are not really representative
- while (i-- > 0) {
- test("session=1234567890;name=\"John Q. Public\";");
-}
-//runtests();
-}
- */
-
+public class TestCookies {
+
+@Test
public void testCookies() throws Exception {
test("foo=bar; a=b", "foo", "bar", "a", "b");
test("foo=bar;a=b", "foo", "bar", "a", "b");
@@ -84,10 +59,10 @@ public class TestCookies extends TestCas
// Last character is an escape character
test("$Version=1;foo=b'ar;$Domain=\"apache.org\";$Port=8080;a=\"b\\\"", "foo",
"b'ar");
test("$Version=1;foo=b'ar;$Domain=\"apache.org\";$Port=8080;a=\"b\\",
"foo", "b'ar");
-
+
// A token cannot be quoted with ' chars - they should be treated as
part of the value
test("$Version=\"1\"; foo='bar'; $Path=/path; $Domain=\"localhost\"",
"foo", "'bar'");
-
+
// wrong, path should not have '/' JVK
test("$Version=1;foo=\"bar\";$Path=/examples;a=b; ; ", "foo", "bar",
"a", "b");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58596] New: Add Patch Binary -- Running.txt says tomcat is a JAVA application and doesn't use Environment Variables.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58596 Bug ID: 58596 Summary: Add Patch Binary -- Running.txt says tomcat is a JAVA application and doesn't use Environment Variables. Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: vkh...@gmail.com Created attachment 33264 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33264&action=edit patch for RUNNING.txt Running.txt(which helps user to guide for running up tomcat) says tomcat is a JAVA application and doesn't use Environment Variables. Tomcat always uses CATALINA_HOME as a environment variable. No matter who is setting this, either explicit or implicit by start up script. The document says, since it is a JAVA application, it does not use, but JAVA application does use. And the next few lines are also misleading according to Bug statement CATALINA_HOME(required). So it seems misleading. Providing a patch for this. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
PATCH -- [Bug 58596] .
Attaching patch file for above Bug. Just started looking into the world of Open Source. Learning what is tomcat and how it works , so found an little issue in documentation :) Thank you all of Tomcat Developers for providing such an excellent product as OPEN SOURCE. Vivek Index: RUNNING.txt === --- RUNNING.txt (revision 1713137) +++ RUNNING.txt (working copy) @@ -67,7 +67,7 @@ (3) Configure Environment Variables -Tomcat is a Java application and does not use environment variables. The +Tomcat is a Java application and does use environment variables. The variables are used by the Tomcat startup scripts. The scripts use the variables to prepare the command that starts Tomcat. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58596] Add Patch Binary -- Running.txt says tomcat is a JAVA application and doesn't use Environment Variables.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58596 Konstantin Kolinko changed: What|Removed |Added OS||All --- Comment #1 from Konstantin Kolinko --- No. Tomcat does not use CATALINA_HOME environment variable. The launch script (catalina.sh or catalina.bat) uses it. Tomcat itself uses system property named "catalina.home". The script sets that property with a -D command argument to java process that runs Tomcat. -- 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: r1713145 - in /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes: group/interceptors/ test/
Author: kkolinko
Date: Sat Nov 7 15:40:03 2015
New Revision: 1713145
URL: http://svn.apache.org/viewvc?rev=1713145&view=rev
Log:
Convert test classes to JUnit 4 and apply some trivial fixes & formatting from
Tomcat 7
Non-trivial fixes will be in separate commits
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java?rev=1713145&r1=1713144&r2=1713145&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
Sat Nov 7 15:40:03 2015
@@ -18,22 +18,26 @@ package org.apache.catalina.tribes.group
import java.util.ArrayList;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.group.GroupChannel;
-import junit.framework.TestCase;
import org.apache.catalina.tribes.util.UUIDGenerator;
-public class TestDomainFilterInterceptor
-extends TestCase {
+public class TestDomainFilterInterceptor {
private static int count = 10;
private ManagedChannel[] channels = new ManagedChannel[count];
private TestMbrListener[] listeners = new TestMbrListener[count];
-protected void setUp() throws Exception {
-super.setUp();
+@Before
+public void setUp() throws Exception {
for (int i = 0; i < channels.length; i++) {
channels[i] = new GroupChannel();
channels[i].getMembershipService().setPayload( ("Channel-" + (i +
1)).getBytes("ASCII"));
@@ -51,6 +55,7 @@ public class TestDomainFilterInterceptor
}
}
+@Test
public void testMemberArrival() throws Exception {
//purpose of this test is to make sure that we have received all the
members
//that we can expect before the start method returns
@@ -58,6 +63,7 @@ public class TestDomainFilterInterceptor
for (int i=0; i=0; i-- ) assertEquals("Checking
member arrival length",0,listeners[i].members.size());
}
-protected void tearDown() throws Exception {
+@After
+public void tearDown() throws Exception {
for (int i = 0; i < channels.length; i++) {
try {
channels[i].stop(Channel.DEFAULT);
-} catch (Exception ignore) {}
+} catch (Exception ignore) {
+// Ignore
+}
}
-super.tearDown();
}
-public class TestMbrListener
+public static class TestMbrListener
implements MembershipListener {
public String name = null;
public TestMbrListener(String name) {
this.name = name;
}
-public ArrayList members = new ArrayList();
+public ArrayList members = new ArrayList();
public void memberAdded(Member member) {
if (!members.contains(member)) {
members.add(member);
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java?rev=1713145&r1=1713144&r2=1713145&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Sat Nov 7 15:40:03 2015
@@ -16,22 +16,26 @@
*/
package org.apache.catalina.tribes.group.interceptors;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.GroupChannel;
-import junit.framework.TestCase;
-import ju
svn commit: r1713146 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
Author: kkolinko
Date: Sat Nov 7 15:43:20 2015
New Revision: 1713146
URL: http://svn.apache.org/viewvc?rev=1713146&view=rev
Log:
Fix warnings in a test class - Static fields should be accessed in a static way
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java?rev=1713146&r1=1713145&r2=1713146&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
Sat Nov 7 15:43:20 2015
@@ -76,11 +76,11 @@ public class TestTcpFailureDetector {
public void testTcpSendFailureMemberDrop() throws Exception {
System.out.println("testTcpSendFailureMemberDrop()");
clear();
-channel1.start(channel1.DEFAULT);
-channel2.start(channel2.DEFAULT);
+channel1.start(Channel.DEFAULT);
+channel2.start(Channel.DEFAULT);
//Thread.sleep(1000);
assertEquals("Expecting member count to be
equal",mbrlist1.members.size(),mbrlist2.members.size());
-channel2.stop(channel2.SND_RX_SEQ);
+channel2.stop(Channel.SND_RX_SEQ);
ByteMessage msg = new ByteMessage(new byte[1024]);
try {
channel1.send(channel1.getMembers(), msg, 0);
@@ -97,12 +97,12 @@ public class TestTcpFailureDetector {
public void testTcpFailureMemberAdd() throws Exception {
System.out.println("testTcpFailureMemberAdd()");
clear();
-channel1.start(channel1.DEFAULT);
-channel2.start(channel2.SND_RX_SEQ);
-channel2.start(channel2.SND_TX_SEQ);
-channel2.start(channel2.MBR_RX_SEQ);
-channel2.stop(channel2.SND_RX_SEQ);
-channel2.start(channel2.MBR_TX_SEQ);
+channel1.start(Channel.DEFAULT);
+channel2.start(Channel.SND_RX_SEQ);
+channel2.start(Channel.SND_TX_SEQ);
+channel2.start(Channel.MBR_RX_SEQ);
+channel2.stop(Channel.SND_RX_SEQ);
+channel2.start(Channel.MBR_TX_SEQ);
//Thread.sleep(1000);
assertEquals("Expecting member count to not be
equal",mbrlist1.members.size()+1,mbrlist2.members.size());
channel1.stop(Channel.DEFAULT);
@@ -113,11 +113,11 @@ public class TestTcpFailureDetector {
public void testTcpMcastFail() throws Exception {
System.out.println("testTcpMcastFail()");
clear();
-channel1.start(channel1.DEFAULT);
-channel2.start(channel2.DEFAULT);
+channel1.start(Channel.DEFAULT);
+channel2.start(Channel.DEFAULT);
//Thread.sleep(1000);
assertEquals("Expecting member count to be
equal",mbrlist1.members.size(),mbrlist2.members.size());
-channel2.stop(channel2.MBR_TX_SEQ);
+channel2.stop(Channel.MBR_TX_SEQ);
ByteMessage msg = new ByteMessage(new byte[1024]);
try {
Thread.sleep(5000);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713147 - in /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes: TesterUtil.java group/interceptors/TestNonBlockingCoordinator.java group/interceptors/TestOrderInterceptor.java group/i
Author: kkolinko
Date: Sat Nov 7 15:50:21 2015
New Revision: 1713147
URL: http://svn.apache.org/viewvc?rev=1713147&view=rev
Log:
Copy TesterUtil class from Tomcat 7 and use it in tests.
This feature allows tribes tests to run in parallel. Originates from r1303587.
Added:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/TesterUtil.java
- copied unchanged from r1713122,
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/TesterUtil.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java?rev=1713147&r1=1713146&r2=1713147&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Sat Nov 7 15:50:21 2015
@@ -24,6 +24,7 @@ import org.junit.Test;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.group.GroupChannel;
public class TestNonBlockingCoordinator {
@@ -57,6 +58,7 @@ public class TestNonBlockingCoordinator
}
};
}
+TesterUtil.addRandomDomain(channels);
for (int i = 0; i < channelCount; i++) {
threads[i].start();
}
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java?rev=1713147&r1=1713146&r2=1713147&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
Sat Nov 7 15:50:21 2015
@@ -33,6 +33,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.group.InterceptorPayload;
@@ -77,6 +78,7 @@ public class TestOrderInterceptor {
}
};
}
+TesterUtil.addRandomDomain(channels);
for ( int i=0; ihttp://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java?rev=1713147&r1=1713146&r2=1713147&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
Sat Nov 7 15:50:21 2015
@@ -31,6 +31,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
+import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.group.GroupChannel;
/**
@@ -65,6 +66,7 @@ public class TestTcpFailureDetector {
channel2.addInterceptor(tcpFailureDetector2);
channel1.addMembershipListener(mbrlist1);
channel2.addMembershipListener(mbrlist2);
+TesterUtil.addRandomDomain(new ManagedChannel[] {channel1, channel2});
}
public void clear() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713149 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Author: kkolinko
Date: Sat Nov 7 15:57:16 2015
New Revision: 1713149
URL: http://svn.apache.org/viewvc?rev=1713149&view=rev
Log:
Align test class with Tomcat 7.
- CHANNEL_COUNT is a constant
- Ensuring that n values are the same as [0]==[1], [1]==[2], [2]==[3] is the
same as [0]==[1], [0]==[2], [0]==[3], but error message becomes more clear.
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java?rev=1713149&r1=1713148&r2=1713149&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Sat Nov 7 15:57:16 2015
@@ -29,18 +29,18 @@ import org.apache.catalina.tribes.group.
public class TestNonBlockingCoordinator {
+private static final int CHANNEL_COUNT = 10;
+
private GroupChannel[] channels = null;
private NonBlockingCoordinator[] coordinators = null;
-private final int channelCount = 10;
-private Thread[] threads = null;
@Before
public void setUp() throws Exception {
System.out.println("Setup");
-channels = new GroupChannel[channelCount];
-coordinators = new NonBlockingCoordinator[channelCount];
-threads = new Thread[channelCount];
-for ( int i=0; i
svn commit: r1713153 - in /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group: TestGroupChannelMemberArrival.java TestGroupChannelOptionFlag.java TestGroupChannelSenderConnections.java TestGro
Author: kkolinko
Date: Sat Nov 7 16:47:25 2015
New Revision: 1713153
URL: http://svn.apache.org/viewvc?rev=1713153&view=rev
Log:
Convert test classes to JUnit 4 and apply some trivial fixes & formatting from
Tomcat 7
Non-trivial fixes will be in separate commits
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?rev=1713153&r1=1713152&r2=1713153&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Sat Nov 7 16:47:25 2015
@@ -18,26 +18,29 @@ package org.apache.catalina.tribes.group
import java.util.ArrayList;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
-import junit.framework.TestCase;
-public class TestGroupChannelMemberArrival
-extends TestCase {
+public class TestGroupChannelMemberArrival {
private static int count = 10;
private ManagedChannel[] channels = new ManagedChannel[count];
private TestMbrListener[] listeners = new TestMbrListener[count];
-protected void setUp() throws Exception {
-super.setUp();
+@Before
+public void setUp() throws Exception {
for (int i = 0; i < channels.length; i++) {
channels[i] = new GroupChannel();
channels[i].getMembershipService().setPayload( ("Channel-" + (i +
1)).getBytes("ASCII"));
listeners[i] = new TestMbrListener( ("Listener-" + (i + 1)));
channels[i].addMembershipListener(listeners[i]);
-
}
}
@@ -47,6 +50,7 @@ public class TestGroupChannelMemberArriv
}
}
+@Test
public void testMemberArrival() throws Exception {
//purpose of this test is to make sure that we have received all the
members
//that we can expect before the start method returns
@@ -54,6 +58,7 @@ public class TestGroupChannelMemberArriv
for (int i=0; i=0; i-- ) assertEquals("Checking
member arrival length",channels.length-1,listeners[i].members.size());
}
-protected void tearDown() throws Exception {
+@After
+public void tearDown() throws Exception {
for (int i = 0; i < channels.length; i++) {
try {
channels[i].stop(Channel.DEFAULT);
-} catch (Exception ignore) {}
+} catch (Exception ignore) {
+// Ignore
+}
}
-super.tearDown();
}
-public class TestMbrListener
+public static class TestMbrListener
implements MembershipListener {
public String name = null;
public TestMbrListener(String name) {
this.name = name;
}
-public ArrayList members = new ArrayList();
+public ArrayList members = new ArrayList();
+
public void memberAdded(Member member) {
if (!members.contains(member)) {
members.add(member);
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?rev=1713153&r1=1713152&r2=1713153&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
Sat Nov 7 16:47:25 2015
@@ -16,34 +16,41 @@
*/
package org.apache.catalina.tribes.group;
-import junit.framework.*;
-import org.apache.catalina.tribes.ChannelInterceptor;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.catalina.tribes.ChannelException;
+import org.apache.catalina.tribes.ChannelInterceptor;
/**
- * Title:
- *
- * Description:
- *
+ * Title:
+ *
+ * Description:
+ *
* Company:
- *
+ *
svn commit: r1713154 - in /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group: TestGroupChannelOptionFlag.java TestGroupChannelStartStop.java
Author: kkolinko
Date: Sat Nov 7 16:50:20 2015
New Revision: 1713154
URL: http://svn.apache.org/viewvc?rev=1713154&view=rev
Log:
Fix warnings in test classes - Static fields should be accessed in a static way
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?rev=1713154&r1=1713153&r2=1713154&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
Sat Nov 7 16:50:20 2015
@@ -23,6 +23,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelInterceptor;
@@ -46,7 +47,7 @@ public class TestGroupChannelOptionFlag
@After
public void tearDown() throws Exception {
-if ( channel != null ) try {channel.stop(channel.DEFAULT);}catch (
Exception ignore) {}
+if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch (
Exception ignore) {}
channel = null;
}
@@ -61,7 +62,7 @@ public class TestGroupChannelOptionFlag
i.setOptionFlag(128);
channel.addInterceptor(i);
try {
-channel.start(channel.DEFAULT);
+channel.start(Channel.DEFAULT);
}catch ( ChannelException x ) {
if ( x.getMessage().indexOf("option flag conflict") >= 0 ) error =
true;
}
@@ -82,7 +83,7 @@ public class TestGroupChannelOptionFlag
i.setOptionFlag(256);
channel.addInterceptor(i);
try {
-channel.start(channel.DEFAULT);
+channel.start(Channel.DEFAULT);
}catch ( ChannelException x ) {
if ( x.getMessage().indexOf("option flag conflict") >= 0 ) error =
true;
}
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java?rev=1713154&r1=1713153&r2=1713154&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
Sat Nov 7 16:50:20 2015
@@ -22,6 +22,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.transport.ReceiverBase;
/**
@@ -38,22 +39,22 @@ public class TestGroupChannelStartStop {
@After
public void tearDown() throws Exception {
-try {channel.stop(channel.DEFAULT);}catch (Exception ignore){ /*
Ignore */ }
+try {channel.stop(Channel.DEFAULT);}catch (Exception ignore){ /*
Ignore */ }
}
@Test
public void testDoubleFullStart() throws Exception {
int count = 0;
try {
-channel.start(channel.DEFAULT);
+channel.start(Channel.DEFAULT);
count++;
} catch ( Exception x){x.printStackTrace();}
try {
-channel.start(channel.DEFAULT);
+channel.start(Channel.DEFAULT);
count++;
} catch ( Exception x){x.printStackTrace();}
assertEquals(count,2);
-channel.stop(channel.DEFAULT);
+channel.stop(Channel.DEFAULT);
}
@Test
@@ -67,53 +68,53 @@ public class TestGroupChannelStartStop {
//try to double start the RX
int count = 0;
try {
-channel.start(channel.SND_RX_SEQ);
-channel.start(channel.MBR_RX_SEQ);
+channel.start(Channel.SND_RX_SEQ);
+channel.start(Channel.MBR_RX_SEQ);
count++;
} catch ( Exception x){x.printStackTrace();}
try {
-channel.start(channel.MBR_RX_SEQ);
+channel.start(Channel.MBR_RX_SEQ);
count++;
} catch ( Exception x){/*expected*/}
assertEquals(count,1);
-channel.stop(channel.DEFAULT);
+channel.stop(Channel.DEFAULT);
//double the membership sender
count = 0;
try {
-channel.start(channel.SND_RX_SEQ);
-channel.start(channel.MBR_TX_SEQ);
+channel.start(Channel.SND_RX_SEQ);
+channel.start(Channel.MBR_TX_SEQ);
count++;
svn commit: r1713155 - in /tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup: ./ LoggingBaseTest.java
Author: kkolinko Date: Sat Nov 7 16:55:23 2015 New Revision: 1713155 URL: http://svn.apache.org/viewvc?rev=1713155&view=rev Log: Copy LoggingBaseTest class from Tomcat 7 Added: tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup/ tomcat/tc6.0.x/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java - copied unchanged from r1713122, tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713156 - in /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group: TestGroupChannelMemberArrival.java TestGroupChannelOptionFlag.java TestGroupChannelSenderConnections.java TestGro
Author: kkolinko
Date: Sat Nov 7 17:10:21 2015
New Revision: 1713156
URL: http://svn.apache.org/viewvc?rev=1713156&view=rev
Log:
Use TesterUtil class to allow tribes tests to run in parallel. Originates from
r1303587.
Remove unused method clear().
Minor formatting fixes to align with Tomcat 7.
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?rev=1713156&r1=1713155&r2=1713156&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Sat Nov 7 17:10:21 2015
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
+import org.apache.catalina.tribes.TesterUtil;
public class TestGroupChannelMemberArrival {
private static int count = 10;
@@ -42,12 +43,7 @@ public class TestGroupChannelMemberArriv
listeners[i] = new TestMbrListener( ("Listener-" + (i + 1)));
channels[i].addMembershipListener(listeners[i]);
}
-}
-
-public void clear() {
-for (int i = 0; i < channels.length; i++) {
-listeners[i].members.clear();
-}
+TesterUtil.addRandomDomain(channels);
}
@Test
@@ -69,11 +65,18 @@ public class TestGroupChannelMemberArriv
};
threads[i] = t;
}
-for (int i=0; i=0; i-- ) assertEquals("Checking
member arrival length",channels.length-1,listeners[i].members.size());
+for (int i = listeners.length - 1; i >= 0; i--) {
+assertEquals("Checking member arrival length", channels.length - 1,
+listeners[i].members.size());
+}
}
@After
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?rev=1713156&r1=1713155&r2=1713156&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
Sat Nov 7 17:10:21 2015
@@ -47,7 +47,7 @@ public class TestGroupChannelOptionFlag
@After
public void tearDown() throws Exception {
-if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch (
Exception ignore) {}
+if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch (
Exception ignore) { /* Ignore */ }
channel = null;
}
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java?rev=1713156&r1=1713155&r2=1713156&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
Sat Nov 7 17:10:21 2015
@@ -29,6 +29,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
public class TestGroupChannelSenderConnections {
@@ -43,14 +44,13 @@ public class TestGroupChannelSenderConne
channels[i].getMembershipService().setPayload( ("Channel-" + (i +
1)).getBytes("ASCII"));
listeners[i] = new TestMsgListener( ("Listener-" + (i + 1)));
channels[i].addChannelListener(listeners[i]);
+}
+TesterUtil.addRandomDomain(channels);
+for (int i = 0; i < channels.length; i++) {
channels[i].start(Channel.SND_RX_SEQ|Channel.SND_TX_SEQ);
-
}
}
-public void clear() {
-}
-
publi
svn commit: r1713157 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Author: kkolinko
Date: Sat Nov 7 17:15:02 2015
New Revision: 1713157
URL: http://svn.apache.org/viewvc?rev=1713157&view=rev
Log:
Copy test implementation from Tomcat 7. This is some work to make the test more
reliable.
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?rev=1713157&r1=1713156&r2=1713157&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Sat Nov 7 17:15:02 2015
@@ -71,12 +71,18 @@ public class TestGroupChannelMemberArriv
for (int i = 0; i < threads.length; i++) {
threads[i].join();
}
-Thread.sleep(2000);
-System.out.println("All channels started.");
+Thread.sleep(5000);
+System.out.println(System.currentTimeMillis()
++ " All channels started.");
for (int i = listeners.length - 1; i >= 0; i--) {
-assertEquals("Checking member arrival length", channels.length - 1,
-listeners[i].members.size());
+TestMbrListener listener = listeners[i];
+synchronized (listener.members) {
+assertEquals("Checking member arrival length (" + listener.name
++ ")", channels.length - 1, listener.members.size());
+}
}
+System.out.println(System.currentTimeMillis()
++ " Members arrival counts checked.");
}
@After
@@ -101,27 +107,75 @@ public class TestGroupChannelMemberArriv
public ArrayList members = new ArrayList();
public void memberAdded(Member member) {
-if (!members.contains(member)) {
-members.add(member);
-try {
-System.out.println(name + ":member added[" + new
String(member.getPayload(), "ASCII") + ";
Thread:"+Thread.currentThread().getName()+"]");
-} catch (Exception x) {
-System.out.println(name + ":member added[unknown]");
+String msg;
+int count;
+synchronized (members) {
+if (!members.contains(member)) {
+members.add(member);
+msg = "member added";
+} else {
+msg = "member added called, but member is already in the
list";
}
+count = members.size();
}
+report(msg, member, count);
}
public void memberDisappeared(Member member) {
-if (members.contains(member)) {
-members.remove(member);
-try {
-System.out.println(name + ":member disappeared[" + new
String(member.getPayload(), "ASCII") + ";
Thread:"+Thread.currentThread().getName()+"]");
-} catch (Exception x) {
-System.out.println(name + ":member disappeared[unknown]");
+String msg;
+int count;
+synchronized (members) {
+if (members.contains(member)) {
+members.remove(member);
+msg = "member disappeared";
+} else {
+msg = "member disappeared called, but there is no such
member in the list";
}
+count = members.size();
+}
+report(msg, member, count);
+}
+
+private void report(String event, Member member, int count) {
+StringBuilder message = new StringBuilder(100);
+message.append(System.currentTimeMillis());
+message.append(' ');
+message.append(name);
+message.append(':');
+message.append(event);
+message.append(", has ");
+message.append(count);
+message.append(" members now. Member:[");
+message.append("host: ");
+appendByteArrayToString(message, member.getHost());
+message.append(", port: ");
+message.append(member.getPort());
+message.append(", id: ");
+appendByteArrayToString(message, member.getUniqueId());
+message.append(", payload: ");
+try {
+message.append(new String(member.getPayload(), "ASCII"));
+} catch (Exception x) {
+message.append("unknown");
}
+Thread t = Thread.currentThread();
+message.append("]; Thread:").append(t.getName()).append(", hash:")
+.
svn commit: r1713158 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
Author: kkolinko
Date: Sat Nov 7 17:17:55 2015
New Revision: 1713158
URL: http://svn.apache.org/viewvc?rev=1713158&view=rev
Log:
Copy test implementation from Tomcat 7.
This a) uses logging instead of System.out,
b) validates result of the test and fail()s, instead of just printing a message
onto System.out
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java?rev=1713158&r1=1713157&r2=1713158&view=diff
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
Sat Nov 7 17:17:55 2015
@@ -20,11 +20,15 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.Assert.fail;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.catalina.startup.LoggingBaseTest;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.ManagedChannel;
@@ -32,13 +36,15 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
-public class TestGroupChannelSenderConnections {
-private static int count = 2;
+public class TestGroupChannelSenderConnections extends LoggingBaseTest {
+private static final int count = 2;
private ManagedChannel[] channels = new ManagedChannel[count];
private TestMsgListener[] listeners = new TestMsgListener[count];
@Before
+@Override
public void setUp() throws Exception {
+super.setUp();
for (int i = 0; i < channels.length; i++) {
channels[i] = new GroupChannel();
channels[i].getMembershipService().setPayload( ("Channel-" + (i +
1)).getBytes("ASCII"));
@@ -52,27 +58,44 @@ public class TestGroupChannelSenderConne
}
public void sendMessages(long delay, long sleep) throws Exception {
+resetMessageCounters();
Member local = channels[0].getLocalMember(true);
Member dest = channels[1].getLocalMember(true);
int n = 3;
-System.out.println("Sending " + n + " messages from [" +
local.getName() + "] to [" + dest.getName() + "]");
+log.info("Sending " + n + " messages from [" + local.getName()
++ "] to [" + dest.getName() + "] with delay of " + delay
++ " ms between them.");
for (int i = 0; i < n; i++) {
-channels[0].send(new Member[] {dest}, new TestMsg(), 0);
-if ( delay > 0 ) Thread.sleep(delay);
+channels[0].send(new Member[] { dest }, new TestMsg(), 0);
+boolean last = (i == n - 1);
+if (!last && delay > 0) {
+Thread.sleep(delay);
+}
+}
+log.info("Messages sent. Waiting no more than " + (sleep / 1000)
++ " seconds for them to be received");
+long startTime = System.currentTimeMillis();
+int countReceived;
+while ((countReceived = getReceivedMessageCount()) != n) {
+long time = System.currentTimeMillis();
+if ((time - startTime) > sleep) {
+fail("Only " + countReceived + " out of " + n
++ " messages have been received in " + (sleep / 1000)
++ " seconds");
+break;
+}
+Thread.sleep(100);
}
-System.out.println("Messages sent. Sleeping for "+(sleep/1000)+"
seconds to inspect connections");
-if ( sleep > 0 ) Thread.sleep(sleep);
-
}
@Test
public void testConnectionLinger() throws Exception {
sendMessages(0,15000);
}
-
+
@Test
public void testKeepAliveCount() throws Exception {
-System.out.println("Setting keep alive count to 0");
+log.info("Setting keep alive count to 0");
for (int i = 0; i < channels.length; i++) {
ReplicationTransmitter t =
(ReplicationTransmitter)channels[0].getChannelSender();
t.getTransport().setKeepAliveCount(0);
@@ -82,7 +105,7 @@ public class TestGroupChannelSenderConne
@Test
public void testKeepAliveTime() throws Exception {
-System.out.println("Setting keep alive count to 1 second");
+log.info("Setting keep alive count to 1 second");
for (int i = 0; i < channels.length; i++) {
ReplicationTr
Re: svn commit: r1713158 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
2015-11-07 18:17 GMT+01:00 : > Author: kkolinko > Date: Sat Nov 7 17:17:55 2015 > New Revision: 1713158 > > URL: http://svn.apache.org/viewvc?rev=1713158&view=rev > Log: > Copy test implementation from Tomcat 7. > This a) uses logging instead of System.out, > b) validates result of the test and fail()s, instead of just printing a > message onto System.out > > When I voted for CTR on 6, it was agreed upon that only critical fixes would go in 6. Obviously, there's no regression risk with the testsuite, but what is the rationale with such an upgrade ? Rémy
Re: svn commit: r1713158 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
On Sat, Nov 7, 2015 at 7:35 PM, Rémy Maucherat wrote: > 2015-11-07 18:17 GMT+01:00 : > > > Author: kkolinko > > Date: Sat Nov 7 17:17:55 2015 > > New Revision: 1713158 > > > > URL: http://svn.apache.org/viewvc?rev=1713158&view=rev > > Log: > > Copy test implementation from Tomcat 7. > > This a) uses logging instead of System.out, > > b) validates result of the test and fail()s, instead of just printing a > > message onto System.out > > > > When I voted for CTR on 6, it was agreed upon that only critical fixes > would go in 6. Obviously, there's no regression risk with the testsuite, > but what is the rationale with such an upgrade ? > I've also asked the same myself. My answer is: to be better prepared for the eventual fixes later :-) > > Rémy >
svn commit: r1713168 - in /tomcat/trunk: BUILDING.txt build.properties.default build.xml
Author: violetagg
Date: Sat Nov 7 19:53:38 2015
New Revision: 1713168
URL: http://svn.apache.org/viewvc?rev=1713168&view=rev
Log:
Add findbugs to the build. It is off by default.
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1713168&r1=1713167&r2=1713168&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Sat Nov 7 19:53:38 2015
@@ -420,6 +420,18 @@ For example:
java.net.preferIPv4Stack=true
+ 9. Optional support is provided for FindBugs. It can be enabled using the
+following property:
+
+execute.findbugs=true
+
+The report file by default is written to
+
+output/findbugs
+
+* NOTE: Findbugs is licensed under LGPL. Using Findbugs during Tomcat build is
+ optional and is off by default.
+
(8) Source code checks
(8.1) Checkstyle
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1713168&r1=1713167&r2=1713168&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sat Nov 7 19:53:38 2015
@@ -50,6 +50,9 @@ test.threads=1
# Note the Cobertura code coverage tool is GPLv2 licensed
test.cobertura=false
+# Note the FindBugs is LGPL licensed
+execute.findbugs=false
+
# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
# multicast tests to work
java.net.preferIPv4Stack=false
@@ -226,3 +229,10 @@ cobertura.home=${base.path}/cobertura-${
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
cobertura.lib=${cobertura.home}/lib
cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
+
+# - Findbugs -
+findbugs.version=3.0.1
+findbugs.home=${base.path}/findbugs-${findbugs.version}
+findbugs.lib=${findbugs.home}/lib
+findbugs.jar=${findbugs.lib}/findbugs-ant.jar
+findbugs.loc=${base-sf.loc}/project/findbugs/findbugs/${findbugs.version}/findbugs-${findbugs.version}.tar.gz
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1713168&r1=1713167&r2=1713168&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Nov 7 19:53:38 2015
@@ -180,6 +180,11 @@
+
+
+
+
+
@@ -1564,6 +1569,32 @@
format="${cobertura.report.format}"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2860,6 +2891,17 @@ skip.installer property in build.propert
+
+
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713170 - in /tomcat/tc8.0.x/trunk: ./ BUILDING.txt build.properties.default build.xml webapps/docs/changelog.xml
Author: violetagg Date: Sat Nov 7 20:14:30 2015 New Revision: 1713170 URL: http://svn.apache.org/viewvc?rev=1713170&view=rev Log: Merged revision 1713168 from tomcat/trunk: Add findbugs to the build. It is off by default. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/BUILDING.txt tomcat/tc8.0.x/trunk/build.properties.default tomcat/tc8.0.x/trunk/build.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 7 20:14:30 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,
svn commit: r1713174 - in /tomcat/trunk: bin/catalina.sh build.xml webapps/docs/changelog.xml webapps/docs/security-howto.xml
Author: markt Date: Sat Nov 7 20:43:11 2015 New Revision: 1713174 URL: http://svn.apache.org/viewvc?rev=1713174&view=rev Log: Tighten up the default file permissions for the .tar.gz distro and on Unix like operating systems. Modified: tomcat/trunk/bin/catalina.sh tomcat/trunk/build.xml tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/security-howto.xml Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1713174&r1=1713173&r2=1713174&view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Sat Nov 7 20:43:11 2015 @@ -87,6 +87,8 @@ # LOGGING_MANAGER (Optional) Override Tomcat's logging manager # Example (all one line) # LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" +# +# UMASK (Optional) Override Tomcat's default UMASK of 0027 # - # OS specific support. $var _must_ be set to either true or false. @@ -236,6 +238,12 @@ if [ -z "$LOGGING_MANAGER" ]; then LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" fi +# Set UMASK unless it has been overridden +if [ -z "$UMASK" ]; then +UMASK="0027" +fi +umask $UMASK + # Uncomment the following line to make the umask available when using the # org.apache.catalina.security.SecurityListener #JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`" Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1713174&r1=1713173&r2=1713174&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sat Nov 7 20:43:11 2015 @@ -2508,26 +2508,10 @@ skip.installer property in build.propert - - - - - - - - - - - - - - - - - + - + @@ -2562,6 +2546,24 @@ skip.installer property in build.propert + + + + + + + + + + + + + + + + + + Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1713174&r1=1713173&r2=1713174&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Sat Nov 7 20:43:11 2015 @@ -58,6 +58,13 @@ Remove support for Comet. (markt) + +Tighten up the default file permissions for the .tar.gz +distribution so no files or directories are world readable by default. +Configure Tomcat to run with a default umask of 0027 which +may be overridden by setting UMASK in +setenv.sh. (markt) + Modified: tomcat/trunk/webapps/docs/security-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1713174&r1=1713173&r2=1713174&view=diff == --- tomcat/trunk/webapps/docs/security-howto.xml (original) +++ tomcat/trunk/webapps/docs/security-howto.xml Sat Nov 7 20:43:11 2015 @@ -55,17 +55,22 @@ the Tomcat process and provide that user with the minimum necessary permissions for the operating system. For example, it should not be possible to log on remotely using the Tomcat user. -File permissions should also be suitably restricted. Taking the Tomcat -instances at the ASF as an example (where auto-deployment is disabled and -web applications are deployed as exploded directories), the standard -configuration is to have all Tomcat files owned by root with group Tomcat -and whilst owner has read/write privileges, group only has read and world -has no permissions. The exceptions are the logs, temp and work directory -that are owned by the Tomcat user rather than root. This means that even if -an attacker compromises the Tomcat process, they can't change the -Tomcat configuration, deploy new web applications or modify existing web -applications. The Tomcat process runs with a umask of 007 to maintain these -permissions. +File permissions should also be suitably restricted. In the +.tar.gz distribution, files and directories are not world +readable and the group does not have write access. On Unix like operating +systems, Tomcat runs with a default umask of 0027 to maintain +
svn commit: r1713180 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Sat Nov 7 21:13:19 2015
New Revision: 1713180
URL: http://svn.apache.org/viewvc?rev=1713180&view=rev
Log:
Javadoc
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1713180&r1=1713179&r2=1713180&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Sat Nov 7
21:13:19 2015
@@ -381,9 +381,11 @@ public class Http11Processor extends Abs
/**
- * Set the maximum number of Keep-Alive requests to honor.
- * This is to safeguard from DoS attacks. Setting to a negative
- * value disables the check.
+ * Set the maximum number of Keep-Alive requests to allow.
+ * This is to safeguard from DoS attacks. Setting to a negative
+ * value disables the limit.
+ *
+ * @param mkar The new maximum number of Keep-Alive requests allowed
*/
public void setMaxKeepAliveRequests(int mkar) {
maxKeepAliveRequests = mkar;
@@ -391,7 +393,10 @@ public class Http11Processor extends Abs
/**
- * Return the number of Keep-Alive requests that we will honor.
+ * Get the maximum number of Keep-Alive requests allowed. A negative value
+ * means there is no limit.
+ *
+ * @return the number of Keep-Alive requests that we will allow.
*/
public int getMaxKeepAliveRequests() {
return maxKeepAliveRequests;
@@ -400,6 +405,11 @@ public class Http11Processor extends Abs
/**
* Set the maximum size of a POST which will be buffered in SSL mode.
+ * When a POST is received where the security constraints require a client
+ * certificate, the POST body needs to be buffered while an SSL handshake
+ * takes place to obtain the certificate.
+ *
+ * @param msps The maximum size POST body to buffer in bytes
*/
public void setMaxSavePostSize(int msps) {
maxSavePostSize = msps;
@@ -408,6 +418,8 @@ public class Http11Processor extends Abs
/**
* Return the maximum size of a POST which will be buffered in SSL mode.
+ *
+ * @return The size in bytes
*/
public int getMaxSavePostSize() {
return maxSavePostSize;
@@ -415,7 +427,11 @@ public class Http11Processor extends Abs
/**
- * Set the flag to control upload time-outs.
+ * Set the flag to control whether a separate connection timeout is used
+ * during upload of a request body.
+ *
+ * @param isDisabled {@code true} if the separate upload timeout should be
+ * disabled
*/
public void setDisableUploadTimeout(boolean isDisabled) {
disableUploadTimeout = isDisabled;
@@ -423,6 +439,8 @@ public class Http11Processor extends Abs
/**
* Get the flag that controls upload time-outs.
+ *
+ * @return {@code true} if the separate upload timeout is disabled
*/
public boolean getDisableUploadTimeout() {
return disableUploadTimeout;
@@ -430,6 +448,8 @@ public class Http11Processor extends Abs
/**
* Set the upload timeout.
+ *
+ * @param timeout Upload timeout in milliseconds
*/
public void setConnectionUploadTimeout(int timeout) {
connectionUploadTimeout = timeout ;
@@ -437,6 +457,8 @@ public class Http11Processor extends Abs
/**
* Get the upload timeout.
+ *
+ * @return Upload timeout in milliseconds
*/
public int getConnectionUploadTimeout() {
return connectionUploadTimeout;
@@ -445,9 +467,11 @@ public class Http11Processor extends Abs
/**
* Set the server header name.
+ *
+ * @param server The new value to use for the server header
*/
-public void setServer( String server ) {
-if (server==null || server.equals("")) {
+public void setServer(String server) {
+if (server == null || server.equals("")) {
this.server = null;
} else {
this.server = server;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713182 - /tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java
Author: markt
Date: Sat Nov 7 21:17:43 2015
New Revision: 1713182
URL: http://svn.apache.org/viewvc?rev=1713182&view=rev
Log:
Javadoc
This complete the org.apache.coyote package which is now warning free
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java?rev=1713182&r1=1713181&r2=1713182&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java Sat Nov 7
21:17:43 2015
@@ -31,9 +31,9 @@ import org.apache.tomcat.util.buf.ByteCh
public interface InputFilter extends InputBuffer {
/**
- * Some filters need additional parameters from the request. All the
- * necessary reading can occur in that method, as this method is called
- * after the request header processing is complete.
+ * Some filters need additional parameters from the request.
+ *
+ * @param request The request to be associated with this filter
*/
public void setRequest(Request request);
@@ -46,12 +46,18 @@ public interface InputFilter extends Inp
/**
* Get the name of the encoding handled by this filter.
+ *
+ * @return The encoding name as a byte chunk to facilitate comparison with
+ * the value read from the HTTP headers which will also be a
+ * ByteChunk
*/
public ByteChunk getEncodingName();
/**
* Set the next buffer in the filter pipeline.
+ *
+ * @param buffer The next buffer
*/
public void setBuffer(InputBuffer buffer);
@@ -63,19 +69,25 @@ public interface InputFilter extends Inp
* too many bytes were read. This method is allowed to use buffer.doRead
* to consume extra bytes. The result of this method can't be negative (if
* an error happens, an IOException should be thrown instead).
+ *
+ * @throws IOException If an error happens
*/
-public long end()
-throws IOException;
+public long end() throws IOException;
/**
* Amount of bytes still available in a buffer.
+ *
+ * @return The number of bytes in the buffer
*/
public int available();
/**
* Has the request body been read fully?
+ *
+ * @return {@code true} if the request body has been fully read, otherwise
+ * {@code false}
*/
public boolean isFinished();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713184 - in /tomcat/trunk/java/org/apache/catalina/connector: CoyoteAdapter.java Request.java
Author: markt
Date: Sat Nov 7 21:35:29 2015
New Revision: 1713184
URL: http://svn.apache.org/viewvc?rev=1713184&view=rev
Log:
Handle the unlikely case where different versions of a web application are
deployed with different session settings
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
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=1713184&r1=1713183&r2=1713184&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Sat Nov
7 21:35:29 2015
@@ -757,9 +757,11 @@ public class CoyoteAdapter implements Ad
// Reset mapping
request.getMappingData().recycle();
mapRequired = true;
-// Recycle cookies in case correct context is
-// configured with different settings
+// Recycle cookies and session info in case the
+// correct context is configured with different
+// settings
req.getCookies().recycle();
+request.recycleSessionInfo();
}
break;
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1713184&r1=1713183&r2=1713184&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sat Nov 7
21:35:29 2015
@@ -468,18 +468,7 @@ public class Request implements HttpServ
notes.clear();
cookies = null;
-if (session != null) {
-try {
-session.endAccess();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.warn(sm.getString("coyoteRequest.sessionEndAccessFail"),
t);
-}
-}
-session = null;
-requestedSessionCookie = false;
-requestedSessionId = null;
-requestedSessionURL = false;
+recycleSessionInfo();
if (Globals.IS_SECURITY_ENABLED || Connector.RECYCLE_FACADES) {
parameterMap = new ParameterMap<>();
@@ -513,6 +502,23 @@ public class Request implements HttpServ
}
+protected void recycleSessionInfo() {
+if (session != null) {
+try {
+session.endAccess();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+log.warn(sm.getString("coyoteRequest.sessionEndAccessFail"),
t);
+}
+}
+session = null;
+requestedSessionCookie = false;
+requestedSessionId = null;
+requestedSessionURL = false;
+requestedSessionSSL = false;
+}
+
+
// Request Methods
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713185 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/CoyoteAdapter.java java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml
Author: markt Date: Sat Nov 7 21:41:39 2015 New Revision: 1713185 URL: http://svn.apache.org/viewvc?rev=1713185&view=rev Log: Handle the unlikely case where different versions of a web application are deployed with different session settings Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 7 21:41:39 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,169310
svn commit: r1713187 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/CoyoteAdapter.java java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml
Author: markt Date: Sat Nov 7 21:47:07 2015 New Revision: 1713187 URL: http://svn.apache.org/viewvc?rev=1713187&view=rev Log: Handle the unlikely case where different versions of a web application are deployed with different session settings Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 7 21:47:07 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975 -/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,134
svn commit: r1713189 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: Annotations.java ClassParser.java ConstantPool.java
Author: markt
Date: Sat Nov 7 21:52:53 2015
New Revision: 1713189
URL: http://svn.apache.org/viewvc?rev=1713189&view=rev
Log:
Javadoc
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1713189&r1=1713188&r2=1713189&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
Sat Nov 7 21:52:53 2015
@@ -44,7 +44,7 @@ public class Annotations {
/**
- * returns the array of annotation entries in this annotation
+ * @return the array of annotation entries in this annotation
*/
public AnnotationEntry[] getAnnotationEntries() {
return annotation_table;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1713189&r1=1713188&r2=1713189&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
Sat Nov 7 21:52:53 2015
@@ -71,8 +71,8 @@ public final class ClassParser {
* is performed by the java interpreter).
*
* @return Class object representing the parsed class file
- * @throws IOException
- * @throws ClassFormatException
+ * @throws IOException If an I/O occurs reading the byte code
+ * @throws ClassFormatException If the byte code is invalid
*/
public JavaClass parse() throws IOException, ClassFormatException {
/** Read headers /
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1713189&r1=1713188&r2=1713189&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
Sat Nov 7 21:52:53 2015
@@ -94,7 +94,7 @@ public class ConstantPool {
* @param tag Tag of expected constant, i.e., its type
* @return Constant value
* @seeConstant
- * @throws ClassFormatException
+ * @throws ClassFormatException If the constant is not of the expected
type
*/
public Constant getConstant( int index, byte tag ) throws
ClassFormatException {
Constant c;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1713158 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
2015-11-07 21:35 GMT+03:00 Rémy Maucherat :
> 2015-11-07 18:17 GMT+01:00 :
>
>> Author: kkolinko
>> Date: Sat Nov 7 17:17:55 2015
>> New Revision: 1713158
>>
>> URL: http://svn.apache.org/viewvc?rev=1713158&view=rev
>> Log:
>> Copy test implementation from Tomcat 7.
>> This a) uses logging instead of System.out,
>> b) validates result of the test and fail()s, instead of just printing a
>> message onto System.out
>>
>> When I voted for CTR on 6, it was agreed upon that only critical fixes
> would go in 6. Obviously, there's no regression risk with the testsuite,
> but what is the rationale with such an upgrade ?
On commit policy
--
There is no such agreement as "only critical fixes would go in 6"
There was none both either before nor after the CTR vote.
In my opinion, any good fixes that do not introduce new bugs are OK.
Agenda
--
My ultimate goal is to improve test coverage of Tomcat 6.
There is tomcat6-testing branch that I once started [1], you can look
at BRANCH-README.txt there
[1] https://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/
I do not know whether that goal of adding new tests is reachable.
As the first and simple goal I am reviewing the existing tests,
converting them to JUnit 4
and updating them by using Tomcat 7 as the reference.
I am converting th test to JUnit 4 for the following reasons:
a. It makes it easier to compare current code with Tomcat 7
b. It allows to use @Ignore and assumeX..() to skip tests
Tribes
--
I am running all the tests locally (starting JUnit from within Eclipse
IDE) so to do not break anything. Initial state before staring this
work was: all tests were completing successfully, except 2 tests in
tribes:
1) o.a.c.tribes.test.channel.TestDataIntegrity.testDataSendASYNCM() fails with:
junit.framework.AssertionFailedError: Checking success messages.
expected:<1> but was:<1835>
2) o.a.c.tribes.test.channel.TestRemoteProcessException.testDataSendSYNCACK()
fails with:
ChannelException: Send failed, attempt:2 max:1; Faulty
members:tcp://{my id address here}:4001;
In Tomcat 7 there was some work to investigate test failures and to
improve stability of tribes tests several years ago (in March 2012).
If we are going to keep these tests as part of test suite, I think it
is important to backport those test fixes.
This specific commit (r1713158) is one of those backports.
As just now I am testing TestDataIntegrity, I see that its failure is
not fixed by simple backport of Tomcat 7 changes in the test. Some
fix in the tribes itself is needed, as the test runs successfully in
Tomcat 7. Fixing the tribes itself is out of my scope.
My plans on completing the current task
1. Convert remaining tests to JUnit 4. It is almost done, there are
just several of them remaining.
2. If we ever configure to run Tomcat 6 tests automatically, we are
going to skip those failing tests. Tomcat 7 does in its build.xml:
tribes/test/** is a subset of Tribes tests. Most of the test have been
moved to other packages, tribes/group, /io, /membership.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713193 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
Author: markt
Date: Sat Nov 7 22:38:18 2015
New Revision: 1713193
URL: http://svn.apache.org/viewvc?rev=1713193&view=rev
Log:
Remove unused constant.
Reported by UC Detector
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1713193&r1=1713192&r2=1713193&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java Sat Nov
7 22:38:18 2015
@@ -31,8 +31,6 @@ public class Constants {
// Executor configuration
public static final String EXECUTOR_CORE_SIZE_INIT_PARAM =
"org.apache.tomcat.websocket.executorCoreSize";
-public static final String EXECUTOR_MAX_SIZE_INIT_PARAM =
-"org.apache.tomcat.websocket.executorMaxSize";
public static final String EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM =
"org.apache.tomcat.websocket.executorKeepAliveTimeSeconds";
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713194 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/ java/org/apache/tomcat/util/threads/ test/org/apache/catalina/authenticator/ test/org/apache/tomcat/util/buf/
Author: markt
Date: Sat Nov 7 22:38:55 2015
New Revision: 1713194
URL: http://svn.apache.org/viewvc?rev=1713194&view=rev
Log:
Remove unused constant.
Reported by UC Detector
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/trunk/java/org/apache/tomcat/util/threads/Constants.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java Sat Nov
7 22:38:55 2015
@@ -52,13 +52,4 @@ public class ByteBufferHolder {
return false;
}
}
-
-
-public boolean hasData() {
-if (flipped.get()) {
-return buf.remaining()>0;
-} else {
-return buf.position()>0;
-}
-}
}
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java Sat Nov
7 22:38:55 2015
@@ -45,20 +45,6 @@ public class ByteBufferUtils {
/**
- * Default byte buffer expansion. Doubles current size. Buffers are assumed
- * to be in 'write to' mode since there would be no need to expand a buffer
- * while it was in 'read from' mode.
- *
- * @param in Buffer to expand
- * @return The expanded buffer with any data from the input buffer copied
- * in to it
- */
-public static ByteBuffer expand(ByteBuffer in) {
-return expand(in, in.capacity() * 2);
-}
-
-
-/**
* Expands buffer to the given size unless it is already as big or bigger.
* Buffers are assumed to be in 'write to' mode since there would be no
need
* to expand a buffer while it was in 'read from' mode.
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Sat Nov 7
22:38:55 2015
@@ -142,7 +142,6 @@ public final class ByteChunk implements
* Resets the message buff to an uninitialized state.
*/
public void recycle() {
-//buff = null;
charset=null;
start=0;
end=0;
@@ -150,10 +149,6 @@ public final class ByteChunk implements
hasHashCode = false;
}
-public void reset() {
-buff=null;
-}
-
// Setup
public void allocate( int initial, int limit ) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Sat Nov 7
22:38:55 2015
@@ -56,36 +56,16 @@ public final class UEncoder {
private ByteChunk bb=null;
private CharChunk cb=null;
private CharChunk output=null;
-private final boolean readOnlySafeChars;
-
-public UEncoder() {
-this.safeChars = initialSafeChars();
-readOnlySafeChars = false;
-}
/**
* Create a UEncoder with an unmodifiable safe character set.
- *
- * Calls to {@link UEncoder#addSafeCharacter(char) addSafeCharacter(char)}
- * on instances created by this constructor will throw an
- * {@link IllegalStateException}.
*
- * @param safeCharsSet
- *safe characters for this encoder
+ * @param safeCharsSet safe characters for this encoder
*/
public UEncoder(SafeCharsSet
svn commit: r1713196 - /tomcat/trunk/TOMCAT-NEXT.txt
Author: markt Date: Sat Nov 7 22:50:20 2015 New Revision: 1713196 URL: http://svn.apache.org/viewvc?rev=1713196&view=rev Log: Update Javadoc warning count Modified: tomcat/trunk/TOMCAT-NEXT.txt Modified: tomcat/trunk/TOMCAT-NEXT.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1713196&r1=1713195&r2=1713196&view=diff == --- tomcat/trunk/TOMCAT-NEXT.txt (original) +++ tomcat/trunk/TOMCAT-NEXT.txt Sat Nov 7 22:50:20 2015 @@ -17,7 +17,7 @@ Notes of things to consider for the next major Tomcat release (9.0.x) - 1. Fix Java 8 Javadoc warnings. Currently ~2650. + 1. Fix Java 8 Javadoc warnings. Currently ~2400. 2. DONE. Remove BIO AJP and HTTP connector. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1713193 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
2015-11-08 1:38 GMT+03:00 :
> Author: markt
> Date: Sat Nov 7 22:38:18 2015
> New Revision: 1713193
>
> URL: http://svn.apache.org/viewvc?rev=1713193&view=rev
> Log:
> Remove unused constant.
> Reported by UC Detector
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
>
> Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1713193&r1=1713192&r2=1713193&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java Sat
> Nov 7 22:38:18 2015
> @@ -31,8 +31,6 @@ public class Constants {
> // Executor configuration
> public static final String EXECUTOR_CORE_SIZE_INIT_PARAM =
> "org.apache.tomcat.websocket.executorCoreSize";
> -public static final String EXECUTOR_MAX_SIZE_INIT_PARAM =
> -"org.apache.tomcat.websocket.executorMaxSize";
> public static final String EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM =
> "org.apache.tomcat.websocket.executorKeepAliveTimeSeconds";
Deprecate in 8.0.x ?
For a reference:
This parameter was removed (hard-coded as Integer.MAX_VALUE) as the
fix for BZ 56577.
https://bz.apache.org/bugzilla/show_bug.cgi?id=56577
http://svn.apache.org/r1600743
Documentation is OK, this parameter is not mentioned there.:
web-socket-howto.xml was updated by BZ 56577 fix/
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713198 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java AbstractProcessorLight.java ActionHook.java Processor.java ajp/AjpProcessor.java http11/Http11Processor.java
Author: markt
Date: Sat Nov 7 23:01:05 2015
New Revision: 1713198
URL: http://svn.apache.org/viewvc?rev=1713198&view=rev
Log:
Javadoc for Processor
- Pull up Javadoc where it was only present further down the hierarchy
- Remove duplicated Javadoc
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java
tomcat/trunk/java/org/apache/coyote/ActionHook.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1713198&r1=1713197&r2=1713198&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Sat Nov 7
23:01:05 2015
@@ -107,9 +107,6 @@ public abstract class AbstractProcessor
}
-/**
- * The request associated with this processor.
- */
@Override
public Request getRequest() {
return request;
@@ -152,9 +149,6 @@ public abstract class AbstractProcessor
}
-/**
- * Set the SSL information for this HTTP connection.
- */
@Override
public final void setSslSupport(SSLSupport sslSupport) {
this.sslSupport = sslSupport;
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java?rev=1713198&r1=1713197&r2=1713198&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java Sat Nov 7
23:01:05 2015
@@ -129,13 +129,14 @@ public abstract class AbstractProcessorL
}
}
+
/**
* Service a 'standard' HTTP request. This method is called for both new
* requests and for requests that have partially read the HTTP request line
* or HTTP headers. Once the headers have been fully read this method is
not
* called again until there is a new HTTP request to process. Note that the
* request type may change during processing which may result in one or
more
- * calls to {@link #dispatch(SocketStatus)}.
+ * calls to {@link #dispatch(SocketStatus)}. Requests may be pipe-lined.
*
* @param socketWrapper The connection to process
*
Modified: tomcat/trunk/java/org/apache/coyote/ActionHook.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionHook.java?rev=1713198&r1=1713197&r2=1713198&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ActionHook.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionHook.java Sat Nov 7 23:01:05 2015
@@ -35,7 +35,6 @@ package org.apache.coyote;
*/
public interface ActionHook {
-
/**
* Send an action to the connector.
*
@@ -43,6 +42,4 @@ public interface ActionHook {
* @param param Action parameter
*/
public void action(ActionCode actionCode, Object param);
-
-
}
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1713198&r1=1713197&r2=1713198&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Sat Nov 7 23:01:05 2015
@@ -62,6 +62,9 @@ public interface Processor {
*/
void timeoutAsync(long now);
+/**
+ * @return The request associated with this processor.
+ */
Request getRequest();
/**
@@ -70,6 +73,11 @@ public interface Processor {
*/
void recycle();
+/**
+ * Set the SSL information for this HTTP connection.
+ *
+ * @param sslSupport The SSL support object to use for this connection
+ */
void setSslSupport(SSLSupport sslSupport);
/**
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1713198&r1=1713197&r2=1713198&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sat Nov 7
23:01:05 2015
@@ -335,13 +335,6 @@ public class AjpProcessor extends Abstra
// - Public Methods
-
-/**
- * Send
Re: [VOTE] Release Apache Tomcat Native 1.2.2
Am 04.11.2015 um 21:15 schrieb Mark Thomas:
OK. Here we go again :)
Thanks to everyone who has helped test 1.2.x so far. I'm hopeful that
this one will be good enough for the 9.0.0 RCs and - fingers crossed -
to replace 1.1.x as well.
Version 1.2.2 includes the following changes:
- Forward port some OpenSSL I/O changes from 1.1.x that fixed a
number of unit tests failures
The proposed release artefacts can be found at [1],
and the build was done using tag [2].
The Apache Tomcat Native 1.2.2 is
[X] Stable, go ahead and release
[ ] Broken because of ...
+1 to release, detailed results especially about unit test failures see
below.
Note that the file 'bin/openssl.exe' is no longer part of the binary
distribution. It was for tcnative 1.1.x.
We might want to remove some resolved items from TODO.txt and
probably can resolve some more for the next releases.
- Tested with APR 1.5.2 and OpenSSL 1.0.2d
- Platforms Solaris 10 Sparc, SLES 11 64 Bits, RHEL 6 64 Bits
- configure flag "--enable-maintainer-mode"
- Using Java versions 1.8.0_60 for tcnative build, tests/examples
and TC trunk unit tests, 1.7.0_80 for TC 8 unit tests and
1.6.0_45 for TC 7 unit tests
- Using "-XX:-UseCompressedClassPointers" in combination with
Java 8 on 64 Bit Linux
- MD5 OK
- signatures OK
- gz and zip for sources consistent
- source dist consistent with svn tag
- config-guess and config.sub from apr 1.5 (copied by buildconf)
1-3 months outdated, not too bad.
- VERSIONS says OpenSSL 1.0.2d (OK) and APR 1.5.2
- recreated release with jnirelease script, results are
consistent with source dist, except for minor expected diffs in
CHANGELOG.txt and generated docs
(whitespace, "HTML" instead of "html" in DOCTYPE)
- make succeeds and builds lib
- Warning in src/sslutils.c:
src/sslutils.c:634:12: warning: 'proto_len' may be used
uninitialized in this function [-Wmaybe-uninitialized]
p -= proto_len;
- "ant test" succeeds
- unit test results for trunk (apr, nio and nio2),
TC8 (only apr) and TC7 (only apr)
- Tests failing only for trunk but for all connectors
and all platforms:
- org.apache.tomcat.util.net.openssl.ciphers.TestCipher
- org.apache.tomcat.util.net.openssl.ciphers.
TestOpenSSLCipherConfigurationParser
- Tests failing only for trunk but only for apr:
- SLES 11: org.apache.coyote.http2.TestHttp2Section_5_2 (crashed)
- RHEL 6: org.apache.coyote.http2.TestHttp2Section_6_5 (crashed)
- Tests failing for various combinations
- org.apache.catalina.comet.TestCometProcessor
TC 7 SLES 11, TC 8 RHEL 6
- org.apache.catalina.core.TestAsyncContextImpl
trunk RHEL 6 all connectors, trunk SLES 11 nio,
TC 8 RHEL 6+SLES 11
- org.apache.tomcat.websocket.TestWebSocketFrameClient
trunk SLES 11 all connectors, TC 7 SLES 11, TC 8 SLES 11
- org.apache.tomcat.websocket.TestWebSocketFrameClientSSL
trunk Solaris 10+SLES 11 all connectors, TC 8 SLES 11
- org.apache.tomcat.websocket.TestWsWebSocketContainer
trunk SLES 11 apr, TC 8 SLES 11, TC 7 RHEL 6+SLES 11
- some of the failures were in fact java.lang.OutOfMemoryError:
- all of them only on SLES 11 for TC 7 and TC 8
- TC 7+8 org.apache.tomcat.websocket.TestWebSocketFrameClient
Exception: java.lang.OutOfMemoryError thrown from the
UncaughtExceptionHandler in various threads
("WebSocketClient-AsyncIO-1", "WebSocket background processing",
...)
- TC 7+8 org.apache.tomcat.websocket.TestWebSocketFrameClientSSL
TC8:
[junit] Exception in thread "WebSocketClient-SecureIO-2"
java.lang.OutOfMemoryError: Java heap space
[junit] at javax.crypto.CipherSpi.bufferCrypt(CipherSpi.java:803)
[junit] at javax.crypto.CipherSpi.engineUpdate(CipherSpi.java:546)
[junit] at javax.crypto.Cipher.update(Cipher.java:1969)
[junit] at sun.security.ssl.CipherBox.decrypt(CipherBox.java:469)
[junit] at
sun.security.ssl.EngineInputRecord.decrypt(EngineInputRecord.java:210)
[junit] at
sun.security.ssl.SSLEngineImpl.readRecord(SSLEngineImpl.java:959)
[junit] at
sun.security.ssl.SSLEngineImpl.readNetRecord(SSLEngineImpl.java:890)
[junit] at
sun.security.ssl.SSLEngineImpl.unwrap(SSLEngineImpl.java:764)
[junit] at javax.net.ssl.SSLEngine.unwrap(SSLEngine.java:624)
[junit] at
org.apache.tomcat.websocket.AsyncChannelWrapperSecure$ReadTask.run(AsyncChannelWrapperSecure.java:279)
[junit] at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
[junit] at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
TC7:
[junit] Exception in thread "WebSocketClient-SecureIO-1"
java.lang.OutOfMemoryError: Java heap space
[junit] at javax.crypto.CipherSpi.bufferCrypt(CipherSpi.java:803)
[junit] at javax.crypto.CipherSpi.engineUpdate(CipherSpi.java:546)
[junit] at javax.crypto.Cipher.update(Cipher.jav
[Bug 56108] Allow user-defined Diffie-Hellman parameters (secure DH-Cipher)
https://bz.apache.org/bugzilla/show_bug.cgi?id=56108 --- Comment #5 from Rainer Jung --- Yes. A release vote for the first public release 1.2.2 is in progress. The release should be available in a few days. -- 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-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 6 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 -WARNING- No directory [/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: 46 mins 25 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151108-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151108.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151108-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-ma ster/dest-20151108/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-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/jaspic-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/
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-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-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 -WARNING- No directory [/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: 39 mins 23 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151108-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151108.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151108-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-20151108/bin/op enssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/t
Bug report for Tomcat 7 [2015/11/08]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |18500|New|Enh|2003-03-30|Host aliases to match by regular expression | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |43866|New|Enh|2007-11-14|add support for session attribute propagation with| |49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak| |49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al| |49821|New|Enh|2010-08-25|Tomcat CLI [PATCH/Contribution] | |50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou| |50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply| |50234|New|Enh|2010-11-08|JspC use servlet 3.0 features | |50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern| |50944|Ver|Blk|2011-03-18|JSF: java.lang.NullPointerException at com.sun.fac| |51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class| |51423|Inf|Enh|2011-06-23|[Patch] to add a path and a version parameters to | |51463|New|Enh|2011-07-01|Tomcat.setBaseDir (package org.apache.catalina.st| |51496|New|Enh|2011-07-11|NSIS - Warn that duplicate service name will resul| |51587|New|Enh|2011-07-29|Implement status and uptime commands | |51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter [PATC| |52235|New|Enh|2011-11-23|Please do a bit of SEO tuning for the web site| |52381|New|Enh|2011-12-22|Please add OSGi metadata | |52448|New|Enh|2012-01-11|Cache jar indexes in WebappClassLoader to speed up| |52489|New|Enh|2012-01-19|Enhancement request for code signing of war files | |52688|New|Enh|2012-02-16|Add ability to remove old access log files [PATCHE| |52952|New|Enh|2012-03-20|Improve ExtensionValidator handling for embedded s| |53085|New|Enh|2012-04-16|[perf] [concurrency] DefaultInstanceManager.annota| |53387|New|Enh|2012-06-08|SSI: Allow to use $1 to get result of regular expr| |53411|Opn|Enh|2012-06-13|NullPointerException in org.apache.tomcat.util.buf| |53492|New|Enh|2012-07-01|Make JspC shell multithreaded | |53553|New|Enh|2012-07-16|[PATCH] Deploy uploaded WAR with context.xml from | |53620|New|Enh|2012-07-30|[juli] delay opening a file until something gets l| |54330|New|Enh|2012-12-19|Patch with some refactoring of Member.java [PATCH | |54499|New|Enh|2013-01-29|Implementation of Extensible EL Interpreter | |54802|New|Enh|2013-04-04|Provide location information for exceptions thrown| |55104|New|Enh|2013-06-16|Allow passing arguments with spaces to Commons Dae| |55470|New|Enh|2013-08-23|Help users for ClassNotFoundExceptions during star| |55477|New|Enh|2013-08-23|Add a solution to map an realm name to a security | |55662|New|Enh|2013-10-17|Add a way to set an instance of java.sql.Driver di| |56148|New|Enh|2014-02-17|support (multiple) ocsp stapling | |56181|New|Enh|2014-02-23|RemoteIpValve & RemoteIpFilter: HttpServletRequest| |56300|New|Enh|2014-03-22|[Tribes] No useful examples, lack of documentation| |56438|New|Enh|2014-04-21|If jar scan does not find context config or TLD co| |56614|New|Enh|2014-06-12|Add a switch to ignore annotations detection on ta| |56777|Opn|Enh|2014-07-28|Allow configuration resources to be loaded from pl| |56787|New|Enh|2014-07-29|Simplified jndi name parsing | |57367|New|Enh|2014-12-18|If JAR scan experiences a stack overflow, give the| |57705|New|Enh|2015-03-14|RemoteAddrValve: no log message no explanation whe| |57827|New|Enh|2015-04-17|Enable adding/removing of members via jmx in a sta| |57870|New|Enh|2015-04-29|backport GzipOutputFilter #doWrite to Tomcat 7 to | |57872|New|Enh|2015-04-29|Do not auto-switch session cookie to version=1 due| |57892|New|Enh|2015-05-05|Log once a warning if a symbolic link is ignored (| |57906|New|Min|2015-05-08|Message about failure to load ApplicationContextFa| |57937|New|Enh|2015-05-19|Request for a form based two factor authentication| |58289|
Bug report for Tomcat 6 [2015/11/08]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |43400|New|Enh|2007-09-14|enum support for tag libs | |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44312|Opn|Enh|2008-01-28|Warn when overwritting docBase of the default Host| |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|Opn|Enh|2008-11-21|Tomcat reloading of context.xml does not update do| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46558|Opn|Enh|2009-01-19|Shutdown port with address binding| |47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho| |47242|New|Enh|2009-05-22|request for AJP command line client | |47281|New|Enh|2009-05-28|Efficiency of the JDBCStore | |47407|New|Enh|2009-06-23|HttpSessionListener doesn't operate in the session| |47467|New|Enh|2009-07-02|Deployment of the war file by URL when contextpath| |47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked| |48358|Opn|Enh|2009-12-09|JSP-unloading reloaded| |48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.| |48672|New|Enh|2010-02-03|Tomcat Virtual Host Manager (/host-manager) have b| |48674|New|Enh|2010-02-03|Tomcat Virtual Host Manager application doesn't pe| |48743|New|Enh|2010-02-15|Make the SLEEP variable in catalina.sh settable fr| |48922|New|Enh|2010-03-16|org.apache.catalina.connector.Request clone static| |48928|New|Enh|2010-03-17|An alternative solution to preloading classes when| |49176|Opn|Enh|2010-04-23|Jasper in Dev Mode Is Memory Inefficient | |49464|New|Enh|2010-06-18|DefaultServlet and CharacterEncoding | |49531|New|Enh|2010-06-30|singlesignon failover not working on DeltaManager/| |49804|New|Enh|2010-08-23|Allow Embedded.redirectStreams value to be configu| |49943|New|Enh|2010-09-16|Logging (via juli) does not reread configuration c| |50285|New|Enh|2010-11-17|Standard HTTP and AJP connectors silently ignore a| |50288|New|Enh|2010-11-17|Uploading a war file that already exists should au| |50677|Opn|Enh|2011-01-27|Allow system property variables in catalina.proper| |50692|New|Enh|2011-01-31|Improve log message in ThreadPool.logFull | |51142|New|Enh|2011-05-03|Offer possible resolution of StringIndexOutOfBound| |51513|New|Enh|2011-07-15|GzipInterceptor: Do not compress small packages | |52791|New|Enh|2012-02-28|[PATCH] read windows installer default values from| |52924|New|Enh|2012-03-15|Add support for per-application JSP compile config| |53011|New|Enh|2012-03-31|Ant Jasper task fails after one error | |53031|New|Enh|2012-04-03|Ant Jasper task should support Fork option| |53677|New|Nor|2012-08-07|ArrayIndexOutOfBoundsException when response heade| |54007|New|Nor|2012-10-15|Improve handling of failed web application deploym| |56607|New|Enh|2014-06-09|shutdown.bat exits before shutdown| |56653|
Bug report for Taglibs [2015/11/08]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements | |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Enh|2009-12-02|TLD generator | |57434|New|Nor|2015-01-11|Race condition in EL1.0 validation| |57548|New|Min|2015-02-08|Auto-generate the value for org.apache.taglibs.sta| |57684|New|Min|2015-03-10|Version info should be taken from project version | +-+---+---+--+--+ | Total8 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Modules [2015/11/08]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48861|New|Nor|2010-03-04|Files without AL headers | |49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean | |49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da| |50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen| |51595|Inf|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho| |51879|Inf|Enh|2011-09-22|Improve access to Native Connection Methods | |52024|Inf|Enh|2011-10-13|Custom interceptor to support automatic failover o| |53199|Inf|Enh|2012-05-07|Refactor ConnectionPool to use ScheduledExecutorSe| |54437|New|Enh|2013-01-16|Update PoolProperties javadoc for ConnectState int| |54929|Inf|Nor|2013-05-05|jdbc-pool cannot be used with Java 1.5, "java.lang| |55078|New|Nor|2013-06-07|Configuring a DataSource Resource with dataSourceJ| |56046|New|Enh|2014-01-21|org.apache.tomcat.jdbc.pool.XADataSource InitSQL p| |56088|New|Maj|2014-01-29|AbstractQueryReport$StatementProxy throws exceptio| |56310|Inf|Maj|2014-03-25|PooledConnection and XAConnection not handled corr| |56586|New|Nor|2014-06-02|initSQL should be committed if defaultAutoCommit =| |56775|New|Nor|2014-07-28|PoolCleanerTime schedule issue| |56779|New|Nor|2014-07-28|Allow multiple connection initialization statement| |56790|New|Nor|2014-07-29|Resizing pool.maxActive to a higher value at runti| |56798|New|Nor|2014-07-31|Idle eviction strategy could perform better (and i| |56804|New|Nor|2014-08-02|Use a default validationQueryTimeout other than "f| |56805|New|Nor|2014-08-02|datasource.getConnection() may be unnecessarily bl| |56837|New|Nor|2014-08-11|if validationQuery have error with timeBetweenEvic| |56970|New|Nor|2014-09-11|MaxActive vs. MaxTotal for commons-dbcp and tomcat| |56974|New|Nor|2014-09-12|jdbc-pool validation query defaultAutoCommit statu| |57460|New|Nor|2015-01-19|[DB2]Connection broken after few hours but not rem| |57729|New|Enh|2015-03-20|Add QueryExecutionReportInterceptor to log query e| +-+---+---+--+--+ | Total 28 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 9 [2015/11/08]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |57505|New|Enh|2015-01-27|Add integration tests for JspC| |57661|New|Enh|2015-03-04|Delay sending of 100 continue response until appli| |57767|New|Enh|2015-03-27|Websocket client proprietary configuration| |58242|New|Enh|2015-08-13|Scanning jars in classpath to get annotations in p| |58530|New|Enh|2015-10-23|Proposal for new Manager HTML GUI | |58548|New|Enh|2015-10-26|support certifcate transparency | |58588|New|Enh|2015-11-05|Remove extras/juli from Tomcat 9 build and deliver| |58590|New|Enh|2015-11-05|org.apache.catalina.realm.MemoryRealm can use back| +-+---+---+--+--+ | Total8 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 8 [2015/11/08]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing | |51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs| |53737|Opn|Enh|2012-08-18|Use ServletContext.getJspConfigDescriptor() in Jas| |53930|New|Enh|2012-09-24|allow capture of catalina stdout/stderr to a comma| |54503|New|Enh|2013-01-29|SAML2 based single sign on| |54700|New|Enh|2013-03-15|Improvement: Add support for system property to sp| |54741|New|Enh|2013-03-22|Add org.apache.catalina.startup.Tomcat#addWebapp(S| |55006|New|Enh|2013-05-22|Add http proxy support for ClientEndpoint using sy| |55243|New|Enh|2013-07-11|Add special search string for nested roles| |55252|New|Enh|2013-07-12|Separate Ant and command-line wrappers for JspC | |55383|New|Enh|2013-08-07|Improve markup and design of Tomcat's HTML pages | |55479|New|Enh|2013-08-24|JSR 196 (JASPIC) support in Tomcat| |9|New|Enh|2013-09-14|UserDatabaseRealm enhacement: may use local JNDI | |55675|New|Enh|2013-10-18|Checking and handling invalid configuration option| |55770|New|Enh|2013-11-12|Allow the crlFile to be reloaded | |55788|New|Enh|2013-11-16|TagPlugins should key on tag QName rather than imp| |55969|New|Enh|2014-01-07|Security-related enhancements to the Windows Insta| |56166|New|Enh|2014-02-20|Suggestions for exception handling (avoid potentia| |56361|New|Enh|2014-04-08|org.apache.tomcat.websocket.WsWebSocketContainer#b| |56398|New|Enh|2014-04-11|Support Arquillian-based unit testing | |56399|New|Enh|2014-04-11|Re-factor request/response recycling so Coyote and| |56402|New|Enh|2014-04-11|Add support for HTTP Upgrade to AJP components| |56448|New|Enh|2014-04-23|Implement a robust solution for client initiated S| |56546|New|Enh|2014-05-19|Improve thread trace logging in WebappClassLoader.| |56676|New|Enh|2014-06-26|Normalize access to native library| |56713|New|Enh|2014-07-12|Limit time that incoming request waits while webap| |56724|New|Enh|2014-07-15|Restart Container background thread if it died une| |56838|Opn|Enh|2014-08-11|Performance drop when repeatedly calling WebappCla| |56890|Inf|Maj|2014-08-26|getRealPath returns null | |56917|New|Enh|2014-09-05|Create a configuration to write relative 302 respo| |56966|New|Enh|2014-09-11|AccessLogValve's elapsed time has 15ms precision o| |57130|New|Enh|2014-10-22|Allow digest.sh to accept password from a file or | |57287|New|Enh|2014-11-29|Sort files listed by DefaultServlet | |57345|New|Enh|2014-12-12|APR/Native HTTPS Connector Should Support All Open| |57421|New|Enh|2015-01-07|Farming default directories | |57486|New|Enh|2015-01-23|Improve reuse of ProtectedFunctionMapper instances| |57665|New|Enh|2015-03-05|support x-forwarded-host | |57701|New|Enh|2015-03-13|Implement "[Redeploy]" button for a web applicatio| |57809|New|Enh|2015-04-13|Don't store merged web.xml| |57830|New|Enh|2015-04-18|Add support for ProxyProtocol | |58052|Opn|Enh|2015-06-19|RewriteValve: Implement additional RewriteRule dir| |58072|New|Enh|2015-06-23|ECDH curve selection | |58111|New|Enh|2015-07-07|Update to Eclipse ECJ 4.5 | |58143|Opn|Enh|2015-07-15|The WebppClassLoader doesn't call transformers on | |58283|New|Enh|2015-08-25|Change Base Path to use (user.home) instead of abs| |58433|New|Enh|2015-09-21|RemoteIpValve not activated on redirect from mappi| |58577|New|Enh|2015-11-03|JMX Proxy Servlet can't handle overloaded methods | |58596|New|Nor|2015-11-07|Add Patch Binary -- Running.txt says tomcat is a J| +-+---+---+--+--+ | Total 48 bugs | +---+ --
Bug report for Tomcat Native [2015/11/08]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| |49038|Inf|Nor|2010-04-02|Crash in tcnative | |52319|Inf|Maj|2011-12-12|Tomcat 6 crashes with [libapr-1.so.0+0x196da] sig| |52627|New|Min|2012-02-08|Segmentation fault in org.apache.tomcat.jni.File.i| |53605|Inf|Nor|2012-07-26|use tcnative-1.1.24 Tomcat shutdown still crash | |53940|New|Enh|2012-09-27|Added support for new CRL loading after expiration| |54085|New|Nor|2012-11-01|ssl_socket_recv sometimes loops infinitely with no| |54664|New|Reg|2013-03-11|[1.1.27 branch] Poll.remove incorrectly reports AP| |55087|New|Cri|2013-06-10|tomcat crashes in tcnative-1.dll with OCSP when OC| |55113|Inf|Nor|2013-06-18|FIPS-compatible OpenSSL fails fingerprint test in | |55114|New|Nor|2013-06-18|BUILDING file in win32 source package contains UNI| |55771|New|Maj|2013-11-12|Memory leak and then crash in org.apache.tomcat.jn| |55797|Inf|Nor|2013-11-19|Tomcat 7.0.47 crashes using server jvm.dll and APR| |55938|New|Nor|2013-12-29|clang-analyzer report for 1.1.31 | |56027|Opn|Nor|2014-01-17|Unable to use TCN on RHEL6 boxes if box is booted | |56108|New|Cri|2014-02-04|Allow user-defined Diffie-Hellman parameters (secu| |56378|New|Nor|2014-04-09|Cert load fails if cert is located in path with no| |56415|New|Maj|2014-04-16|EXCEPTION_ACCESS_VIOLATION (0xc005) in tcnativ| |57140|New|Cri|2014-10-24|tcnative-1.dll 1.1.31 indicated in fatal error| |57521|New|Cri|2015-02-02|Tomcat randomly crashes with [libtcnative-1.so.0.1| |57815|New|Enh|2015-04-15|Improve error message when OpenSSL does not suppor| |58082|New|Nor|2015-06-29|Old version of JUnit specified| |58194|New|Maj|2015-07-30|Tomcat crash EXCEPTION_ACCESS_VIOLATION in tcnativ| |58244|New|Nor|2015-08-14|two way SSL loses client certificate after a few r| |58263|New|Nor|2015-08-19|APR SSL connector crashes | |58434|New|Nor|2015-09-21|Make Fails Against LibreSSL | +-+---+---+--+--+ | Total 26 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Connectors [2015/11/08]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47327|New|Enh|2009-06-07|Return tomcat authenticated user back to mod_jk (A| |47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_| |47714|Opn|Cri|2009-08-20|Response mixed between users | |47750|New|Maj|2009-08-27|ISAPI: Loss of worker settings when changing via j| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |48490|Inf|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Enh|2010-01-18|Allow to turn off retries for LB worker | |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work| |49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat | |49732|Inf|Nor|2010-08-10|reply_timeout can't wait forever. | |49822|New|Enh|2010-08-25|Add hash lb worker method | |49903|New|Enh|2010-09-09|Make workers file reloadable | |52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus| |53883|New|Maj|2012-09-17|isapi_redirect v 1.2.37 crashes w3wp.exe on the p| |53977|New|Maj|2012-10-07|32bits isapi connector cannot work in wow64 mode | |54027|New|Cri|2012-10-18|isapi send request to outside address instead of i| |54117|New|Maj|2012-11-08|access violation exception in isapi_redirect.dll | |54596|Opn|Nor|2013-02-22|Relative path functionality truncates last charact| |54621|New|Nor|2013-02-28|[PATCH] custom mod_jk availability checks | |54923|New|Nor|2013-05-03|nsapi_redirect.so does not work with iPlanet on So| |56489|New|Enh|2014-05-05|Include a directory for configuration files | |56576|New|Enh|2014-05-29|Websocket support | |57066|New|Cri|2014-10-08|isapi_redirect.dll is crashing intermittently when| |57402|New|Enh|2014-12-30|Provide correlation ID between mod_jk log and acce| |57403|New|Enh|2014-12-30|Persist configuration changes made via status work| |57407|New|Enh|2014-12-31|Make session_cookie, session_path and session_cook| |57485|New|Nor|2015-01-23|mod_jk passed the incomplete chunked transferred r| |57790|New|Enh|2015-04-03|Check worker names for typos | |57946|New|Nor|2015-05-23|Configuration example for mod_jk should be updated| |58249|New|Nor|2015-08-17|Documentation regarding max_packet_size parameter | |58287|New|Nor|2015-08-26|Questionable use of "Global" objects on Windows | |58425|New|Nor|2015-09-17|validate::jk_ajp12_worker.c always returns JK_FALS| |58481|New|Nor|2015-10-05|JAX WS Request fails with "Premature end of file" | |58504|New|Nor|2015-10-19|Maintenance process skipped occasionally | +-+---+---+--+--+ | Total 41 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
