svn commit: r1751401 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Tue Jul 5 07:54:49 2016 New Revision: 1751401 URL: http://svn.apache.org/viewvc?rev=1751401&view=rev Log: Prep for next dev cycle Modified: tomcat/trunk/build.properties.default tomcat/trunk/res/maven/mvn.properties.default tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1751401&r1=1751400&r2=1751401&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Tue Jul 5 07:54:49 2016 @@ -27,7 +27,7 @@ version.major=9 version.minor=0 version.build=0 version.patch=0 -version.suffix=.M9-dev +version.suffix=.M10-dev # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed Modified: tomcat/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1751401&r1=1751400&r2=1751401&view=diff == --- tomcat/trunk/res/maven/mvn.properties.default (original) +++ tomcat/trunk/res/maven/mvn.properties.default Tue Jul 5 07:54:49 2016 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=9.0.0.M9 +maven.asf.release.deploy.version=9.0.0.M10 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1751401&r1=1751400&r2=1751401&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 5 07:54:49 2016 @@ -44,7 +44,9 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.0.M9
2016-07-05 4:03 GMT+09:00 Mark Thomas : > The proposed Apache Tomcat 9.0.0.M9 release is now available for voting. > > This is a milestone release for the 9.0.x branch. It should be > noted that, as a milestone release: > - Servlet 4.0 is not finalised > - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0 > > The major changes compared to the 9.0.0.M8 release are: > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M9/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1089/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M9/ > > The proposed 9.0.0.M9 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 9.0.0.M9 > > Tested on some test applications (enable session replication). > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- > Keiichi.Fujino >
svn commit: r1751438 - /tomcat/trunk/conf/catalina.properties
Author: markt Date: Tue Jul 5 10:43:36 2016 New Revision: 1751438 URL: http://svn.apache.org/viewvc?rev=1751438&view=rev Log: Add JARs that appear on the test class path to those to skip Modified: tomcat/trunk/conf/catalina.properties Modified: tomcat/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1751438&r1=1751437&r2=1751438&view=diff == --- tomcat/trunk/conf/catalina.properties (original) +++ tomcat/trunk/conf/catalina.properties Tue Jul 5 10:43:36 2016 @@ -127,7 +127,8 @@ geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\ ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\ jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\ xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\ -junit.jar,junit-*.jar,ant-launcher.jar,\ +junit.jar,junit-*.jar,hamcrest-*.jar,easymock-*.jar,cglib-*.jar,\ +objenesis-*.jar,ant-launcher.jar,\ cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar,\ jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,\ xom-*.jar - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751447 - in /tomcat/trunk/test/org/apache: catalina/core/ catalina/startup/ catalina/webresources/ jasper/compiler/ naming/resources/
Author: markt
Date: Tue Jul 5 11:24:21 2016
New Revision: 1751447
URL: http://svn.apache.org/viewvc?rev=1751447&view=rev
Log:
The resource JARs don't contain TLDs so don't scan for them during testing
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Tue Jul 5 11:24:21 2016
@@ -211,6 +211,7 @@ public class TestStandardContextResource
// app dir is relative to server home
StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
+skipTldsForResourceJars(ctx);
Tomcat.addServlet(ctx, "getresource", new GetResourceServlet());
ctx.addServletMapping("/getresource", "getresource");
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Tue Jul
5 11:24:21 2016
@@ -153,7 +153,8 @@ public class TestStandardWrapper extends
Tomcat tomcat = getTomcatInstance();
File appDir = new File("test/webapp-fragments");
-tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+Context ctx = tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+skipTldsForResourceJars(ctx);
tomcat.start();
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Tue
Jul 5 11:24:21 2016
@@ -73,7 +73,8 @@ public class TestContextConfig extends T
File appDir = new File("test/webapp-fragments");
// app dir is relative to server home
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+Context ctx = tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
+skipTldsForResourceJars(ctx);
tomcat.start();
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Jul
5 11:24:21 2016
@@ -67,6 +67,8 @@ import org.apache.catalina.webresources.
import org.apache.coyote.http11.Http11NioProtocol;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+import org.apache.tomcat.util.scan.StandardJarScanFilter;
+import org.apache.tomcat.util.scan.StandardJarScanner;
/**
* Base test case that provides a Tomcat instance for each test - mainly so we
@@ -857,4 +859,11 @@ public abstract class TomcatBaseTest ext
return FileVisitResult.CONTINUE;
}});
}
+
+
+public static void skipTldsForResourceJars(Context context) {
+StandardJarScanner scanner = (StandardJarScanner)
context.getJarScanner();
+StandardJarScanFilter filter = (StandardJarScanFilter)
scanner.getJarScanFilter();
+filter.setTldSkip(filter.getTldSkip() + ",resources*.jar");
+}
}
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHand
Gump failures
The Gump failures we are seeing are due to the tests taking more than an hour to run. I've looked through the logs and I don't see any obvious culprits although a second pair of eyes wouldn't hurt. I've made a few changes to the test configuration to try and speed things up (Gump is generally slow and anything I/O related is very slow) but early indications are that they won't help. Suggestions welcome. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751463 - in /tomcat/trunk/test/org/apache/catalina: authenticator/TestFormAuthenticator.java authenticator/TestNonLoginAndBasicAuthenticator.java startup/TomcatBaseTest.java
Author: markt
Date: Tue Jul 5 13:13:07 2016
New Revision: 1751463
URL: http://svn.apache.org/viewvc?rev=1751463&view=rev
Log:
Force shorter session timeouts during authentication tests to speed them up
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1751463&r1=1751462&r2=1751463&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Tue Jul 5 13:13:07 2016
@@ -95,9 +95,8 @@ public class TestFormAuthenticator exten
protected static final boolean SERVER_FREEZE_SESSID =
!SERVER_CHANGE_SESSID;
// minimum session timeout
-private static final int TIMEOUT_MINS = 1;
-private static final long TIMEOUT_DELAY_MSECS =
-(((TIMEOUT_MINS * 60) + 10) * 1000);
+private static final int SHORT_SESSION_TIMEOUT_SECS = 1;
+private static final long TIMEOUT_DELAY_MSECS =
((SHORT_SESSION_TIMEOUT_SECS + 10) * 1000);
private FormAuthClient client;
@@ -239,6 +238,10 @@ public class TestFormAuthenticator exten
CLIENT_NO_COOKIES, SERVER_USE_COOKIES,
SERVER_FREEZE_SESSID);
+// Force session to expire one second from now
+Context context = (Context)
getTomcatInstance().getHost().findChildren()[0];
+forceSessionMaxInactiveInterval(context, SHORT_SESSION_TIMEOUT_SECS);
+
// wait long enough for my session to expire
Thread.sleep(TIMEOUT_DELAY_MSECS);
@@ -656,9 +659,6 @@ public class TestFormAuthenticator exten
tomcat.start();
-// perhaps this does not work until tomcat has started?
-ctx.setSessionTimeout(TIMEOUT_MINS);
-
// Valve pipeline is only established after tomcat starts
Valve[] valves = ctx.getPipeline().getValves();
for (Valve valve : valves) {
@@ -734,9 +734,6 @@ public class TestFormAuthenticator exten
tomcat.start();
-// perhaps this does not work until tomcat has started?
-ctx.setSessionTimeout(TIMEOUT_MINS);
-
// Valve pipeline is only established after tomcat starts
Valve[] valves = ctx.getPipeline().getValves();
for (Valve valve : valves) {
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java?rev=1751463&r1=1751462&r2=1751463&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
Tue Jul 5 13:13:07 2016
@@ -75,15 +75,14 @@ public class TestNonLoginAndBasicAuthent
private static final String URI_PROTECTED = "/protected";
private static final String URI_PUBLIC = "/anyoneCanAccess";
-private static final int SHORT_SESSION_TIMEOUT_MINS = 1;
-private static final int LONG_SESSION_TIMEOUT_MINS = 2;
-private static final int MANAGER_SCAN_INTERVAL_SECS = 10;
+private static final int SHORT_SESSION_TIMEOUT_SECS = 1;
+private static final int MANAGER_SCAN_INTERVAL_SECS = 2;
private static final int MANAGER_EXPIRE_SESSIONS_FAST = 1;
private static final int EXTRA_DELAY_SECS = 5;
private static final long TIMEOUT_DELAY_MSECS =
-(((SHORT_SESSION_TIMEOUT_MINS * 60)
-+ (MANAGER_SCAN_INTERVAL_SECS * MANAGER_EXPIRE_SESSIONS_FAST)
-+ EXTRA_DELAY_SECS) * 1000);
+((SHORT_SESSION_TIMEOUT_SECS +
+(MANAGER_SCAN_INTERVAL_SECS *
MANAGER_EXPIRE_SESSIONS_FAST) +
+EXTRA_DELAY_SECS) * 1000);
private static final String CLIENT_AUTH_HEADER = "authorization";
private static final String SERVER_AUTH_HEADER = "WWW-Authenticate";
@@ -287,6 +286,11 @@ public class TestNonLoginAndBasicAuthent
doTestBasic(CONTEXT_PATH_LOGIN + URI_PROTECTED, NO_CREDENTIALS,
USE_COOKIES, HttpServletResponse.SC_OK);
+// Force session to expire one second from now
+forceSessionMaxInactiveInterval(
+(Context)
getTomcatInstance().getHost().findChild(CONTEXT_PATH_LOGIN),
+SHORT_SESSION_TIMEOUT_SECS);
+
// allow the s
svn commit: r1751465 - in /tomcat/tc8.5.x/trunk: ./ build.xml webapps/docs/changelog.xml webapps/docs/logging.xml
Author: markt Date: Tue Jul 5 13:24:48 2016 New Revision: 1751465 URL: http://svn.apache.org/viewvc?rev=1751465&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58588 Remove the JULI extras package from the distribution. It was only useful for switching Tomcat's internal logging to log4j 1.2.x and that version of log4j is no longer supported. No additional Tomcat code is required if switching Tomcat's internal logging to log via log4j 2.x. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/build.xml tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/logging.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 5 13:24:48 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747 993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,17
svn commit: r1751475 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/core/ test/org/apache/catalina/startup/ test/org/apache/catalina/webresources/ test/org/apache/jasper/compiler/ test/org/ap
Author: markt Date: Tue Jul 5 13:53:40 2016 New Revision: 1751475 URL: http://svn.apache.org/viewvc?rev=1751475&view=rev Log: The resource JARs don't contain TLDs so don't scan for them during testing Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 5 13:53:40 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747 980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097,1751438 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,174
svn commit: r1751474 - in /tomcat/tc8.5.x/trunk: ./ conf/catalina.properties
Author: markt Date: Tue Jul 5 13:53:12 2016 New Revision: 1751474 URL: http://svn.apache.org/viewvc?rev=1751474&view=rev Log: Add JARs that appear on the test class path to those to skip Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/conf/catalina.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 5 13:53:12 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747 980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747 980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1
svn commit: r1751476 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/authenticator/TestFormAuthenticator.java test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java test
Author: markt Date: Tue Jul 5 13:54:06 2016 New Revision: 1751476 URL: http://svn.apache.org/viewvc?rev=1751476&view=rev Log: Force shorter session timeouts during authentication tests to speed them up Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 5 13:54:06 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747 980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097,1751438,1751447 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,17470
svn commit: r1751479 - in /tomcat/tc8.5.x/trunk: ./ bin/ conf/ java/org/apache/catalina/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java
Author: markt Date: Tue Jul 5 13:59:14 2016 New Revision: 1751479 URL: http://svn.apache.org/viewvc?rev=1751479&view=rev Log: Use UTF-8 with a standard prolog for all XML files. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/bin/catalina-tasks.xml tomcat/tc8.5.x/trunk/build.xml tomcat/tc8.5.x/trunk/conf/context.xml tomcat/tc8.5.x/trunk/conf/jaspic-providers.xml tomcat/tc8.5.x/trunk/conf/jaspic-providers.xsd tomcat/tc8.5.x/trunk/conf/server.xml tomcat/tc8.5.x/trunk/conf/tomcat-users.xml tomcat/tc8.5.x/trunk/conf/tomcat-users.xsd tomcat/tc8.5.x/trunk/conf/web.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/deploy/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/tagPlugins.xml tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/changelog.xml tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/package.xsl tomcat/tc8.5.x/trunk/modules/jdbc-pool/doc/project.xml tomcat/tc8.5.x/trunk/modules/jdbc-pool/pom.xml tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml tomcat/tc8.5.x/trunk/res/checkstyle/javax-checkstyle.xml tomcat/tc8.5.x/trunk/res/checkstyle/javax-import-control.xml tomcat/tc8.5.x/trunk/res/checkstyle/org-checkstyle.xml tomcat/tc8.5.x/trunk/res/checkstyle/org-import-control.xml tomcat/tc8.5.x/trunk/res/cobertura/logback.xml tomcat/tc8.5.x/trunk/res/deployer/build.xml tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml tomcat/tc8.5.x/trunk/test/conf/jaspic-test-01.xml tomcat/tc8.5.x/trunk/test/conf/jaspic-test-02.xml tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml tomcat/tc8.5.x/trunk/test/webapp-2.2/WEB-INF/web.xml tomcat/tc8.5.x/trunk/test/webapp-2.3/WEB-INF/web.xml tomcat/tc8.5.x/trunk/test/webapp-2.4/WEB-INF/web.xml tomcat/tc8.5.x/trunk/test/webapp-2.5/WEB-INF/web.xml tomcat/tc8.5.x/trunk/test/webapp-3.0/WEB-INF/web.xml tomcat/tc8.5.x/trunk/test/webapp-3.1/WEB-INF/web.xml tomcat/tc8.5.x/t
[Bug 59779] useRelativeRedirects being enabled breaks proxyPort and scheme
https://bz.apache.org/bugzilla/show_bug.cgi?id=59779 --- Comment #4 from NateC --- (In reply to Mark Thomas from comment #3) > (In reply to NateC from comment #2) > > (In reply to Mark Thomas from comment #1) > > > > > I don't understand the problem. I think a concrete example is required. > > > > An example Connector configuration which would have this issue: > > >protocol="org.apache.coyote.http11.Http11AprProtocol" > >port="80" > >secure="true" > >scheme="https" > >proxyPort="443" > >URIEncoding="UTF-8" > >/> > > > > When a client makes a request to http://example.com/servlet/index.html and > > the servlet performs a redirect to "landingPage.html" when constructing an > > absolute URL the redirect is to > > "https://example.com:443/servlet/landingPage.html"; but when it is relative > > the url is just "landingPage.html", which the client will interpret as > > "http://example.com/servlet/landingPage.html"; > > Either there is a reverse proxy missing from the above description or scheme > and proxyPort are being mis-used to generate redirects to https when a > transport guarantee should be used. This configuration is being used behind a load balancer performing SSL offloading. Looking at the connector doc, https://tomcat.apache.org/tomcat-7.0-doc/config/http.html it looks like this should work based on this description. The proxyName and proxyPort attributes can be used when Tomcat is run behind a proxy server. These attributes modify the values returned to web applications that call the request.getServerName() and request.getServerPort() methods, which are often used to construct absolute URLs for redirects. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59779] useRelativeRedirects being enabled breaks proxyPort and scheme
https://bz.apache.org/bugzilla/show_bug.cgi?id=59779 --- Comment #5 from Mark Thomas --- (In reply to NateC from comment #4) > This configuration is being used behind a load balancer performing SSL > offloading. Looking at the connector doc, > https://tomcat.apache.org/tomcat-7.0-doc/config/http.html it looks like this > should work based on this description. It does work. You can't have the reverse proxy passing both http and https traffic from the client to that connector. The Connector attributes secure="true" and scheme="https" tell Tomcat that ALL traffic received by that Connector was sent, by the client, over https. If that isn't the case, stuff will break. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59779] useRelativeRedirects being enabled breaks proxyPort and scheme
https://bz.apache.org/bugzilla/show_bug.cgi?id=59779 --- Comment #6 from NateC --- (In reply to Mark Thomas from comment #5) > (In reply to NateC from comment #4) > > > This configuration is being used behind a load balancer performing SSL > > offloading. Looking at the connector doc, > > https://tomcat.apache.org/tomcat-7.0-doc/config/http.html it looks like this > > should work based on this description. > > It does work. > > You can't have the reverse proxy passing both http and https traffic from > the client to that connector. The Connector attributes secure="true" and > scheme="https" tell Tomcat that ALL traffic received by that Connector was > sent, by the client, over https. If that isn't the case, stuff will break. The reverse proxy is not passing both http and https to the connector just http, but the client is sending https to the reverse proxy. Client -(https)-> Load Balancer -(http)-> Tomcat Secure and https need to be set so that Tomcat responds correctly to the client that data was encrypted because that is how the client thinks it is communicating to the server and why absolute redirects were needed. As described in these examples: http://www.invantive.com/about-invantive/news/entryid/897/ssl-offloading-for-apache-tomcat http://www.gattis.org/Work-and-Tech/communication-and-collaboration/web-technology/tomcat/tomcat-ssl-offloading Because these are not apache docs this might have been an unsupported feature. -- 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: r1751517 - /tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Author: markt
Date: Tue Jul 5 18:26:33 2016
New Revision: 1751517
URL: http://svn.apache.org/viewvc?rev=1751517&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1751517&r1=1751516&r2=1751517&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Tue Jul
5 18:26:33 2016
@@ -570,7 +570,7 @@ public class OutputBuffer extends Writer
}
-private static Charset getCharset(String encoding) throws IOException {
+private static Charset getCharset(final String encoding) throws
IOException {
if (Globals.IS_SECURITY_ENABLED) {
try {
return AccessController.doPrivileged(
@@ -594,7 +594,7 @@ public class OutputBuffer extends Writer
}
-private static C2BConverter createConverter(Charset charset) throws
IOException {
+private static C2BConverter createConverter(final Charset charset) throws
IOException {
if (Globals.IS_SECURITY_ENABLED){
try {
return AccessController.doPrivileged(
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751518 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector: Request.java ResponseFacade.java
Author: markt
Date: Tue Jul 5 18:28:14 2016
New Revision: 1751518
URL: http://svn.apache.org/viewvc?rev=1751518&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/ResponseFacade.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1751518&r1=1751517&r2=1751518&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Tue
Jul 5 18:28:14 2016
@@ -127,11 +127,10 @@ public class Request implements org.apac
public Request() {
-
-formats[0].setTimeZone(GMT_ZONE);
-formats[1].setTimeZone(GMT_ZONE);
-formats[2].setTimeZone(GMT_ZONE);
-
+formats = new SimpleDateFormat[formatsTemplate.length];
+for(int i = 0; i < formats.length; i++) {
+formats[i] = (SimpleDateFormat) formatsTemplate[i].clone();
+}
}
@@ -187,7 +186,9 @@ public class Request implements org.apac
* Notice that because SimpleDateFormat is not thread-safe, we can't
* declare formats[] as a static variable.
*/
-protected final SimpleDateFormat formats[] = {
+protected final SimpleDateFormat formats[];
+
+private static final SimpleDateFormat formatsTemplate[] = {
new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE, Locale.US),
new SimpleDateFormat("EE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
new SimpleDateFormat("EEE d HH:mm:ss ", Locale.US)
@@ -774,12 +775,8 @@ public class Request implements org.apac
* @exception IOException if an input/output error occurs
*/
public void finishRequest() throws IOException {
-// Optionally disable swallowing of additional request data.
-Context context = getContext();
-if (context != null &&
-response.getStatus() ==
HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE &&
-!context.getSwallowAbortedUploads()) {
-coyoteRequest.action(ActionCode.DISABLE_SWALLOW_INPUT, null);
+if (response.getStatus() ==
HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE) {
+checkSwallowInput();
}
}
@@ -2641,7 +2638,9 @@ public class Request implements org.apac
/**
- * Disable swallowing of remaining input if configured
+ * Check the configuration for aborted uploads and if configured to do so,
+ * disable the swallowing of any remaining input and close the connection
+ * once the response has been written.
*/
protected void checkSwallowInput() {
Context context = getContext();
@@ -3491,5 +3490,9 @@ public class Request implements org.apac
// NO-OP
}
});
+
+for (SimpleDateFormat sdf : formatsTemplate) {
+sdf.setTimeZone(GMT_ZONE);
+}
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/ResponseFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/ResponseFacade.java?rev=1751518&r1=1751517&r2=1751518&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/ResponseFacade.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/ResponseFacade.java
Tue Jul 5 18:28:14 2016
@@ -225,23 +225,18 @@ public class ResponseFacade
}
response.setContentLength(len);
-
}
-/**
- * TODO SERVLET 3.1
- */
@Override
public void setContentLengthLong(long length) {
if (isCommitted()) {
return;
}
-
response.setContentLengthLong(length);
-
}
+
@Override
public void setContentType(String type) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751519 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/core: ApplicationContext.java AsyncContextImpl.java ContainerBase.java JreMemoryLeakPreventionListener.java NamingContextListen
Author: markt
Date: Tue Jul 5 18:34:39 2016
New Revision: 1751519
URL: http://svn.apache.org/viewvc?rev=1751519&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1751519&r1=1751518&r2=1751519&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Tue Jul 5 18:34:39 2016
@@ -786,16 +786,11 @@ public class ApplicationContext implemen
@SuppressWarnings("unchecked")
T filter = (T)
context.getInstanceManager().newInstance(c.getName());
return filter;
-} catch (IllegalAccessException e) {
-throw new ServletException(e);
} catch (InvocationTargetException e) {
ExceptionUtils.handleThrowable(e.getCause());
throw new ServletException(e);
-} catch (NamingException e) {
-throw new ServletException(e);
-} catch (InstantiationException e) {
-throw new ServletException(e);
-} catch (ClassNotFoundException e) {
+} catch (IllegalAccessException | NamingException |
InstantiationException |
+ClassNotFoundException e) {
throw new ServletException(e);
}
}
@@ -883,16 +878,11 @@ public class ApplicationContext implemen
T servlet = (T)
context.getInstanceManager().newInstance(c.getName());
context.dynamicServletCreated(servlet);
return servlet;
-} catch (IllegalAccessException e) {
-throw new ServletException(e);
} catch (InvocationTargetException e) {
ExceptionUtils.handleThrowable(e.getCause());
throw new ServletException(e);
-} catch (NamingException e) {
-throw new ServletException(e);
-} catch (InstantiationException e) {
-throw new ServletException(e);
-} catch (ClassNotFoundException e) {
+} catch (IllegalAccessException | NamingException |
InstantiationException |
+ClassNotFoundException e) {
throw new ServletException(e);
}
}
@@ -1027,24 +1017,13 @@ public class ApplicationContext implemen
EventListener listener = (EventListener) obj;
addListener(listener);
}
-} catch (IllegalAccessException e) {
-throw new IllegalArgumentException(sm.getString(
-"applicationContext.addListener.iae.cnfe", className),
-e);
} catch (InvocationTargetException e) {
ExceptionUtils.handleThrowable(e.getCause());
throw new IllegalArgumentException(sm.getString(
"applicationContext.addListener.iae.cnfe", className),
e);
-} catch (NamingException e) {
-throw new IllegalArgumentException(sm.getString(
-"applicationContext.addListener.iae.cnfe", className),
-e);
-} catch (InstantiationException e) {
-throw new IllegalArgumentException(sm.getString(
-"applicationContext.addListener.iae.cnfe", className),
-e);
-} catch (ClassNotFoundException e) {
+} catch (IllegalAccessException | NamingException |
InstantiationException |
+ClassNotFoundException e) {
throw new IllegalArgumentException(sm.getString(
"applicationContext.addListener.iae.cnfe", className),
e);
@@ -1113,14 +1092,10 @@ public class ApplicationContext implemen
throw new IllegalArgumentException(sm.getString(
"applicationContext.addListener.iae.wrongType",
listener.getClass().getName()));
-} catch (IllegalAccessException e) {
-throw new ServletException(e);
} catch (InvocationTargetException e) {
ExceptionUtils.handleThrowable(e.getCause());
throw new ServletException(e);
-} catch (NamingException e) {
-throw new ServletException(e);
-} catch (InstantiationException e) {
+} catch (IllegalAccessException | N
svn commit: r1751521 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java
Author: markt
Date: Tue Jul 5 18:41:16 2016
New Revision: 1751521
URL: http://svn.apache.org/viewvc?rev=1751521&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java?rev=1751521&r1=1751520&r2=1751521&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java
Tue Jul 5 18:41:16 2016
@@ -22,18 +22,13 @@ public abstract class ClusterMessageBase
private static final long serialVersionUID = 1L;
-protected transient Member address;
private long timestamp;
+protected transient Member address;
+
public ClusterMessageBase() {
// NO-OP
}
-/**
- * getAddress
- *
- * @return Member
- * TODO Implement this org.apache.catalina.ha.ClusterMessage method
- */
@Override
public Member getAddress() {
return address;
@@ -44,12 +39,6 @@ public abstract class ClusterMessageBase
return timestamp;
}
-/**
- * setAddress
- *
- * @param member Member
- * TODO Implement this org.apache.catalina.ha.ClusterMessage method
- */
@Override
public void setAddress(Member member) {
this.address = member;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751523 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader: WebappClassLoaderBase.java WebappLoader.java
Author: markt
Date: Tue Jul 5 18:51:46 2016
New Revision: 1751523
URL: http://svn.apache.org/viewvc?rev=1751523&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1751523&r1=1751522&r2=1751523&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Tue Jul 5 18:51:46 2016
@@ -1610,15 +1610,12 @@ public abstract class WebappClassLoaderB
// JVM controlled threads
ThreadGroup tg = thread.getThreadGroup();
-if (tg != null &&
-JVM_THREAD_GROUP_NAMES.contains(tg.getName())) {
-
+if (tg != null &&
JVM_THREAD_GROUP_NAMES.contains(tg.getName())) {
// HttpClient keep-alive threads
if (clearReferencesHttpClientKeepAliveThread &&
threadName.equals("Keep-Alive-Timer")) {
thread.setContextClassLoader(parent);
-log.debug(sm.getString(
-
"webappClassLoader.checkThreadsHttpClient"));
+
log.debug(sm.getString("webappClassLoader.checkThreadsHttpClient"));
}
// Don't warn about remaining JVM controlled threads
@@ -1663,11 +1660,9 @@ public abstract class WebappClassLoaderB
// "runnable" in IBM JDK
// "action" in Apache Harmony
Object target = null;
-for (String fieldName : new String[] { "target",
-"runnable", "action" }) {
+for (String fieldName : new String[] { "target",
"runnable", "action" }) {
try {
-Field targetField = thread.getClass()
-.getDeclaredField(fieldName);
+Field targetField =
thread.getClass().getDeclaredField(fieldName);
targetField.setAccessible(true);
target = targetField.get(thread);
break;
@@ -1678,12 +1673,10 @@ public abstract class WebappClassLoaderB
// "java.util.concurrent" code is in public domain,
// so all implementations are similar
-if (target != null &&
-target.getClass().getCanonicalName() != null
-&& target.getClass().getCanonicalName().equals(
+if (target != null &&
target.getClass().getCanonicalName() != null &&
+target.getClass().getCanonicalName().equals(
"java.util.concurrent.ThreadPoolExecutor.Worker")) {
-Field executorField =
-target.getClass().getDeclaredField("this$0");
+Field executorField =
target.getClass().getDeclaredField("this$0");
executorField.setAccessible(true);
Object executor = executorField.get(target);
if (executor instanceof ThreadPoolExecutor) {
@@ -1691,21 +1684,9 @@ public abstract class WebappClassLoaderB
usingExecutor = true;
}
}
-} catch (SecurityException e) {
-log.warn(sm.getString(
-"webappClassLoader.stopThreadFail",
-thread.getName(), getContextName()), e);
-} catch (NoSuchFieldException e) {
-log.warn(sm.getString(
-"webappClassLoader.stopThreadFail",
-thread.getName(), getContextName()), e);
-} catch (IllegalArgumentException e) {
-log.warn(sm.getString(
-"webappClassLoader.stopThreadFail",
-thread.getName(), getContextName()), e);
-} catch (IllegalAccessException e) {
-log.warn(sm.getString(
-"webappClassLoader.stopThreadFail",
+} catch
svn commit: r1751524 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Author: markt
Date: Tue Jul 5 18:56:43 2016
New Revision: 1751524
URL: http://svn.apache.org/viewvc?rev=1751524&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1751524&r1=1751523&r2=1751524&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Tue Jul 5 18:56:43 2016
@@ -29,6 +29,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.io.Reader;
+import java.io.Serializable;
import java.io.StringReader;
import java.io.StringWriter;
import java.security.AccessController;
@@ -1361,12 +1362,14 @@ public class DefaultServlet extends Http
}
-
/**
* Decide which way to render. HTML or XML.
+ *
* @param contextPath The path
* @param resource The resource
+ *
* @return the input stream with the rendered output
+ *
* @throws IOException an IO error occurred
* @throws ServletException rendering error
*
@@ -1387,18 +1390,19 @@ public class DefaultServlet extends Http
return renderHtml(contextPath, resource, encoding);
}
return renderXml(contextPath, resource, xsltSource, encoding);
-
}
+
/**
- * Return an InputStream to an HTML representation of the contents
- * of this directory.
+ * Return an InputStream to an XML representation of the contents this
+ * directory.
*
- * @param contextPath Context path to which our internal paths are
- * relative
+ * @param contextPath Context path to which our internal paths are relative
* @param resource The associated resource
* @param xsltSource The XSL stylesheet
+ *
* @return the XML data
+ *
* @throws IOException an IO error occurred
* @throws ServletException rendering error
*
@@ -1529,13 +1533,14 @@ public class DefaultServlet extends Http
}
/**
- * Return an InputStream to an HTML representation of the contents
- * of this directory.
+ * Return an InputStream to an HTML representation of the contents of this
+ * directory.
+ *
+ * @param contextPath Context path to which our internal paths are relative
+ * @param resourceThe associated resource
*
- * @param contextPath Context path to which our internal paths are
- * relative
- * @param resource The resource
* @return the HTML data
+ *
* @throws IOException an IO error occurred
*
* @deprecated Unused. Will be removed in Tomcat 9
@@ -2392,7 +2397,8 @@ public class DefaultServlet extends Http
}
}
-protected static class CompressionFormat {
+protected static class CompressionFormat implements Serializable {
+private static final long serialVersionUID = 1L;
public final String extension;
public final String encoding;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751525 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes: io/DirectByteArrayOutputStream.java transport/bio/PooledMultiSender.java
Author: markt
Date: Tue Jul 5 18:58:21 2016
New Revision: 1751525
URL: http://svn.apache.org/viewvc?rev=1751525&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java?rev=1751525&r1=1751524&r2=1751525&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
Tue Jul 5 18:58:21 2016
@@ -40,7 +40,6 @@ public class DirectByteArrayOutputStream
* @throws IOException if an I/O error occurs. In particular, an
* IOException may be thrown if the output stream has
* been closed.
- * TODO Implement this java.io.OutputStream method
*/
@Override
public void write(int b) throws IOException {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=1751525&r1=1751524&r2=1751525&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Tue Jul 5 18:58:21 2016
@@ -53,18 +53,10 @@ public class PooledMultiSender extends P
}
}
-/**
- * getNewDataSender
- *
- * @return DataSender
- * TODO Implement this org.apache.catalina.tribes.transport.PooledSender
- * method
- */
@Override
public DataSender getNewDataSender() {
MultipointBioSender sender = new MultipointBioSender();
AbstractSender.transferProperties(this,sender);
return sender;
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751526 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/Introspection.java
Author: markt
Date: Tue Jul 5 18:59:59 2016
New Revision: 1751526
URL: http://svn.apache.org/viewvc?rev=1751526&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/Introspection.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/Introspection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/Introspection.java?rev=1751526&r1=1751525&r2=1751526&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/Introspection.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/Introspection.java Tue
Jul 5 18:59:59 2016
@@ -151,11 +151,7 @@ public class Introspection {
Class clazz = null;
try {
clazz = cl.loadClass(className);
-} catch (ClassNotFoundException e) {
-log.debug(sm.getString("introspection.classLoadFailed",
className), e);
-} catch (NoClassDefFoundError e) {
-log.debug(sm.getString("introspection.classLoadFailed",
className), e);
-} catch (ClassFormatError e) {
+} catch (ClassNotFoundException | NoClassDefFoundError |
ClassFormatError e) {
log.debug(sm.getString("introspection.classLoadFailed",
className), e);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751527 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
Author: markt
Date: Tue Jul 5 19:03:16 2016
New Revision: 1751527
URL: http://svn.apache.org/viewvc?rev=1751527&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java?rev=1751527&r1=1751526&r2=1751527&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Tue Jul 5
19:03:16 2016
@@ -467,6 +467,8 @@ public class Stream extends AbstractStre
throw new IllegalStateException(
sm.getString("stream.closed", getConnectionId(),
getIdentifier()));
}
+if (!coyoteResponse.isCommitted()) {
+coyoteResponse.sendHeaders();
int len = chunk.getLength();
int offset = 0;
while (len > 0) {
@@ -497,9 +499,6 @@ public class Stream extends AbstractStre
getIdentifier(), Integer.toString(buffer.position()),
Boolean.toString(writeInProgress),
Boolean.toString(closed)));
}
-if (!coyoteResponse.isCommitted()) {
-coyoteResponse.sendHeaders();
-}
if (buffer.position() == 0) {
if (closed && !endOfStreamSent) {
// Handling this special case here is simpler than trying
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751528 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
Author: markt
Date: Tue Jul 5 19:03:57 2016
New Revision: 1751528
URL: http://svn.apache.org/viewvc?rev=1751528&view=rev
Log:
Fix typo
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java?rev=1751528&r1=1751527&r2=1751528&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Tue Jul 5
19:03:57 2016
@@ -469,6 +469,7 @@ public class Stream extends AbstractStre
}
if (!coyoteResponse.isCommitted()) {
coyoteResponse.sendHeaders();
+}
int len = chunk.getLength();
int offset = 0;
while (len > 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751529 - /tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java
Author: markt
Date: Tue Jul 5 19:05:59 2016
New Revision: 1751529
URL: http://svn.apache.org/viewvc?rev=1751529&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java?rev=1751529&r1=1751528&r2=1751529&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java Tue
Jul 5 19:05:59 2016
@@ -36,14 +36,12 @@ import org.apache.jasper.Constants;
public class JasperLoader extends URLClassLoader {
private final PermissionCollection permissionCollection;
-private final ClassLoader parent;
private final SecurityManager securityManager;
public JasperLoader(URL[] urls, ClassLoader parent,
PermissionCollection permissionCollection) {
super(urls, parent);
this.permissionCollection = permissionCollection;
-this.parent = parent;
this.securityManager = System.getSecurityManager();
}
@@ -122,7 +120,7 @@ public class JasperLoader extends URLCla
if( !name.startsWith(Constants.JSP_PACKAGE_NAME + '.') ) {
// Class is not in org.apache.jsp, therefore, have our
// parent load it
-clazz = parent.loadClass(name);
+clazz = getParent().loadClass(name);
if( resolve )
resolveClass(clazz);
return clazz;
@@ -139,7 +137,7 @@ public class JasperLoader extends URLCla
*/
@Override
public InputStream getResourceAsStream(String name) {
-InputStream is = parent.getResourceAsStream(name);
+InputStream is = getParent().getResourceAsStream(name);
if (is == null) {
URL url = findResource(name);
if (url != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751531 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Socket.java
Author: markt
Date: Tue Jul 5 19:11:30 2016
New Revision: 1751531
URL: http://svn.apache.org/viewvc?rev=1751531&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Socket.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Socket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Socket.java?rev=1751531&r1=1751530&r2=1751531&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Socket.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Socket.java Tue Jul 5
19:11:30 2016
@@ -76,11 +76,6 @@ public class Socket {
public static final int APR_IPV4_ADDR_OK = 0x01;
public static final int APR_IPV6_ADDR_OK = 0x02;
-/* TODO: Missing:
- * APR_INET
- * APR_UNSPEC
- * APR_INET6
- */
public static final int APR_UNSPEC = 0;
public static final int APR_INET = 1;
public static final int APR_INET6 = 2;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751532 - in /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util: http/parser/Authorization.java http/parser/LocalStrings.properties net/SocketWrapperBase.java
Author: markt
Date: Tue Jul 5 19:11:42 2016
New Revision: 1751532
URL: http://svn.apache.org/viewvc?rev=1751532&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java?rev=1751532&r1=1751531&r2=1751532&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
Tue Jul 5 19:11:42 2016
@@ -22,11 +22,15 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import org.apache.tomcat.util.res.StringManager;
+
/**
* Parser for an "Authorization" header.
*/
public class Authorization {
+private static final StringManager sm =
StringManager.getManager(Authorization.class);
+
@SuppressWarnings("unused") // Unused due to buggy client implementations
private static final Integer FIELD_TYPE_TOKEN = Integer.valueOf(0);
private static final Integer FIELD_TYPE_QUOTED_STRING = Integer.valueOf(1);
@@ -119,7 +123,8 @@ public class Authorization {
break;
default:
// Error
-throw new IllegalArgumentException("TODO i18n: Unsupported
type");
+throw new IllegalArgumentException(
+sm.getString("authorization.unknownType", type));
}
if (value == null) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties?rev=1751532&r1=1751531&r2=1751532&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
Tue Jul 5 19:11:42 2016
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+authorization.unknownType=Unknown Type [{0}]
cookie.fallToDebug=Note: further occurrences of this error will be logged at
DEBUG level.
cookie.invalidCookieValue=A cookie header was received [{0}] that contained an
invalid cookie. That cookie will be ignored.
cookie.invalidCookieVersion=A cookie header was received using an unrecognised
cookie version of [{0}]. The header and the cookies it contains will be ignored.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1751532&r1=1751531&r2=1751532&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Tue Jul 5 19:11:42 2016
@@ -128,7 +128,7 @@ public abstract class SocketWrapperBase<
}
/**
- * Set the timeout for reading. Values of zero or less will be changed to]
+ * Set the timeout for reading. Values of zero or less will be changed to
* -1.
*
* @param readTimeout The timeout in milliseconds. A value of -1 indicates
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751533 - in /tomcat/tc8.5.x/trunk/test/org/apache/catalina: core/TestApplicationContext.java nonblocking/TestNonBlockingAPI.java
Author: markt
Date: Tue Jul 5 19:18:28 2016
New Revision: 1751533
URL: http://svn.apache.org/viewvc?rev=1751533&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1751533&r1=1751532&r2=1751533&view=diff
==
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
Tue Jul 5 19:18:28 2016
@@ -246,4 +246,86 @@ public class TestApplicationContext exte
}
}
}
+
+
+/*
+ * The expectation is that you can set a context attribute on
+ * ServletContextB from ServletContextA and then access that attribute via
+ * a cross-context dispatch to ServletContextB.
+ */
+@Test
+public void testCrossContextSetAttribute() throws Exception {
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx2 = tomcat.addContext("/second", null);
+GetAttributeServlet getAttributeServlet = new GetAttributeServlet();
+Tomcat.addServlet(ctx2, "getAttributeServlet", getAttributeServlet);
+ctx2.addServletMapping("/test", "getAttributeServlet");
+
+// No file system docBase required
+Context ctx1 = tomcat.addContext("/first", null);
+ctx1.setCrossContext(true);
+SetAttributeServlet setAttributeServlet = new
SetAttributeServlet("/test", "/second");
+Tomcat.addServlet(ctx1, "setAttributeServlet", setAttributeServlet);
+ctx1.addServletMapping("/test", "setAttributeServlet");
+
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:"; + getPort() + "/first/test", bc,
null);
+
+Assert.assertEquals(200, rc);
+Assert.assertEquals("01-PASS", bc.toString());
+}
+
+
+private static class SetAttributeServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+private static final String ATTRIBUTE_NAME = "setAttributeTest";
+private static final String ATTRIBUTE_VALUE = "abcde";
+
+private final String targetContextPath;
+private final String targetPath;
+
+public SetAttributeServlet(String targetPath, String
targetContextPath) {
+this.targetPath = targetPath;
+this.targetContextPath = targetContextPath;
+}
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+ServletContext sc;
+if (targetContextPath == null) {
+sc = req.getServletContext();
+} else {
+sc = req.getServletContext().getContext(targetContextPath);
+}
+sc.setAttribute(ATTRIBUTE_NAME, ATTRIBUTE_VALUE);
+sc.getRequestDispatcher(targetPath).forward(req, resp);
+}
+}
+
+
+private static class GetAttributeServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.setContentType("text/plain");
+PrintWriter pw = resp.getWriter();
+String value = (String) req.getServletContext().getAttribute(
+SetAttributeServlet.ATTRIBUTE_NAME);
+if (SetAttributeServlet.ATTRIBUTE_VALUE.equals(value)) {
+pw.print("01-PASS");
+} else {
+pw.print("01-FAIL");
+}
+}
+}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1751533&r1=1751532&r2=1751533&view=diff
==
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Tue Jul 5 19:18:28 2016
@@ -50,14 +50,10 @@ import org.apache.catalina.startup.Teste
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.TesterAccessLogValve;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.
svn commit: r1751534 - /tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Author: markt
Date: Tue Jul 5 19:19:48 2016
New Revision: 1751534
URL: http://svn.apache.org/viewvc?rev=1751534&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1751534&r1=1751533&r2=1751534&view=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Tue Jul 5 19:19:48 2016
@@ -890,7 +890,7 @@ public class TestHttp11Processor extends
// No file system docBase required
Context ctx = tomcat.addContext("", null);
-SempahoreServlet servlet = new SempahoreServlet();
+DispatchingServlet servlet = new DispatchingServlet();
Wrapper w = Tomcat.addServlet(ctx, "Test", servlet);
w.setAsyncSupported(true);
ctx.addServletMapping("/test", "Test");
@@ -956,7 +956,7 @@ public class TestHttp11Processor extends
}
-private static class SempahoreServlet extends HttpServlet {
+private static class DispatchingServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751535 - in /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors: MessageDispatchInterceptor.java StaticMembershipInterceptor.java
Author: markt
Date: Tue Jul 5 19:20:12 2016
New Revision: 1751535
URL: http://svn.apache.org/viewvc?rev=1751535&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1751535&r1=1751534&r2=1751535&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Tue Jul 5 19:20:12 2016
@@ -93,8 +93,8 @@ public class MessageDispatchInterceptor
}
-public boolean addToQueue(ChannelMessage msg, Member[] destination,
-InterceptorPayload payload) {
+public boolean addToQueue(final ChannelMessage msg, final Member[]
destination,
+final InterceptorPayload payload) {
Runnable r = new Runnable() {
@Override
public void run() {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1751535&r1=1751534&r2=1751535&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
Tue Jul 5 19:20:12 2016
@@ -155,7 +155,7 @@ public class StaticMembershipInterceptor
if ( (Channel.SND_RX_SEQ&svc)==Channel.SND_RX_SEQ )
super.start(Channel.SND_RX_SEQ);
if ( (Channel.SND_TX_SEQ&svc)==Channel.SND_TX_SEQ )
super.start(Channel.SND_TX_SEQ);
final ChannelInterceptorBase base = this;
-for (Member member : members) {
+for (final Member member : members) {
Thread t = new Thread() {
@Override
public void run() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751536 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Author: markt
Date: Tue Jul 5 19:20:25 2016
New Revision: 1751536
URL: http://svn.apache.org/viewvc?rev=1751536&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1751536&r1=1751535&r2=1751536&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Jul 5 19:20:25
2016
@@ -422,7 +422,7 @@ public class Stream extends AbstractStre
}
-private static void push(Http2UpgradeHandler handler, Request request,
Stream stream)
+private static void push(final Http2UpgradeHandler handler, final Request
request, final Stream stream)
throws IOException {
if (org.apache.coyote.Constants.IS_SECURITY_ENABLED) {
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751538 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Author: markt
Date: Tue Jul 5 19:20:46 2016
New Revision: 1751538
URL: http://svn.apache.org/viewvc?rev=1751538&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1751538&r1=1751537&r2=1751538&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Tue
Jul 5 19:20:46 2016
@@ -1379,7 +1379,7 @@ public class TestAsyncContextImpl extend
protected void doGet(HttpServletRequest req, final HttpServletResponse
resp)
throws ServletException, IOException {
-AsyncContext actxt = req.startAsync();
+final AsyncContext actxt = req.startAsync();
actxt.setTimeout(TIMEOUT);
if (threaded) {
actxt.start(new Runnable() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751537 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractEndpoint.java Nio2Endpoint.java SecureNio2Channel.java
Author: markt
Date: Tue Jul 5 19:20:35 2016
New Revision: 1751537
URL: http://svn.apache.org/viewvc?rev=1751537&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1751537&r1=1751536&r2=1751537&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Jul
5 19:20:35 2016
@@ -868,6 +868,7 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1751537&r1=1751536&r2=1751537&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Jul 5
19:20:35 2016
@@ -610,7 +610,7 @@ public class Nio2Endpoint extends Abstra
}
};
-public Nio2SocketWrapper(Nio2Channel channel, Nio2Endpoint endpoint) {
+public Nio2SocketWrapper(Nio2Channel channel, final Nio2Endpoint
endpoint) {
super(channel, endpoint);
socketBufferHandler = channel.getBufHandler();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1751537&r1=1751536&r2=1751537&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Jul
5 19:20:35 2016
@@ -793,8 +793,8 @@ public class SecureNio2Channel extends N
@Override
public void read(final ByteBuffer dst,
-long timeout, TimeUnit unit, final A attachment,
-CompletionHandler handler) {
+final long timeout, final TimeUnit unit, final A attachment,
+final CompletionHandler handler) {
// Check state
if (closing || closed) {
handler.completed(Integer.valueOf(-1), attachment);
@@ -889,9 +889,9 @@ public class SecureNio2Channel extends N
}
@Override
-public void read(ByteBuffer[] dsts, int offset, int length,
-long timeout, TimeUnit unit, A attachment,
-CompletionHandler handler) {
+public void read(final ByteBuffer[] dsts, final int offset, final int
length,
+final long timeout, final TimeUnit unit, final A attachment,
+final CompletionHandler handler) {
if (offset < 0 || dsts == null || (offset + length) > dsts.length) {
throw new IllegalArgumentException();
}
@@ -976,8 +976,8 @@ public class SecureNio2Channel extends N
}
@Override
-public void write(ByteBuffer src, long timeout, TimeUnit unit,
-A attachment, CompletionHandler handler) {
+public void write(final ByteBuffer src, final long timeout, final
TimeUnit unit,
+final A attachment, final CompletionHandler
handler) {
// Check state
if (closing || closed) {
handler.failed(new
IOException(sm.getString("channel.nio.ssl.closing")), attachment);
@@ -1026,9 +1026,9 @@ public class SecureNio2Channel extends N
}
@Override
-public void write(ByteBuffer[] srcs, int offset, int length,
-long timeout, TimeUnit unit, A attachment,
-CompletionHandler handler) {
+public void write(final ByteBuffer[] srcs, final int offset, final int
length,
+final long timeout, final TimeUnit unit, final A attachment,
+final CompletionHandler handler) {
if ((offset < 0) || (length < 0) || (offset > srcs.length - length)) {
throw new IndexOutOfBoundsException();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751539 - in /tomcat/trunk/test/org/apache/coyote/http11: TestHttp11Processor.java upgrade/TestUpgradeInternalHandler.java
Author: markt
Date: Tue Jul 5 19:20:53 2016
New Revision: 1751539
URL: http://svn.apache.org/viewvc?rev=1751539&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Modified: tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1751539&r1=1751538&r2=1751539&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java Tue Jul
5 19:20:53 2016
@@ -771,9 +771,9 @@ public class TestHttp11Processor extends
@Override
-protected void doPut(HttpServletRequest req, HttpServletResponse resp)
+protected void doPut(HttpServletRequest req, final HttpServletResponse
resp)
throws ServletException, IOException {
-AsyncContext ac = req.startAsync();
+final AsyncContext ac = req.startAsync();
ac.start(new Runnable() {
@Override
public void run() {
Modified:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1751539&r1=1751538&r2=1751539&view=diff
==
---
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
(original)
+++
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Tue Jul 5 19:20:53 2016
@@ -192,7 +192,7 @@ public class TestUpgradeInternalHandler
// Arbitrarily located in the init, could be in the initial read
event, asynchronous, etc.
// Note: the completion check used will not call the completion
handler if the IO completed inline and without error.
// Using a completion check that always calls complete would be
easier here since the action is the same even with inline completion.
-ByteBuffer buffer = ByteBuffer.allocate(1024);
+final ByteBuffer buffer = ByteBuffer.allocate(1024);
CompletionState state = wrapper.read(false, 10, TimeUnit.SECONDS,
null, SocketWrapperBase.READ_DATA, new CompletionHandler() {
@Override
public void completed(Long result, Void attachment) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751542 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
Author: markt
Date: Tue Jul 5 19:26:07 2016
New Revision: 1751542
URL: http://svn.apache.org/viewvc?rev=1751542&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java?rev=1751542&r1=1751541&r2=1751542&view=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
Tue Jul 5 19:26:07 2016
@@ -30,8 +30,6 @@ import org.junit.Test;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Address;
import org.apache.tomcat.jni.Error;
import org.apache.tomcat.jni.Library;
@@ -45,8 +43,6 @@ import org.apache.tomcat.jni.Socket;
*/
public class TestXxxEndpoint extends TomcatBaseTest {
-private static Log log = LogFactory.getLog(TestXxxEndpoint.class);
-
private long createAprPool() {
// Create the pool for the server socket
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1751546 - in /tomcat/tc8.5.x/trunk/webapps/docs: changelog.xml logging.xml
Author: markt Date: Tue Jul 5 19:48:45 2016 New Revision: 1751546 URL: http://svn.apache.org/viewvc?rev=1751546&view=rev Log: Whitespace police Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/logging.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1751546&r1=1751545&r2=1751546&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Jul 5 19:48:45 2016 @@ -174,7 +174,7 @@ 59774: Correct the prefix values in the the documented examples for configuring the AccessLogValve. -Patch provided by Mike Noordermeer. (markt) +Patch provided by Mike Noordermeer. (markt) Modified: tomcat/tc8.5.x/trunk/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/logging.xml?rev=1751546&r1=1751545&r2=1751546&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/logging.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/logging.xml Tue Jul 5 19:48:45 2016 @@ -50,7 +50,7 @@ logging framework for redirecting logging for applications that use java.util.logging. Keep in mind that the alternative logging framework will need to be capable of working in an environment where - different loggers with the same name may exist in different class loaders. + different loggers with the same name may exist in different class loaders. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59797] Per thread error hash grows indefinitely
https://bz.apache.org/bugzilla/show_bug.cgi?id=59797
--- Comment #6 from Konstantin Kolinko ---
The thread pool patch has RAT / checkstyle issues.
The native side patch has the following fragment:
> #if (OPENSSL_VERSION_NUMBER < 0x1000L) || defined(OPENSSL_USE_DEPRECATED)
> ERR_remove_state(0);
> #elif (OPENSSL_VERSION_NUMBER < 0x1010L)
> ERR_remove_thread_state(NULL);
> #endif
I do not understand "|| defined(OPENSSL_USE_DEPRECATED)" part of the above
condition. I think that ERR_remove_thread_state() is the correct cleanup
function and shall be used as soon as it is available, so the
OPENSSL_USE_DEPRECATED part of the condition should be removed.
Motivation:
1. Looking into implementation of ERR_remove_state() in crypto/err/err.c of
openssl-1.0.2d it ignores its argument. I think such implementation is bad and
should not be invoked.
#ifndef OPENSSL_NO_DEPRECATED
void ERR_remove_state(unsigned long pid)
{
ERR_remove_thread_state(NULL);
}
#endif
2. Deprecation of ERR_remove_state() is clearly mentioned in CHANGES file of
openssl-1.0.2d as a change "between 0.9.8n and 1.0.0 [29 Mar 2010]". I see no
reason to call the old function. Also OpenSSL 0.9.8 is no longer supported.
Tomcat-Native 1.2.x requires OpenDDL 1.0.2+ (as documented in native/BUILDING
file).
(In reply to Mark Thomas from comment #5)
> Fixing it in the thread pool is good in that the calls to clean are
> minimized. But this excludes calls from non-container threads.
ERR_remove_thread_state() can be called with an explicit thread id. If we know
ids for threads that completed execution (and are gc'ed) we can perform cleanup
for them from a different thread.
I think that monitoring of completed (gc'ed) threads can be performed with a
WeakReference and a ReferenceQueue that is processed by a background thread.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.0.M9
On Mon, Jul 4, 2016 at 9:03 PM, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.0.M9 release is now available for voting. > > This is a milestone release for the 9.0.x branch. It should be > noted that, as a milestone release: > - Servlet 4.0 is not finalised > - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0 > > The major changes compared to the 9.0.0.M8 release are: > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M9/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1089/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M9/ > > The proposed 9.0.0.M9 release is: > [ ] Broken - do not release > [ X ] Alpha - go ahead and release as 9.0.0.M9 > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
