svn commit: r1842703 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt Date: Wed Oct 3 11:17:17 2018 New Revision: 1842703 URL: http://svn.apache.org/viewvc?rev=1842703=rev Log: Ensure that a canonical path is always used for the docBase of a Context to ensure consistent behaviour. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 3 11:17:17 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747 404,1747506,1747536,1747924,1747980,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,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1842702 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Wed Oct 3 11:16:07 2018
New Revision: 1842702
URL: http://svn.apache.org/viewvc?rev=1842702=rev
Log:
Ensure that a canonical path is always used for the docBase of a Context to
ensure consistent behaviour.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1842702=1842701=1842702=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Oct 3
11:16:07 2018
@@ -579,7 +579,7 @@ public class ContextConfig implements Li
File file = new File(docBase);
if (!file.isAbsolute()) {
-docBase = (new File(appBase, docBase)).getPath();
+docBase = (new File(appBase, docBase)).getCanonicalPath();
} else {
docBase = file.getCanonicalPath();
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1842702=1842701=1842702=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 3 11:16:07 2018
@@ -88,6 +88,10 @@
conf/context.xml and conf/web.xml on a per
host basis. (fschumacher)
+
+Ensure that a canonical path is always used for the docBase of a
Context
+to ensure consistent behaviour. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62757] JspCompilationContext is unable to compile class for JSP due to a null tagHandlerClass in Generator.TagHandlerInfo
https://bz.apache.org/bugzilla/show_bug.cgi?id=62757 Jordi Llach changed: What|Removed |Added Version|8.5.34 |8.5.33 Severity|normal |regression -- 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 62757] JspCompilationContext is unable to compile class for JSP due to a null tagHandlerClass in Generator.TagHandlerInfo
https://bz.apache.org/bugzilla/show_bug.cgi?id=62757 Jordi Llach changed: What|Removed |Added OS|Mac OS X 10.1 |All Hardware|PC |All -- 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: r1842726 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/JspRuntimeContext.java java/org/apache/jasper/compiler/TagFileProcessor.java java/org/apache/jasper/servlet/JspServl
Author: markt Date: Wed Oct 3 14:11:02 2018 New Revision: 1842726 URL: http://svn.apache.org/viewvc?rev=1842726=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62757 Correct a regression in the fix for bug 62603 that caused NullPointerExceptions when compiling tag files on first access when development mode was disabled and background compilation was enabled. Based on a patch by Jordi Llach. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 3 14:11:02 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747 404,1747506,1747536,1747924,1747980,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,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
[Bug 62757] JspCompilationContext is unable to compile class for JSP due to a null tagHandlerClass in Generator.TagHandlerInfo
https://bz.apache.org/bugzilla/show_bug.cgi?id=62757 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #10 from Mark Thomas --- Thanks for the additional review. The point regarding isOutDated() is a valid one. I have adjusted the patch to take account of that feedback. The fix has been applied to: - 9.0.x for 9.0.13 onwards - 8.5.x for 8.5.35 onwards - 7.0.x for 7.0.92 onwards Thanks again for your work on this issue. -- 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
Cloud clustering support using Kubernetes
Hi, As I talked about during the latest TomcatCon (and the previous one in London actually ...), there's a cloud aware cluster members provider that can be contributed to Tomcat. The current code is here: https://github.com/rmaucher/tomcat-in-the-cloud It uses Kubernetes to retrieve the members of a cluster, rather than multicast (which isn't available) or static (which is well ... static) member providers. Credits: Maxime Beck and JGroups did the initial code Keiichi Fujino explained how to refactor it to fit in the Catalina cluster API and I refactored it as he told me to Problems: Only does Kubernetes for now (which is likely ok since it's now widely available) JSON parser dependency (org.json) that is likely not ok to have as is in the lib folder (solutions: package renaming using a script or include json code in Tomcat) Needs more testing Tomcat 9.0.13 needed (with some fixmes related to that in the code) Comments ? Rémy
Re: Refactoring and Cleanup of OS Name property usage
On 03/10/18 00:48, Igal Sapir wrote:
> Regarding this:
>
> On 10/2/2018 3:54 PM, Igal Sapir wrote:
>> Rainer pointed out to me the class JrePlatform [1], which has a helper
>> field called IS_WINDOWS.
>>
>> I think that it would make sense to add a constant field OS_NAME, as
>> well as IS_LINUX and IS_MACOS, and use these fields instead of calling
>> System.getProperty("os.name") in multiple places - some examples [2]
>> [3] [4].
>>
>> If there is no objection, I can go ahead and refactor that.
Hmm. We do have a lot of calls to System.getProperty("os.name") but they
nearly all appear to be used alongside other calls to
System.getProperty(...) and are not further tested for specific OS values.
I wonder if, from a maintenance point of view, it wouldn't be clearer to
leave those as they are? I guess I am -0 on that part of the refactoring.
>> [1]
>> https://github.com/apache/tomcat/blob/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java
>>
>>
>> [2]
>> https://github.com/apache/tomcat/blob/trunk/java/org/apache/catalina/util/ServerInfo.java#L113
>>
>>
>> [3]
>> https://github.com/apache/tomcat/blob/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java#L56
>>
>>
>
> Example [3] above is in a separate module, so perhaps those should not
> be dependent on org.apache.tomcat? I'm not sure but wanted to point it
> out.
The jdbc-pool module only has a dependency on JULI - tomcat's logging
framework - which itself has no other dependencies. I don't think the
benefits of this change justify adding tomcat-util.jar as an additional
dependency.
>> [4]
>> https://github.com/apache/tomcat/blob/trunk/test/org/apache/tomcat/util/net/TesterSupport.java#L196
That one I do think makes sense to pull into JrePlatform.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62739] Tomcat should allow blank Host header
https://bz.apache.org/bugzilla/show_bug.cgi?id=62739 --- Comment #7 from Mark Thomas --- Thanks. Looking at this now. -- 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: r1842705 - in /tomcat/trunk/test/org/apache/catalina/webresources: TestAbstractArchiveResource.java TestFileResource.java
Author: markt
Date: Wed Oct 3 11:26:43 2018
New Revision: 1842705
URL: http://svn.apache.org/viewvc?rev=1842705=rev
Log:
Alternative fix for case sensitivity issue.
Resource URLs are generated from canonical file paths so the expected paths
need to be canonical as well.
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java?rev=1842705=1842704=1842705=diff
==
---
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
Wed Oct 3 11:26:43 2018
@@ -18,7 +18,6 @@ package org.apache.catalina.webresources
import java.io.File;
-import org.apache.tomcat.util.compat.JrePlatform;
import org.junit.Assert;
import org.junit.Test;
@@ -46,18 +45,10 @@ public class TestAbstractArchiveResource
ctx.getResources().getClassLoaderResource("/META-INF/resources/index.html");
StringBuilder expectedURL = new StringBuilder("jar:war:");
-
expectedURL.append(docBase.getAbsoluteFile().toURI().toURL().toString());
+
expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
expectedURL.append("*/WEB-INF/lib/test.jar!/META-INF/resources/index.html");
-String expected = expectedURL.toString();
-String actual = webResource.getURL().toString();
-
-if (JrePlatform.IS_WINDOWS){
-expected = expected.toLowerCase();
-actual = actual.toLowerCase();
-}
-
-Assert.assertEquals(expected, actual);
+Assert.assertEquals(expectedURL.toString(),
webResource.getURL().toString());
}
@@ -77,18 +68,10 @@ public class TestAbstractArchiveResource
ctx.getResources().getClassLoaderResource("/META-INF/tags/echo.tag");
StringBuilder expectedURL = new StringBuilder("jar:");
-
expectedURL.append(docBase.getAbsoluteFile().toURI().toURL().toString());
+
expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
expectedURL.append("WEB-INF/lib/test-lib.jar!/META-INF/tags/echo.tag");
-String expected = expectedURL.toString();
-String actual = webResource.getURL().toString();
-
-if (JrePlatform.IS_WINDOWS){
-expected = expected.toLowerCase();
-actual = actual.toLowerCase();
-}
-
-Assert.assertEquals(expected, actual);
+Assert.assertEquals(expectedURL.toString(),
webResource.getURL().toString());
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java?rev=1842705=1842704=1842705=diff
==
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
Wed Oct 3 11:26:43 2018
@@ -20,7 +20,6 @@ import java.io.File;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tomcat.util.compat.JrePlatform;
import org.junit.Assert;
import org.junit.Test;
@@ -41,15 +40,6 @@ public class TestFileResource extends To
// Build the expected location the same way the webapp base dir is
built
File f = new File("test/webapp/WEB-INF/classes");
-
-String expected = f.toURI().toURL().toString();
-String actual = out.toString().trim();
-
-if (JrePlatform.IS_WINDOWS){
-expected = expected.toLowerCase();
-actual = actual.toLowerCase();
-}
-
-Assert.assertEquals(expected, actual);
+Assert.assertEquals(f.getCanonicalFile().toURI().toURL().toString(),
out.toString().trim());
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1842657 - in /tomcat/trunk/test/org/apache: catalina/startup/TomcatBaseTest.java catalina/webresources/TestAbstractArchiveResource.java catalina/webresources/TestFileResource.java coy
On 03/10/18 11:17, Mark Thomas wrote: > On 02/10/18 22:39, isa...@apache.org wrote: >> Author: isapir >> Date: Tue Oct 2 21:39:57 2018 >> New Revision: 1842657 >> >> URL: http://svn.apache.org/viewvc?rev=1842657=rev >> Log: >> Fixed test cases that errored due to path case sentsitivity on Windows > > This looks to be addressing the symptom rather than the root cause. > > URLs should be case sensitive so converting them to lower case before > comparing them may hide future regressions. > > I suspect an issue with getAbsolutePath() vs getCanonicalPath() but that > is only a guess as to what the root cause might be. > > I'm looking to see if I can recreate the original problem. Found it. The basis of all the resource URLs is the Context's docBase. It is using getCanonicalPath() (actually there is a case where it doesn't - that is a separate bug). The unit test therefore needs to use getCanonicalPath() as well. Fixed in svn. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1842704 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt Date: Wed Oct 3 11:18:55 2018 New Revision: 1842704 URL: http://svn.apache.org/viewvc?rev=1842704=rev Log: Ensure that a canonical path is always used for the docBase of a Context to ensure consistent behaviour. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 3 11:18:55 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
svn commit: r1842706 - /tomcat/trunk/java/org/apache/tomcat/util/compat/TLS.java
Author: markt
Date: Wed Oct 3 11:42:09 2018
New Revision: 1842706
URL: http://svn.apache.org/viewvc?rev=1842706=rev
Log:
Fix IDE nag (unused variable)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/compat/TLS.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/TLS.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/TLS.java?rev=1842706=1842705=1842706=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/compat/TLS.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/TLS.java Wed Oct 3
11:42:09 2018
@@ -32,7 +32,7 @@ public class TLS {
static {
boolean ok = false;
try {
-SSLContext sc =
SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
+SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
ok = true;
} catch (NoSuchAlgorithmException ex) {
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62798] Apache failed to initialize connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=62798 --- Comment #4 from Gaël REYNOARD --- Thank you for your reply I opened a message on the User list and I continue to do tests on my side to try to understand why I have this exception. What bothers me in this error is the fact that NETSTAT systematically returns me that the port which is already used, it is used by Tomcat8 itself. -- 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: Cloud clustering support using Kubernetes
On 03/10/18 14:48, Rémy Maucherat wrote: > Hi, > > As I talked about during the latest TomcatCon (and the previous one in > London actually ...), there's a cloud aware cluster members provider that > can be contributed to Tomcat. > > The current code is here: https://github.com/rmaucher/tomcat-in-the-cloud > It uses Kubernetes to retrieve the members of a cluster, rather than > multicast (which isn't available) or static (which is well ... static) > member providers. > > Credits: > Maxime Beck and JGroups did the initial code > Keiichi Fujino explained how to refactor it to fit in the Catalina cluster > API > and I refactored it as he told me to > > Problems: > Only does Kubernetes for now (which is likely ok since it's now widely > available) No objections on this point. A quick look at the code indicates additional CloudMembershipProvider implementations should be fairly simple to add as required. > JSON parser dependency (org.json) that is likely not ok to have as is in > the lib folder (solutions: package renaming using a script or include json > code in Tomcat) Because we get JSON from Kubernetes? Is there any other interface we could use that doesn't return JSON? Are other providers (Docker is the one that comes immediately to mind) also going to require JSON? Other random thoughts: - Make it an optional library that we depend on at compile time but don't ship? Fail start-up if it is not present when the CloudMembershipProvider is configured? - Package the cloud membership provider stuff extras and include the JSON JAR in that? It is only 64Kb (if I am looking at the correct JAR). I am a little concerned about conflicts with web applications shipping alternative versions of the JAR. We should be OK on this point as none of the clustering objects that touch JSON should be visible to web applications. > Needs more testing > Tomcat 9.0.13 needed (with some fixmes related to that in the code) > > Comments ? It it is intended for inclusion in Tomcat then the sooner it is in the Tomcat code base the better. It doesn't have to ship with a release straight away if it isn't release ready. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1842657 - in /tomcat/trunk/test/org/apache: catalina/startup/TomcatBaseTest.java catalina/webresources/TestAbstractArchiveResource.java catalina/webresources/TestFileResource.java coy
Chris,
Thank you for the feedback:
On 10/3/2018 10:01 AM, Christopher Schultz wrote:
On 10/2/18 17:39, isa...@apache.org wrote:
Author: isapir
Date: Tue Oct 2 21:39:57 2018
New Revision: 1842657
URL: http://svn.apache.org/viewvc?rev=1842657=rev
Log:
Fixed test cases that errored due to path case sentsitivity on Windows
Perhaps the isWindows() call should be changed to
isCaseInsensitiveFilesystem() instead? Windows isn't the only OS with
case-insensitive filesystems.
The isWindows() method was replaced in r1842664 with
if (JrePlatform.IS_WINDOWS) ...
I'd be happy to add isCaseInsensitiveFilesystem() to JrePlatform, but
while on Windows I know that it is always the case, I don't think that
we can go just by the OS Name for other systems.
We can write a temp file with name "a" and then check if "A" exists or
only "a" does to determine that value.
I can add that to JrePlatform if that makes sense.
Assume.assumeTrue("This test is only expected to trigger an exception on
Windo9ws",
Nit: Trivial typo.
That typo was already there but I missed it. Rainer caught it (probably
while reviewing my patch) and corrected it in r1842659.
Thanks,
Igal
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1842748 - in /tomcat/trunk: java/org/apache/tomcat/util/compat/JrePlatform.java test/org/apache/tomcat/util/net/TesterSupport.java
Author: isapir
Date: Wed Oct 3 18:16:35 2018
New Revision: 1842748
URL: http://svn.apache.org/viewvc?rev=1842748=rev
Log:
Moved check of isMacOs() to o.a.t.util.compat.JrePlatform
Modified:
tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java?rev=1842748=1842747=1842748=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java Wed Oct 3
18:16:35 2018
@@ -18,11 +18,13 @@ package org.apache.tomcat.util.compat;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Locale;
public class JrePlatform {
private static final String OS_NAME_PROPERTY = "os.name";
private static final String OS_NAME_WINDOWS_PREFIX = "Windows";
+private static final String OS_NAME_MAC_OS_LC_PREFIX = "mac os x";
static {
/*
@@ -51,9 +53,13 @@ public class JrePlatform {
});
}
+IS_MAC_OS =
osName.toLowerCase(Locale.ENGLISH).startsWith(OS_NAME_MAC_OS_LC_PREFIX);
+
IS_WINDOWS = osName.startsWith(OS_NAME_WINDOWS_PREFIX);
}
+public static final boolean IS_MAC_OS;
+
public static final boolean IS_WINDOWS;
}
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1842748=1842747=1842748=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Wed Oct 3
18:16:35 2018
@@ -26,7 +26,6 @@ import java.security.Principal;
import java.security.PrivateKey;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-import java.util.Locale;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
@@ -53,6 +52,7 @@ import org.apache.catalina.startup.Tomca
import org.apache.tomcat.jni.Library;
import org.apache.tomcat.jni.LibraryNotFoundError;
import org.apache.tomcat.jni.SSL;
+import org.apache.tomcat.util.compat.JrePlatform;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
@@ -193,10 +193,6 @@ public final class TesterSupport {
return ks;
}
-protected static boolean isMacOs() {
-return
System.getProperty("os.name").toLowerCase(Locale.ENGLISH).startsWith("mac os
x");
-}
-
protected static boolean isRenegotiationSupported(Tomcat tomcat) {
String protocol = tomcat.getConnector().getProtocolHandlerClassName();
if (protocol.contains("Apr")) {
@@ -213,7 +209,7 @@ public final class TesterSupport {
// Disabled by default in 1.1.20 windows binary (2010-07-27)
return false;
}
-if (protocol.contains("NioProtocol") ||
(protocol.contains("Nio2Protocol") && isMacOs())) {
+if (protocol.contains("NioProtocol") ||
(protocol.contains("Nio2Protocol") && JrePlatform.IS_MAC_OS)) {
// Doesn't work on all platforms - see BZ 56448.
return false;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62739] Tomcat should allow blank Host header
https://bz.apache.org/bugzilla/show_bug.cgi?id=62739 --- Comment #9 from Michael Orr --- Good question. Let me know how you want to proceed, and I'll add tests and code accordingly. -- 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: Cloud clustering support using Kubernetes
On Wed, Oct 3, 2018 at 4:35 PM Mark Thomas wrote: > On 03/10/18 14:48, Rémy Maucherat wrote: > > Hi, > > > > As I talked about during the latest TomcatCon (and the previous one in > > London actually ...), there's a cloud aware cluster members provider that > > can be contributed to Tomcat. > > > > The current code is here: > https://github.com/rmaucher/tomcat-in-the-cloud > > It uses Kubernetes to retrieve the members of a cluster, rather than > > multicast (which isn't available) or static (which is well ... static) > > member providers. > > > > Credits: > > Maxime Beck and JGroups did the initial code > > Keiichi Fujino explained how to refactor it to fit in the Catalina > cluster > > API > > and I refactored it as he told me to > > > > Problems: > > Only does Kubernetes for now (which is likely ok since it's now widely > > available) > > No objections on this point. A quick look at the code indicates > additional CloudMembershipProvider implementations should be fairly > simple to add as required. > Yes, it's very small, most of the work is knowing to use your cloud infrastructure (... :( ). > > > JSON parser dependency (org.json) that is likely not ok to have as is in > > the lib folder (solutions: package renaming using a script or include > json > > code in Tomcat) > > Because we get JSON from Kubernetes? Is there any other interface we > could use that doesn't return JSON? Well, it's very simple, you get the pods list that way, afaik they don't like xml at all, it's all either yml or json. I guess it's "simpler" (ahem). > Are other providers (Docker is the > one that comes immediately to mind) also going to require JSON? > Yes, that comes to mind, I don't know their orchestration yet (it's called Docker swarm) but it looks like json responses as well. > > Other random thoughts: > - Make it an optional library that we depend on at compile time but > don't ship? Fail start-up if it is not present when the > CloudMembershipProvider is configured? > - Package the cloud membership provider stuff extras and include the > JSON JAR in that? > > It is only 64Kb (if I am looking at the correct JAR). I am a little > concerned about conflicts with web applications shipping alternative > versions of the JAR. We should be OK on this point as none of the > clustering objects that touch JSON should be visible to web applications. > Yes, it's small, but it's probably a commonly used library. So a decision has to be made about it. > > > Needs more testing > > Tomcat 9.0.13 needed (with some fixmes related to that in the code) > > > > Comments ? > > It it is intended for inclusion in Tomcat then the sooner it is in the > Tomcat code base the better. It doesn't have to ship with a release > straight away if it isn't release ready. > Ok, no problem with that. Rémy
Re: Bug 62140 implementation question
My only thought was the single-source value. If it would be a lot of extra work to do the text file, then I think the original design is fine. Mitch On 10/02/2018 09:56 AM, Marek Czernek wrote: Well, I personally would prefer if it was a soure-able (or call-able for windows) script; otherwise, you'd have to parse the text file to check which part of the text you want to output, since you don't want to output all the text at once, but only for one particular verb. Any particular benefits for a text file over two scripts? It's true it's single-sourced, but given that all scripts are essentially duplicated into .sh and .bat, I don't feel like that outweighs the ease of use and extensibility of the help script files. On 10/2/18 4:45 PM, Mitch Claborn wrote: Are the available verbs the same for both .sh and .bat? If so, perhaps a text file that contains the actual help text that could be output from both .bat and .sh. Mitch On 10/01/2018 02:48 PM, Marek Czernek wrote: Hi there, I'd like to resolve Bug 62140 [0]. I just wanted to gather some opinions about the implementation details. In my mind, the following solution is quite reasonable: 1. Create new help scripts, such as help.sh and help.bat. These files contain a method for each functional verb that prints some info about the verb and exits with 0. 2. Source the files in both catalina.sh and catalina.bat 3. When user enters catalina.[sh|bat] $verb help (or -h, --help?), execute one of the methods. In my mind, the above solution is quite straightforward. Any gotchas, or obvious problems? [0] https://bz.apache.org/bugzilla/show_bug.cgi?id=62140 Cheers, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62739] Tomcat should allow blank Host header
https://bz.apache.org/bugzilla/show_bug.cgi?id=62739 --- Comment #8 from Mark Thomas --- Patch looks good - thanks for including the tests. My main thought at this point is what should HttpServletRequest.getServerName() return? My reading of the Javadoc is if the Host header is present, its value should be returned by HttpServletRequest.getServerName(). That requires a slightly different fix (in the parser to allow empty values). Either solution enables the new tests to pass. Leaving this open for a little while to think about it. -- 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: Refactoring and Cleanup of OS Name property usage
On 10/3/2018 4:41 AM, Mark Thomas wrote:
On 03/10/18 00:48, Igal Sapir wrote:
Regarding this:
On 10/2/2018 3:54 PM, Igal Sapir wrote:
Rainer pointed out to me the class JrePlatform [1], which has a helper
field called IS_WINDOWS.
I think that it would make sense to add a constant field OS_NAME, as
well as IS_LINUX and IS_MACOS, and use these fields instead of calling
System.getProperty("os.name") in multiple places - some examples [2]
[3] [4].
If there is no objection, I can go ahead and refactor that.
Hmm. We do have a lot of calls to System.getProperty("os.name") but they
nearly all appear to be used alongside other calls to
System.getProperty(...) and are not further tested for specific OS values.
I wonder if, from a maintenance point of view, it wouldn't be clearer to
leave those as they are? I guess I am -0 on that part of the refactoring.
Fair enough.
[4]
https://github.com/apache/tomcat/blob/trunk/test/org/apache/tomcat/util/net/TesterSupport.java#L196
That one I do think makes sense to pull into JrePlatform.
I have moved [4] above in r1842748. I used the existing convention in
the file of setting the string to a static variable, i.e.
private static final String OS_NAME_WINDOWS_PREFIX = "Windows";
+private static final String OS_NAME_MAC_OS_LC_PREFIX = "mac os x";
though I personally think that it would make sense to inline it since
it's only used once.
Igal
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Refactoring and Cleanup of OS Name property usage
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Igal,
On 10/2/18 18:54, Igal Sapir wrote:
> Rainer pointed out to me the class JrePlatform [1], which has a
> helper field called IS_WINDOWS.
>
> I think that it would make sense to add a constant field OS_NAME,
> as well as IS_LINUX and IS_MACOS, and use these fields instead of
> calling System.getProperty("os.name") in multiple places - some
> examples [2] [3] [4].
>
> If there is no objection, I can go ahead and refactor that.
+1
- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlu09ogACgkQHPApP6U8
pFjXHQ//XUz9mDXA8hUFxL+6Ck/xjDiExUjTFwV7rm0hYWjaeECHqz5tgZ5h3FAy
2S2JaICB1+BhzBPQAkVrruadIqy4X5pIOs4cekZcOGtxThxRTPPOTedhjktXMy6s
Yd5p0DHpkqy2zZFUQWnpXfuQNqrQv3fL6Reqed5EOeoFRvTKjGM8XiUeoRA1+rIB
r0fT0zZDO5im9GEdev4nSbrUE74vPZMHnBH1ykKMB9zWQVwnkIfajCaJMuV7glrj
T6dOJa6z15hMfSOkrX0xy6AaB0GpMhh9kZuYjySXW5n6tPNIMNNX+x+j+Xu7nQnS
MRkYe+2zNSS8GUT638e026loH8XDA3ortvnXZ+mdK01RMGe+4hRR2OKPoaok3qaQ
tInLACtWun6tEsAtGLhVcn2gEO60y22r+d+bOLKOz7G7+9D1aKRQIfMnO9wc5ogG
O4dAhlSXLn3fE16vlL1jyzbje3D85jEUYT6tkT7ee307BbVflfZ9+OGb8tUjjfMl
iUNWmUz6ly4caZD28VlenLM8rRu4HZZ/684wQl6SvJCAp60Irk/WfM7T1zNO3vjr
xVaR+S3G+elNLmnoGLcF6538aket7x+1ixnG67Cs3gRRlhtuSMEHThZHNTR4ecob
uPu9eiKfIaa3W7g67FPQkxZp2TnzeshPKUjTMdoiX0V4N3Zz2kU=
=J0yo
-END PGP SIGNATURE-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release JK 1.2.46
On 01/10/18 16:30, Mark Thomas wrote: > Tag: > http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_46/ > > Source: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/ > > > This is a maintenance release with a handful of bug fixes (compared to > 1.2.44) and some clean-up. It also includes Windows binaries for IIS. > > > The proposed JK 1.2.46 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 1.2.46 Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1842760 [27/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Wed Oct 3 20:10:15 2018 @@ -1,486 +1,482 @@ - - - - - -Apache Tomcat - Apache Tomcat 5 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [25/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/resources.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/resources.html (original) +++ tomcat/site/trunk/docs/resources.html Wed Oct 3 20:10:15 2018 @@ -1,380 +1,385 @@ - - - - - -Apache Tomcat - Resources - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
svn commit: r1842760 [26/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-4.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/security-4.html (original) +++ tomcat/site/trunk/docs/security-4.html Wed Oct 3 20:10:15 2018 @@ -1,611 +1,641 @@ - - - - - -Apache Tomcat - Apache Tomcat 4.x vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [31/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/svn.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/svn.html (original) +++ tomcat/site/trunk/docs/svn.html Wed Oct 3 20:10:15 2018 @@ -1,307 +1,304 @@ - - - - - -Apache Tomcat - Subversion Repository Access - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
svn commit: r1842760 [30/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/security-native.html (original) +++ tomcat/site/trunk/docs/security-native.html Wed Oct 3 20:10:15 2018 @@ -1,411 +1,409 @@ - - - - - -Apache Tomcat - Apache Tomcat APR/native Connector vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -
svn commit: r1842760 [1/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: markt Date: Wed Oct 3 20:10:15 2018 New Revision: 1842760 URL: http://svn.apache.org/viewvc?rev=1842760=rev Log: Drop TomcatCon from the menu until we have form plans for the next event Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/conference.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews-2013.html tomcat/site/trunk/docs/oldnews-2014.html tomcat/site/trunk/docs/oldnews-2015.html tomcat/site/trunk/docs/oldnews-2016.html tomcat/site/trunk/docs/oldnews-2017.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security-taglibs.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/taglibs.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tomcat-60-eol.html tomcat/site/trunk/docs/tomcat-80-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/project.xml Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Wed Oct 3 20:10:15 2018 @@ -1,601 +1,586 @@ - - - - - -Apache Tomcat - Reporting Bugs - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - -
svn commit: r1842760 [7/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/findhelp.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/findhelp.html (original) +++ tomcat/site/trunk/docs/findhelp.html Wed Oct 3 20:10:15 2018 @@ -1,310 +1,296 @@ - - - - - -Apache Tomcat - Find Help - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
svn commit: r1842760 [2/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Wed Oct 3 20:10:15 2018 @@ -1,1002 +1,948 @@ - - - - - -Apache Tomcat - Continuous Integration - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
svn commit: r1842760 [6/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Wed Oct 3 20:10:15 2018 @@ -1,261 +1,249 @@ - - - - - -Apache Tomcat - Tomcat Native Downloads - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [8/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/irc.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/irc.html (original) +++ tomcat/site/trunk/docs/irc.html Wed Oct 3 20:10:15 2018 @@ -1,253 +1,243 @@ - - - - - -Apache Tomcat - Apache Tomcat on IRC - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
svn commit: r1842760 [12/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/migration-8.html (original) +++ tomcat/site/trunk/docs/migration-8.html Wed Oct 3 20:10:15 2018 @@ -1,372 +1,367 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 8.0.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [10/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/migration-6.html (original) +++ tomcat/site/trunk/docs/migration-6.html Wed Oct 3 20:10:15 2018 @@ -1,523 +1,526 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 6.0.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [11/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/migration-7.html (original) +++ tomcat/site/trunk/docs/migration-7.html Wed Oct 3 20:10:15 2018 @@ -1,712 +1,686 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 7.0.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [13/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-85.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/migration-85.html (original) +++ tomcat/site/trunk/docs/migration-85.html Wed Oct 3 20:10:15 2018 @@ -1,392 +1,387 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 8.5.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [32/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/tomcat-60-eol.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-60-eol.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/tomcat-60-eol.html (original) +++ tomcat/site/trunk/docs/tomcat-60-eol.html Wed Oct 3 20:10:15 2018 @@ -1,284 +1,276 @@ - - - - - -Apache Tomcat - End of life for Apache Tomcat 6.0.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [23/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Wed Oct 3 20:10:15 2018 @@ -1,1205 +1,1182 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
svn commit: r1842760 [29/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Wed Oct 3 20:10:15 2018 @@ -51,14 +51,6 @@ -TomcatCon - - -North America - - - - Download Modified: tomcat/site/trunk/docs/security-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/security-8.html (original) +++ tomcat/site/trunk/docs/security-8.html Wed Oct 3 20:10:15 2018 @@ -51,14 +51,6 @@ -TomcatCon - - -North America - - - - Download Modified: tomcat/site/trunk/docs/security-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/security-9.html (original) +++ tomcat/site/trunk/docs/security-9.html Wed Oct 3 20:10:15 2018 @@ -51,14 +51,6 @@ -TomcatCon - - -North America - - - - Download Modified: tomcat/site/trunk/docs/security-impact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/security-impact.html (original) +++ tomcat/site/trunk/docs/security-impact.html Wed Oct 3 20:10:15 2018 @@ -1,296 +1,288 @@ - - - - - -Apache Tomcat - Security Impact Levels - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -
svn commit: r1842760 [33/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Wed Oct 3 20:10:15 2018 @@ -1,241 +1,233 @@ - - - - - -Apache Tomcat - Which Version Do I Want? - - - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat
svn commit: r1842760 [28/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Wed Oct 3 20:10:15 2018 @@ -1,607 +1,622 @@ - - - - - -Apache Tomcat - Apache Tomcat 6 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [22/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2017.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2017.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews-2017.html (original) +++ tomcat/site/trunk/docs/oldnews-2017.html Wed Oct 3 20:10:15 2018 @@ -1,1682 +1,1664 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [9/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/lists.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/lists.html (original) +++ tomcat/site/trunk/docs/lists.html Wed Oct 3 20:10:15 2018 @@ -1,450 +1,449 @@ - - - - - -Apache Tomcat - Mailing Lists - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
svn commit: r1842760 [24/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/presentations.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/presentations.html (original) +++ tomcat/site/trunk/docs/presentations.html Wed Oct 3 20:10:15 2018 @@ -1,791 +1,775 @@ - - - - - -Apache Tomcat - Presentations - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [20/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2015.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2015.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews-2015.html (original) +++ tomcat/site/trunk/docs/oldnews-2015.html Wed Oct 3 20:10:15 2018 @@ -1,1270 +1,1241 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [17/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2012.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews-2012.html (original) +++ tomcat/site/trunk/docs/oldnews-2012.html Wed Oct 3 20:10:15 2018 @@ -1,931 +1,890 @@ - - - - - -Apache Tomcat - Old news! - 2012 - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [21/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2016.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2016.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews-2016.html (original) +++ tomcat/site/trunk/docs/oldnews-2016.html Wed Oct 3 20:10:15 2018 @@ -1,1627 +1,1609 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [34/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Wed Oct 3 20:10:15 2018 @@ -1,237 +1,228 @@ - - - - - -Apache Tomcat - Who We Are - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
svn commit: r1842760 [15/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2010.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews-2010.html (original) +++ tomcat/site/trunk/docs/oldnews-2010.html Wed Oct 3 20:10:15 2018 @@ -1,305 +1,292 @@ - - - - - -Apache Tomcat - Old news! - 2010 - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [16/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2011.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews-2011.html (original) +++ tomcat/site/trunk/docs/oldnews-2011.html Wed Oct 3 20:10:15 2018 @@ -1,823 +1,780 @@ - - - - - -Apache Tomcat - Old news! - 2011 - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [19/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2014.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2014.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews-2014.html (original) +++ tomcat/site/trunk/docs/oldnews-2014.html Wed Oct 3 20:10:15 2018 @@ -1,1086 +1,1049 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [18/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2013.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/oldnews-2013.html (original) +++ tomcat/site/trunk/docs/oldnews-2013.html Wed Oct 3 20:10:15 2018 @@ -1,730 +1,710 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [14/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/migration-9.html (original) +++ tomcat/site/trunk/docs/migration-9.html Wed Oct 3 20:10:15 2018 @@ -1,498 +1,507 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 9.0.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [5/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/download-90.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/download-90.html (original) +++ tomcat/site/trunk/docs/download-90.html Wed Oct 3 20:10:15 2018 @@ -1,247 +1,236 @@ - - - - - -Apache Tomcat - Apache Tomcat 9 Software Downloads - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [4/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/download-80.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/download-80.html (original) +++ tomcat/site/trunk/docs/download-80.html Wed Oct 3 20:10:15 2018 @@ -1,246 +1,234 @@ - - - - - -Apache Tomcat - Apache Tomcat 8 Software Downloads - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842760 [3/34] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/conference.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1842760=1842759=1842760=diff == --- tomcat/site/trunk/docs/conference.html (original) +++ tomcat/site/trunk/docs/conference.html Wed Oct 3 20:10:15 2018 @@ -1,324 +1,321 @@ - - - - - -Apache Tomcat - TomcatCon - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors - -
Re: Refactoring and Cleanup of OS Name property usage
On 10/3/2018 12:05 PM, Mark Thomas wrote: [4] https://github.com/apache/tomcat/blob/trunk/test/org/apache/tomcat/util/net/TesterSupport.java#L196 That one I do think makes sense to pull into JrePlatform. I have moved [4] above in r1842748. I used the existing convention in the file of setting the string to a static variable, i.e. private static final String OS_NAME_WINDOWS_PREFIX = "Windows"; + private static final String OS_NAME_MAC_OS_LC_PREFIX = "mac os x"; though I personally think that it would make sense to inline it since it's only used once. It would also mean fewer lines of code - always a winner in my book ;) 'nuff said - r1842751 To be honest, I have no strong feelings one way or the other. It is a style choice more than anything else in this case. It isn't an itch I want to scratch but equally I'm not going to object if you want to make that change. To itch his own ;) Igal - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1842754 [2/5] - in /tomcat/site/trunk: docs/index.html docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-7.xml xdocs/security-8.xml xdocs/security-9.xml
Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1842754=1842753=1842754=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Wed Oct 3 19:49:05 2018 @@ -1,386 +1,386 @@ - - - - - -Apache Tomcat - Apache Tomcat 7 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842754 [4/5] - in /tomcat/site/trunk: docs/index.html docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-7.xml xdocs/security-8.xml xdocs/security-9.xml
Modified: tomcat/site/trunk/docs/security-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1842754=1842753=1842754=diff == --- tomcat/site/trunk/docs/security-9.html (original) +++ tomcat/site/trunk/docs/security-9.html Wed Oct 3 19:49:05 2018 @@ -1,302 +1,302 @@ - - - - - -Apache Tomcat - Apache Tomcat 9 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
svn commit: r1842754 [5/5] - in /tomcat/site/trunk: docs/index.html docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-7.xml xdocs/security-8.xml xdocs/security-9.xml
Modified: tomcat/site/trunk/xdocs/security-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1842754=1842753=1842754=diff == --- tomcat/site/trunk/xdocs/security-7.xml (original) +++ tomcat/site/trunk/xdocs/security-7.xml Wed Oct 3 19:49:05 2018 @@ -50,6 +50,25 @@ + + +Moderate: Open Redirect + CVE-2018-11784 + +When the default servlet returned a redirect to a directory (e.g. + redirecting to /foo/ when the user requested + /foo) a specially crafted URL could be used to cause the + redirect to be generated to any URI of the attackers choice. + +This was fixed in revision 1840057. + +This issue was reported to the Apache Tomcat Security Team by Sergey + Bobrov on 28 August 2018 and made public on 3 October 2018. + +Affects: 7.0.23 to 7.0.90 + + + Low: host name verification missing in WebSocket client Modified: tomcat/site/trunk/xdocs/security-8.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-8.xml?rev=1842754=1842753=1842754=diff == --- tomcat/site/trunk/xdocs/security-8.xml (original) +++ tomcat/site/trunk/xdocs/security-8.xml Wed Oct 3 19:49:05 2018 @@ -50,6 +50,25 @@ + + +Moderate: Open Redirect + CVE-2018-11784 + +When the default servlet returned a redirect to a directory (e.g. + redirecting to /foo/ when the user requested + /foo) a specially crafted URL could be used to cause the + redirect to be generated to any URI of the attackers choice. + +This was fixed in revision 1840056. + +This issue was reported to the Apache Tomcat Security Team by Sergey + Bobrov on 28 August 2018 and made public on 3 October 2018. + +Affects: 8.5.0 to 8.5.33 + + + Low: host name verification missing in WebSocket client Modified: tomcat/site/trunk/xdocs/security-9.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-9.xml?rev=1842754=1842753=1842754=diff == --- tomcat/site/trunk/xdocs/security-9.xml (original) +++ tomcat/site/trunk/xdocs/security-9.xml Wed Oct 3 19:49:05 2018 @@ -50,6 +50,25 @@ + + +Moderate: Open Redirect + CVE-2018-11784 + +When the default servlet returned a redirect to a directory (e.g. + redirecting to /foo/ when the user requested + /foo) a specially crafted URL could be used to cause the + redirect to be generated to any URI of the attackers choice. + +This was fixed in revision 1840055. + +This issue was reported to the Apache Tomcat Security Team by Sergey + Bobrov on 28 August 2018 and made public on 3 October 2018. + +Affects: 9.0.0.M1 to 9.0.11 + + + Low: host name verification missing in WebSocket client - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1842754 [1/5] - in /tomcat/site/trunk: docs/index.html docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-7.xml xdocs/security-8.xml xdocs/security-9.xml
Author: markt Date: Wed Oct 3 19:49:05 2018 New Revision: 1842754 URL: http://svn.apache.org/viewvc?rev=1842754=rev Log: Add details of CVE-2018-11784 Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/xdocs/security-7.xml tomcat/site/trunk/xdocs/security-8.xml tomcat/site/trunk/xdocs/security-9.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1842754=1842753=1842754=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Wed Oct 3 19:49:05 2018 @@ -1,571 +1,560 @@ - - - - - -Apache Tomcat - Welcome! - - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 -
svn commit: r1842754 [3/5] - in /tomcat/site/trunk: docs/index.html docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-7.xml xdocs/security-8.xml xdocs/security-9.xml
Modified: tomcat/site/trunk/docs/security-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1842754=1842753=1842754=diff == --- tomcat/site/trunk/docs/security-8.html (original) +++ tomcat/site/trunk/docs/security-8.html Wed Oct 3 19:49:05 2018 @@ -1,362 +1,362 @@ - - - - - -Apache Tomcat - Apache Tomcat 8 vulnerabilities - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png;> - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -TomcatCon - - -North America - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat Connectors -
[SECURITY] CVE-2018-11784 Apache Tomcat - Open Redirect
CVE-2018-11784 Apache Tomcat - Open Redirect Severity: Moderate Vendor: The Apache Software Foundation Versions Affected: Apache Tomcat 9.0.0.M1 to 9.0.11 Apache Tomcat 8.5.0 to 8.5.33 Apache Tomcat 7.0.23 to 7.0.90 The unsupported 8.0.x release line has not been analysed but is likely to be affected. Description: When the default servlet returned a redirect to a directory (e.g. redirecting to '/foo/' when the user requested '/foo') a specially crafted URL could be used to cause the redirect to be generated to any URI of the attackers choice. Mitigation: Users of the affected versions should apply one of the following mitigations: - Upgrade to Apache Tomcat 9.0.12 or later. - Upgrade to Apache Tomcat 8.5.34 or later. - Upgrade to Apache Tomcat 7.0.91 or later. - Use mapperDirectoryRedirectEnabled="true" and mapperContextRootRedirectEnabled="true" on the Context to ensure that redirects are issued by the Mapper rather than the default Servlet. See the Context configuration documentation for further important details. Credit: This vulnerability was found by Sergey Bobrov and reported responsibly to the Apache Tomcat Security Team. History: 2018-10-03 Original advisory References: [1] http://tomcat.apache.org/security-9.html [2] http://tomcat.apache.org/security-8.html [3] http://tomcat.apache.org/security-7.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1842751 - /tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java
Author: isapir
Date: Wed Oct 3 19:19:17 2018
New Revision: 1842751
URL: http://svn.apache.org/viewvc?rev=1842751=rev
Log:
Inlined strings that are used only once
Modified:
tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java?rev=1842751=1842750=1842751=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java Wed Oct 3
19:19:17 2018
@@ -23,8 +23,6 @@ import java.util.Locale;
public class JrePlatform {
private static final String OS_NAME_PROPERTY = "os.name";
-private static final String OS_NAME_WINDOWS_PREFIX = "Windows";
-private static final String OS_NAME_MAC_OS_LC_PREFIX = "mac os x";
static {
/*
@@ -53,9 +51,9 @@ public class JrePlatform {
});
}
-IS_MAC_OS =
osName.toLowerCase(Locale.ENGLISH).startsWith(OS_NAME_MAC_OS_LC_PREFIX);
+IS_MAC_OS = osName.toLowerCase(Locale.ENGLISH).startsWith("mac os x");
-IS_WINDOWS = osName.startsWith(OS_NAME_WINDOWS_PREFIX);
+IS_WINDOWS = osName.startsWith("Windows");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62799] mod_jk doesn't handle the EINPROGRESS state appropriately for non-blocking sockets.
https://bz.apache.org/bugzilla/show_bug.cgi?id=62799
--- Comment #1 from Rainer Jung ---
Hi Mark,
just to make sure: did you notice that the unit of socket_connect_timeout is
milliseconds, so did you set it to 5000?
In version 1.2.44 it switched to seconds due to a regression which will be
fixed in the forthcoming 1.2.46, switching back to milliseconds.
Furthermore: which platform is this? And do you have a socket_timeout
configured in addition (not recommending it, just asking)?
I do not directly see any relevance of the event MPM here. The connection in
question is the backend connection completely controlled by mod_jk.
Furthermore, EINPROGRESS is already handled in the code. There might be a
problem in that handling, but I don't immediately see it.
If you can easily reproduce it, it would be interesting to see, where in the
following block of code we actually leave nb_connect() in common/jk_connect.c:
284 if ((rc == -1) && (errno == EINPROGRESS || errno == EALREADY)
285&& (timeout > 0)) {
Do we get in here and what is the value of errno?
286 fd_set wfdset;
287 struct timeval tv;
288 socklen_t rclen = (socklen_t)sizeof(rc);
289
290 FD_ZERO();
291 FD_SET(sd, );
292 tv.tv_sec = timeout / 1000;
293 tv.tv_usec = (timeout % 1000) * 1000;
294 rc = select(sd + 1, NULL, , NULL, );
295 if (rc <= 0) {
Do we get in here and what is the value of errno?
296 /* Save errno */
297 int err = errno;
298 soblock(sd);
299 errno = err;
300 JK_TRACE_EXIT(l);
301 return -1;
302 }
303 rc = 0;
304 #ifdef SO_ERROR
Do we get in here?
305 if (!FD_ISSET(sd, ) ||
306 (getsockopt(sd, SOL_SOCKET, SO_ERROR,
307 (char *), ) < 0) || rc) {
Do we get in here and due to which of the three conditions?
308 if (rc)
309 errno = rc;
310 rc = -1;
311 }
312 #endif /* SO_ERROR */
313 }
314 /* Not sure we can be already connected */
315 if (rc == -1 && errno == EISCONN)
316 rc = 0;
Do we get up until here and what is the value of errno?
317 soblock(sd);
What is the value of errno here?
318 JK_TRACE_EXIT(l);
319 return rc;
As an alternative: in 1.2.44 that part of the code was changed on platforms
that support poll, using poll instead of select there. 1.2.46 is not yet
released, but you can grab it for your tests from
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/
Regards,
Rainer
--
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: Cloud clustering support using Kubernetes
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Rémy, On 10/3/18 09:48, Rémy Maucherat wrote: > Hi, > > As I talked about during the latest TomcatCon (and the previous one > in London actually ...), there's a cloud aware cluster members > provider that can be contributed to Tomcat. > > The current code is here: > https://github.com/rmaucher/tomcat-in-the-cloud It uses Kubernetes > to retrieve the members of a cluster, rather than multicast (which > isn't available) or static (which is well ... static) member > providers. > > Credits: Maxime Beck and JGroups did the initial code Keiichi > Fujino explained how to refactor it to fit in the Catalina cluster > API and I refactored it as he told me to > > Problems: Only does Kubernetes for now (which is likely ok since > it's now widely available) JSON parser dependency (org.json) that > is likely not ok to have as is in the lib folder (solutions: > package renaming using a script or include json code in Tomcat) Solr uses this JSON parser which is quite fast, although the API is a little little awkward because of it: https://github.com/yonik/noggit AL2 license I'm not sure it's necessary to have a "streaming JSON" parser as opposed to a more "traditional" one where the whole JSON object is converted into objects before the client code can do anything with them. > Needs more testing Tomcat 9.0.13 needed (with some fixmes related > to that in the code) > > Comments ? - -chris -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlu1JjwACgkQHPApP6U8 pFgyYg/+Io3TnvBtSNm99H6dLzJ2AL4k3vOWBRupqgG6U93a7KP4F+R+6XuXhpBp XpGg3mkjx/gxXfR8Srd33dS7PUGd0k74HDDqBklXWmEJaaZR+Wu4gWswsbUwaHHx wnXGsBeiCgoVeoBu4fu108+tn8QirhkQy1RSSYERh26+YdHY9FlRHgRZSUJKMIoT G5uUk0QGUdHVWSNROvNOKZPDgCWHisN2sRXka7nOtuJXYEuvISusM0Rp2lizbd5o GndX9CtqyHyyB1UVBH61nx11wssGuHGY8aNSsRj/CaFSzp2mHlA0d2V7ohieV/p1 aKHmC2WdjndBmYZSlRBbBSrHce5J1iyf/OYyaDSt7V7cQU7fP2Ofpg866SDMh5XK b8tS4Bo5ZRSRRWkiC3Dl8sW2RAcFcjKHbmMpinj1ML8ygMVqLCNY81DWpxGsZtm/ opPZxEoBnPcQc5vpfpi0QjPKUrJxCUVKxrIO0KzHJ6jQ6UYJJ7VY5LUUvI5c+dqO xq3ag4JAqfCmcot/+9Ccz8+JVS9oGexkVexvkQBmuaqkXR6mkdBSnqlP1YrPVvt5 v6qu48nqkJtvOXkeGgk1XZgUsr+AKQBrprpO3i/Blf5ElMBw7uZodVe6LGRrfZUI ltQS+PIGQ4Uh6ECYZDjp9eIdlr2QKRjPOTs+qeERUru3sLvoeq4= =3p5n -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Refactoring and Cleanup of OS Name property usage
On 03/10/18 19:23, Igal Sapir wrote: > On 10/3/2018 4:41 AM, Mark Thomas wrote: [4] https://github.com/apache/tomcat/blob/trunk/test/org/apache/tomcat/util/net/TesterSupport.java#L196 >> That one I do think makes sense to pull into JrePlatform. > > I have moved [4] above in r1842748. I used the existing convention in > the file of setting the string to a static variable, i.e. > > private static final String OS_NAME_WINDOWS_PREFIX = "Windows"; > + private static final String OS_NAME_MAC_OS_LC_PREFIX = "mac os x"; > > > though I personally think that it would make sense to inline it since > it's only used once. It would also mean fewer lines of code - always a winner in my book ;) To be honest, I have no strong feelings one way or the other. It is a style choice more than anything else in this case. It isn't an itch I want to scratch but equally I'm not going to object if you want to make that change. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #124: Allow empty 'Host' HTTP header
GitHub user michaelomichael opened a pull request: https://github.com/apache/tomcat/pull/124 Allow empty 'Host' HTTP header Sending an empty string for the value of the 'Host' header no longer results in a 400 (Bad Request) response. This new behaviour reflects RFC 7230 and is particularly helpful for load balancer ping-style requests, where there is often limited control over the HTTP request headers. https://bz.apache.org/bugzilla/show_bug.cgi?id=62739 You can merge this pull request into a Git repository by running: $ git pull https://github.com/michaelomichael/tomcat bug62739_allow_empty_host_header Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/124.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #124 commit 747e1ae5192bc9da978ead09d251496ae2238480 Author: Michael Orr Date: 2018-10-02T17:09:44Z Allow empty 'Host' HTTP header Sending an empty string for the value of the 'Host' header no longer results in a 400 (Bad Request) response. This new behaviour reflects RFC 7230 and is particularly helpful for load balancer ping-style requests, where there is often limited control over the HTTP request headers. https://bz.apache.org/bugzilla/show_bug.cgi?id=62739 --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62739] Tomcat should allow blank Host header
https://bz.apache.org/bugzilla/show_bug.cgi?id=62739 --- Comment #6 from Michael Orr --- I managed to find time after all! Here's the pull request: https://github.com/apache/tomcat/pull/124 -- 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: [GUMP@vmgump-vm3]: Project tomcat-native-1.2-1.1.1-configure (in module tomcat-native-1.2-1.1.1) failed
On 03/10/18 00:54, Bill Barker wrote:
> To whom it may engage...
>
> This is an automated request, but not an unsolicited one. For
> more information please visit http://gump.apache.org/nagged.html,
> and/or contact the folk at gene...@gump.apache.org.
>
> Project tomcat-native-1.2-1.1.1-configure has an issue affecting its
> community integration.
> checking for OpenSSL library... using openssl from
> /srv/gump/public/workspace/openssl-1.1.1/dest-20181003/${exec_prefix}/lib and
> /srv/gump/public/workspace/openssl-1.1.1/dest-20181003/include
> checking OpenSSL library version >= 1.0.2...
>
> Found OPENSSL_VERSION_NUMBER 0x1000106f (OpenSSL 1.0.1f 6 Jan 2014)
> Require OPENSSL_VERSION_NUMBER 0x1000200f or greater (1.0.2)
>
> configure: error: Your version of OpenSSL is not compatible with this version
> of tcnative
This is ... odd.
The 1.1.1 branch is selected in the Gump metadata yet it reports as
1.0.1. Not sure what is going on here at the moment.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62799] mod_jk doesn't handle the EINPROGRESS state appropriately for non-blocking sockets.
https://bz.apache.org/bugzilla/show_bug.cgi?id=62799 --- Comment #3 from Rainer Jung --- I assume you are on RHEL 6 or 7? The Red Hat article unfortunately doesn't state, which version of mod_jk it is for. The man pages for connect() tells us: === Cite === EINPROGRESS The socket is nonblocking and the connection cannot be completed immediately. It is possible to select(2) or poll(2) for completion by selecting the socket for writing. After select(2) indicates writability, use getsockopt(2) to read the SO_ERROR option at level SOL_SOCKET to determine whether connect() completed successfully (SO_ERROR is zero) or unsuccessfully (SO_ERROR is one of the usual error codes listed here, explaining the reason for the failure). === Cite === In our case the socket is non-blocking, because mod_jk puts the fresh socket into non-blocking mode. After connect() it does call select() and uses getsockopt() to check, whether connect completed successfully. I did a test compilation on RHEL 6 and RHEL 7 and verified that SO_ERROR is defined, so that code is executed. I can think of the following situations: a) select is documented to behave undefined, if the number of file descriptors goes above FD_SETSIZE, which on Linux is 1024. So it could be that it might return immediately without signalling an error. b) the clock jumping and letting select return much quicker than after 5 seconds with the connection not yet set up c) the connection taking longer than 5 seconds to get established To rule out a), you could try using version 1.2.44 but configure the connection setup timeout to "5" instead of "5000" due to the bug handling the config value in that specific version. Or you use the likely to get released soon version 1.2.46. These versions use poll() on RHEL which does not have the 1024 file descriptor limitations. There's no way around the select limitation using limits. It is a hard implementation limit of select on Linux. Regards, Rainer -- 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: r1842701 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Oct 3 11:03:36 2018 New Revision: 1842701 URL: http://svn.apache.org/viewvc?rev=1842701=rev Log: Line length Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1842701=1842700=1842701=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 3 11:03:36 2018 @@ -84,8 +84,9 @@ Add documentation about the files context.xml.default and -web.xml.default that can be used to customize conf/context.xml -and conf/web.xml on a per host basis. (fschumacher) +web.xml.default that can be used to customize +conf/context.xml and conf/web.xml on a per +host basis. (fschumacher) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62798] Apache failed to initialize connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=62798 --- Comment #3 from Remy Maucherat --- Maybe it's a bug somewhere in your situation, but given the exception is "Caused by: java.net.BindException: Address already in use: bind", it's supposed to be a port already bound and we won't take any further action. You can continue to investigate on the user list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62799] New: mod_jk doesn't handle the EINPROGRESS state appropriately for non-blocking sockets.
https://bz.apache.org/bugzilla/show_bug.cgi?id=62799 Bug ID: 62799 Summary: mod_jk doesn't handle the EINPROGRESS state appropriately for non-blocking sockets. Product: Tomcat Connectors Version: 1.2.42 Hardware: All OS: Linux Status: NEW Severity: major Priority: P2 Component: mod_jk Assignee: dev@tomcat.apache.org Reporter: m...@blackmans.org Target Milestone: --- We can see that when we use non-blocking sockets as result of the event MPM in Apache 2.4, a value of 5 seconds for the connect_socket_timeout results in connection errors due to EINPROGRESS (115) errors like so: [Mon Sep 24 10:58:25.282 2018] [3334428:140116430018304] [info] jk_open_socket::jk_connect.c (817): connect to 10.212.32.20:10153 failed (errno=115) [Mon Sep 24 10:58:25.283 2018] [3334428:140116430018304] [info] ajp_connect_to_endpoint::jk_ajp_common.c (1068): (dw15716_rtc_0) Failed opening socket to (10.212.32.20:10153) (errno=115) [Mon Sep 24 10:58:25.283 2018] [3334428:140116430018304] [error] ajp_send_request::jk_ajp_common.c (1728): (dw15716_rtc_0) connecting to backend failed. Tomcat is probably not started or is listening on the wrong port (errno=115) [Mon Sep 24 10:58:25.283 2018] [3334428:140116430018304] [info] ajp_service::jk_ajp_common.c (2778): (dw15716_rtc_0) sending request to tomcat failed (recoverable), because of error during request sending (attempt=3) EINPROGRESS should not be a failing error state. I assume values other than 5 seconds would have the same outcome. -- 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: r1842725 - in /tomcat/trunk: java/org/apache/jasper/compiler/JspRuntimeContext.java java/org/apache/jasper/compiler/TagFileProcessor.java java/org/apache/jasper/servlet/JspServletWrapper.j
Author: markt
Date: Wed Oct 3 14:03:51 2018
New Revision: 1842725
URL: http://svn.apache.org/viewvc?rev=1842725=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62757
Correct a regression in the fix for bug 62603 that caused NullPointerExceptions
when compiling tag files on first access when development mode was disabled and
background compilation was enabled.
Based on a patch by Jordi Llach.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1842725=1842724=1842725=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Wed Oct
3 14:03:51 2018
@@ -378,8 +378,7 @@ public final class JspRuntimeContext {
for (int i = 0; i < wrappers.length; i++ ) {
JspServletWrapper jsw = (JspServletWrapper)wrappers[i];
JspCompilationContext ctxt = jsw.getJspEngineContext();
-// JspServletWrapper also synchronizes on this when
-// it detects it has to do a reload
+// Sync on JspServletWrapper when calling ctxt.compile()
synchronized(jsw) {
try {
ctxt.compile();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1842725=1842724=1842725=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Wed Oct
3 14:03:51 2018
@@ -543,12 +543,11 @@ class TagFileProcessor {
wrapper = new
JspServletWrapper(ctxt.getServletContext(), ctxt
.getOptions(), tagFilePath, tagInfo, ctxt
.getRuntimeContext(), tagJar);
-rctxt.addWrapper(wrapperUri, wrapper);
-
// Use same classloader and classpath for compiling
tag files
wrapper.getJspEngineContext().setClassLoader(
ctxt.getClassLoader());
wrapper.getJspEngineContext().setClassPath(ctxt.getClassPath());
+rctxt.addWrapper(wrapperUri, wrapper);
} else {
// Make sure that JspCompilationContext gets the
latest TagInfo
// for the tag file. TagInfo instance was created the
last
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1842725=1842724=1842725=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Wed Oct
3 14:03:51 2018
@@ -89,13 +89,20 @@ public class JspServletWrapper {
private long available = 0L;
private final ServletConfig config;
private final Options options;
-private volatile boolean firstTime = true;
-/** Whether the servlet needs reloading on next access */
+/*
+ * The servlet / tag file needs a compilation check on first access. Use a
+ * separate flag (rather then theServlet == null / tagHandlerClass == null
+ * as it avoids the potentially expensive isOutDated() calls in
+ * ctxt.compile() if there are multiple concurrent requests for the servlet
+ * / tag before the class has been loaded.
+ */
+private volatile boolean mustCompile = true;
+/* Whether the servlet/tag file needs reloading on next access */
private volatile boolean reload = true;
private final boolean isTagFile;
private int tripCount;
private JasperException compileException;
-/** Timestamp of last time servlet resource was modified */
+/* Timestamp of last time servlet resource was modified */
private volatile long servletClassLastModifiedTime;
private long lastModificationTest = 0L;
private long lastUsageTime = System.currentTimeMillis();
@@ -158,7 +165,7 @@ public class JspServletWrapper {
}
private boolean getReloadInternal() {
-return firstTime || reload &&
!ctxt.getRuntimeContext().isCompileCheckInProgress();
+return reload &&
svn commit: r1842729 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspRuntimeContext.java java/org/apache/jasper/compiler/TagFileProcessor.java java/org/apache/jasper/servlet/JspServl
Author: markt Date: Wed Oct 3 14:38:14 2018 New Revision: 1842729 URL: http://svn.apache.org/viewvc?rev=1842729=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62757 Correct a regression in the fix for bug 62603 that caused NullPointerExceptions when compiling tag files on first access when development mode was disabled and background compilation was enabled. Based on a patch by Jordi Llach. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 3 14:38:14 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
svn propchange: r1840055 - svn:log
Author: markt Revision: 1840055 Modified property: svn:log Modified: svn:log at Wed Oct 3 19:58:07 2018 -- --- svn:log (original) +++ svn:log Wed Oct 3 19:58:07 2018 @@ -1 +1,2 @@ When generating a redirect to a directory in the Default Servlet, avoid generating a protocol relative redirect. +This is the fix for CVE-2018-11784 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1840056 - svn:log
Author: markt Revision: 1840056 Modified property: svn:log Modified: svn:log at Wed Oct 3 19:58:20 2018 -- --- svn:log (original) +++ svn:log Wed Oct 3 19:58:20 2018 @@ -1 +1,2 @@ When generating a redirect to a directory in the Default Servlet, avoid generating a protocol relative redirect. +This is the fix for CVE-2018-11784 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1840057 - svn:log
Author: markt Revision: 1840057 Modified property: svn:log Modified: svn:log at Wed Oct 3 19:58:31 2018 -- --- svn:log (original) +++ svn:log Wed Oct 3 19:58:31 2018 @@ -1 +1,2 @@ When generating a redirect to a directory in the Default Servlet, avoid generating a protocol relative redirect. +This is the fix for CVE-2018-11784 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62799] mod_jk doesn't handle the EINPROGRESS state appropriately for non-blocking sockets.
https://bz.apache.org/bugzilla/show_bug.cgi?id=62799 --- Comment #2 from m...@blackmans.org --- Yes, it was set to 5000 milliseconds (i.e. 5 seconds). Well, we don't see this behaviour in Apache 2.2 with the prefork MPM and we do see it with Apache 2.4 in the event MPM. However, I can imagine that might not be important. There's a redhat article, https://access.redhat.com/solutions/1229213 which specifically recommends not setting the timeouts due to non-blocking sockets. We are using 1.2.42, so we haven't been hit by that 1.2.44 bug of course. I cannot reproduce the issue outside of a production environment at the moment. If EINPROGRESS is handled, why is it associated with a connection failure? I believe 115 should never be the cause of a connection failure. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1842657 - in /tomcat/trunk/test/org/apache: catalina/startup/TomcatBaseTest.java catalina/webresources/TestAbstractArchiveResource.java catalina/webresources/TestFileResource.java coy
On 02/10/18 22:39, isa...@apache.org wrote:
> Author: isapir
> Date: Tue Oct 2 21:39:57 2018
> New Revision: 1842657
>
> URL: http://svn.apache.org/viewvc?rev=1842657=rev
> Log:
> Fixed test cases that errored due to path case sentsitivity on Windows
This looks to be addressing the symptom rather than the root cause.
URLs should be case sensitive so converting them to lower case before
comparing them may hide future regressions.
I suspect an issue with getAbsolutePath() vs getCanonicalPath() but that
is only a guess as to what the root cause might be.
I'm looking to see if I can recreate the original problem.
Mark
>
> e.g. Testcase: testNestedJarGetURL took 2.628 sec
> FAILED
> expected: but
> was:
> junit.framework.AssertionFailedError:
> expected: but
> was:
> at
> org.apache.catalina.webresources.TestAbstractArchiveResource.testNestedJarGetURL(TestAbstractArchiveResource.java:51)
>
> Modified:
> tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
>
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
> tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
> tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
>
> 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=1842657=1842656=1842657=diff
> ==
> --- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
> (original)
> +++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Oct
> 2 21:39:57 2018
> @@ -88,6 +88,7 @@ public abstract class TomcatBaseTest ext
> protected static final int DEFAULT_CLIENT_TIMEOUT_MS = 300_000;
>
> public static final String TEMP_DIR =
> System.getProperty("java.io.tmpdir");
> +public static final String OS_NAME = System.getProperty("os.name");
>
> /**
> * Make the Tomcat instance available to sub-classes.
> @@ -148,6 +149,13 @@ public abstract class TomcatBaseTest ext
> return accessLogEnabled;
> }
>
> +/*
> + * Sub-classes may need to test differently on Windows, e.g.
> case-insensitive file paths
> + */
> +public boolean isWindows() {
> +return OS_NAME.startsWith("Windows");
> +}
> +
> @Before
> @Override
> public void setUp() throws Exception {
>
> Modified:
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java?rev=1842657=1842656=1842657=diff
> ==
> ---
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
> (original)
> +++
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
> Tue Oct 2 21:39:57 2018
> @@ -48,7 +48,15 @@ public class TestAbstractArchiveResource
>
> expectedURL.append(docBase.getAbsoluteFile().toURI().toURL().toString());
>
> expectedURL.append("*/WEB-INF/lib/test.jar!/META-INF/resources/index.html");
>
> -Assert.assertEquals(expectedURL.toString(),
> webResource.getURL().toString());
> +String expected = expectedURL.toString();
> +String actual = webResource.getURL().toString();
> +
> +if (isWindows()){
> +expected = expected.toLowerCase();
> +actual = actual.toLowerCase();
> +}
> +
> +Assert.assertEquals(expected, actual);
> }
>
>
> @@ -71,7 +79,15 @@ public class TestAbstractArchiveResource
>
> expectedURL.append(docBase.getAbsoluteFile().toURI().toURL().toString());
>
> expectedURL.append("WEB-INF/lib/test-lib.jar!/META-INF/tags/echo.tag");
>
> -Assert.assertEquals(expectedURL.toString(),
> webResource.getURL().toString());
> +String expected = expectedURL.toString();
> +String actual = webResource.getURL().toString();
> +
> +if (isWindows()){
> +expected = expected.toLowerCase();
> +actual = actual.toLowerCase();
> +}
> +
> +Assert.assertEquals(expected, actual);
> }
>
> }
>
> Modified:
> tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java?rev=1842657=1842656=1842657=diff
> ==
> --- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
> (original)
> +++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
> Tue Oct 2 21:39:57 2018
> @@ -40,6 +40,15 @@ public class TestFileResource extends To
>
> // Build
[Bug 62757] JspCompilationContext is unable to compile class for JSP due to a null tagHandlerClass in Generator.TagHandlerInfo
https://bz.apache.org/bugzilla/show_bug.cgi?id=62757 --- Comment #9 from Jordi Llach --- The way you've solved the issue in JspServletWrapper's loadTagFile method by checking whether tagHandlerClass is null (in the second synchronized block) is better than mine. Also, removing firstTime from JspServletWrapper's getReloadInternal method makes a lot of sense I agree that checking "firstTime" and "theServlet / tagHandlerClass" attributes overlaps someway, but firstTime also allows us to to avoid checking whether we have to compile the same resource multiple times in a scenario with multiple concurrent requests, by avoiding the the call to Compiler's isOutDated method on each concurrent request (this could be relevant with complex nested jsp/tag files) Because of that IMHO I would suggest the following changes in JspServletWrapper class - service method : I would check firstTime flag instead of theServlet - loadTagFile method : in the first synchronized block I would use firstTime flag instead of checking whether tagHandlerClass is null Maybe firstTime should be renamed to compile ? The most important thing ... I've tested the patch and it solves the issue -- 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 62798] Apache failed to initialize connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=62798 --- Comment #2 from Gaël REYNOARD --- (In reply to Mark Thomas from comment #1) > Tomcat has not been shutdown fully. Either because enough time has not been > allowed for the shutdown process to complete or because a bug in a web > application is preventing Tomcat from shutting down. > > Please use the users list if you require further assistance. Ok But how is it possible that Tomcat was not completely stopped because I do not just stop the Tomcat service. I always reboot my operating system. And it's during the startup of Windows that I have sometimes this error. -- 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 62798] New: Apache failed to initialize connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=62798 Bug ID: 62798 Summary: Apache failed to initialize connector Product: Tomcat 8 Version: 8.5.31 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: gael.reyno...@lafon.fr Target Milestone: Created attachment 36188 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36188=edit Catalina log Hello, On a test bench, I perform Windows restart tests to test one of our C# applications. Sometimes my Tomcat server can not initialize because the 8080 or 8009 port would already be used. I changed the default port 8080 by and I had the same error after several reboots. I check with the NETSTAT -atonb -p TCP command and I have Tomcat that is listening to port 8080 (or ) and port 8009 In the log the problem occurred on: - 02-Oct-2018 03: 16: 41.364 (port 8080 and 8009) NETSTAT Result: TCP0.0.0.0:80090.0.0.0:0LISTENING2640 [Tomcat8.exe] TCP0.0.0.0:80800.0.0.0:0LISTENING2640 [Tomcat8.exe] - 02-Oct-2018 10: 27: 16.722 (port 8080) NETSTAT Result: TCP0.0.0.0:80090.0.0.0:0LISTENING2828 [Tomcat8.exe] TCP0.0.0.0:80800.0.0.0:0LISTENING2828 [Tomcat8.exe] - 02-Oct-2018 12: 20: 38.289 (port ) NETSTAT Result: TCP0.0.0.0:80090.0.0.0:0LISTENING2780 [Tomcat8.exe] TCP0.0.0.0:0.0.0.0:0LISTENING2780 [Tomcat8.exe] -- 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: SSL Unit Tests Failing
On 02/10/18 20:40, Igal Sapir wrote: > Mark / Chris, > > On 10/2/2018 6:36 AM, Mark Thomas wrote: >> On 02/10/18 06:58, Igal Sapir wrote: >>> When trying to run the unit test cases with `ant clean test` on the >>> current >>> trunk [1] I am getting two (per connector) failures: >>> >>> org.apache.tomcat.util.net.openssl.ciphers.TestCipher FAILED [2] >>> >>> org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser >>> >>> FAILED [3] >>> >>> Server version: Apache Tomcat/9.0.13-dev >>> Server built: Oct 2 2018 05:24:55 UTC >>> Server number: 9.0.13.0 >>> OS Name: Linux >>> OS Version: 4.18.9-200.fc28.x86_64 >>> Architecture: amd64 >>> JVM Version: 1.8.0_181-b13 >>> JVM Vendor: Oracle Corporation >>> >>> Am I missing something? Other than the obvious "missing ciphers", >>> that is. >> These tests are all particularly sensitive to the versions of OpenSSL, >> Java and the implementation of Java used. >> >> Generally, those tests are there to ensure that the code that translates >> between JSSE cipher definitions and OpenSSL definitions is correct. >> >> If you see a failure it may indicate that: >> >> - the test has a bug >> >> - you are running with an older version of OpenSSL that behaves >> differently from the latest version (we try and keep pace with the >> latest) >> >> - OpenSSL has changed behaviour and we need to update our translation >> code to align with it (unusual) >> >> - OpenSSL has changed behaviour and we need to update our tests to align >> with it (most frequent). > > Thank you both for the detailed explanation. I suspected that I should > had added the OpenSSL version to the OP. On that Fedora machine I have > OpenSSL 1.1.0i-fips 14 Aug 2018 > > I tried the same tests on a Windows 10 machine. Below are some > discrepancies/peculiarities that I've noticed (I'd be happy to improve > the test cases if possible): I noticed some errors on Gump overnight so this morning I have build OpenSSL 1.0.2, 1.1.0, 1.1.1 and master locally and tested them against 8.5.x and 9.0.x. I found a couple of bugs: - The ARIA ciphers were not handled correctly so testing against OpenSSL 1.1.0 was always going to fail. This has been fixed. - 8.5.x was missing some code that ensured the OpenSSL libraries as well as the binary was on the path. This meant 8.5.x tests were either going to fail or use a locally installed OpenSSL version. This has also been fixed. > On the Linux box I have OpenSSL installed and on the PATH. On Windows I > used version OpenSSL 1.1.1 11 Sep 2018 and specified it via the > `test.openssl.path` property. I checked the value of > `test.openssl.exists` and it showed the expected `true`. Both Windows > and Fedora generated an output file for > test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java [1]. Both, > however, reported "Found OpenSSL version 0x0" which I find strange? That does seem odd. I suspect either the wrong OpenSSL version or no OpenSSL version was found. > On Windows, only the output [2] for the file mentioned above is in the > output/build/logs, while on Fedora I also have output from the 3 Test > files from test/org/apache/tomcat/util/net/openssl/ciphers/. Does that > mean that these tests were not run on Windows? That seems to be a reasonable conclusion. > I wanted to check the Gump output to compare with my local results. I > found this URL, which I'm not sure if it is the right one or not - > http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk/index.html - as > it says "Project build output found here..." but without any links or > any other information. That is the build. The full output is linked just below that line but you probably want the tests which are run as a separate build for each connector. http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html If you scroll down for any of those pages, you'll find the individual test files for the latest run. > I would like at the very least to add the output of `openssl version` to > the Ant output, perhaps at the `test.openssl.exists` target. If there > are no objections I will add that. +1 Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62798] Apache failed to initialize connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=62798 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED OS||All --- Comment #1 from Mark Thomas --- Tomcat has not been shutdown fully. Either because enough time has not been allowed for the shutdown process to complete or because a bug in a web application is preventing Tomcat from shutting down. Please use the users list if you require further assistance. -- 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: r1842692 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Author: markt Date: Wed Oct 3 09:07:15 2018 New Revision: 1842692 URL: http://svn.apache.org/viewvc?rev=1842692=rev Log: Back-port fix from trunk that is required by Gump so the required OpenSSL libraries are on the path. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 3 09:07:15 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747 404,1747506,1747536,1747924,1747980,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,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1842693 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Author: markt
Date: Wed Oct 3 09:10:43 2018
New Revision: 1842693
URL: http://svn.apache.org/viewvc?rev=1842693=rev
Log:
Whitespace only
Align with 8.5.x
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java?rev=1842693=1842692=1842693=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Wed Oct 3 09:10:43 2018
@@ -34,8 +34,7 @@ public class TestCipher {
*/
@Test
public void testAllOpenSSLCiphersMapped() throws Exception {
-Set openSSLCipherSuites =
-TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL");
+Set openSSLCipherSuites =
TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL");
StringBuilder errors = new StringBuilder();
@@ -77,8 +76,7 @@ public class TestCipher {
// OpenSSL does not include ECDH/ECDHE ciphers in all and there is no
// EC alias. Use aRSA.
// OpenSSL 1.0.0 onwards does not include eNULL in all.
-Set availableCipherSuites =
-TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL:aRSA");
+Set availableCipherSuites =
TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL:aRSA");
Set expectedCipherSuites = new HashSet<>();
for (Cipher cipher : Cipher.values()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump-vm3]: Project tomcat-native-1.2-1.1.1-configure (in module tomcat-native-1.2-1.1.1) failed
On 03/10/18 08:49, Mark Thomas wrote:
> On 03/10/18 00:54, Bill Barker wrote:
>> To whom it may engage...
>>
>> This is an automated request, but not an unsolicited one. For
>> more information please visit http://gump.apache.org/nagged.html,
>> and/or contact the folk at gene...@gump.apache.org.
>>
>> Project tomcat-native-1.2-1.1.1-configure has an issue affecting its
>> community integration.
>
>
>
>> checking for OpenSSL library... using openssl from
>> /srv/gump/public/workspace/openssl-1.1.1/dest-20181003/${exec_prefix}/lib
>> and /srv/gump/public/workspace/openssl-1.1.1/dest-20181003/include
>> checking OpenSSL library version >= 1.0.2...
>>
>> Found OPENSSL_VERSION_NUMBER 0x1000106f (OpenSSL 1.0.1f 6 Jan 2014)
>> Require OPENSSL_VERSION_NUMBER 0x1000200f or greater (1.0.2)
>>
>> configure: error: Your version of OpenSSL is not compatible with this
>> version of tcnative
>
> This is ... odd.
>
> The 1.1.1 branch is selected in the Gump metadata yet it reports as
> 1.0.1. Not sure what is going on here at the moment.
Problem solved. I hadn't declared the dependencies correctly. That meant
OpenSSL 1.1.1 hadn't been built by this point so it picked up 1.0.2 from
the system path.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 33 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.13-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-8.13-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/commons-beanutils/dist/commons-beanutils-20181003.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.9-SNAPSHOT.jar:/srv/gump/pu blic/workspace/apache-commons/logging/target/commons-logging-20181003.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20181003.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-8.13-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 8.13-SNAPSHOT on 3314 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java:22: Wrong order for 'org.junit.Assert' import. [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/webresources/TestFileResource.java:24: Wrong order for 'org.junit.Assert' import. [ImportOrder] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:576: Got 2 errors and 0 warnings. Total time: 33 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20181003060006, vmgump-vm3.apache.org:vmgump:20181003060006 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump-vm3] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1842691 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Author: markt
Date: Wed Oct 3 08:56:54 2018
New Revision: 1842691
URL: http://svn.apache.org/viewvc?rev=1842691=rev
Log:
Fix failing tests when testing against OpenSSL 1.1.0.
The ARIA ciphers were introduced in 1.1.1, not 1.1.0.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?rev=1842691=1842690=1842691=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Wed Oct 3 08:56:54 2018
@@ -213,22 +213,6 @@ public class TesterOpenSSL {
unimplemented.add(Cipher.TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256);
unimplemented.add(Cipher.TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256);
unimplemented.add(Cipher.TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256);
-unimplemented.add(Cipher.TLS_RSA_WITH_ARIA_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_RSA_WITH_ARIA_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_PSK_WITH_ARIA_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_PSK_WITH_ARIA_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384);
-unimplemented.add(Cipher.TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256);
-unimplemented.add(Cipher.TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384);
} else {
// These were removed in 1.1.0 so won't be available from that
// version onwards.
@@ -302,6 +286,27 @@ public class TesterOpenSSL {
unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA);
}
+if (VERSION < 10101) {
+// These were implemented in 1.1.1 so won't be available in any
+// earlier version
+unimplemented.add(Cipher.TLS_RSA_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_RSA_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_PSK_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_PSK_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384);
+}
+
OPENSSL_UNIMPLEMENTED_CIPHERS =
Collections.unmodifiableSet(unimplemented);
Map renamed = new HashMap<>();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1842694 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Author: markt Date: Wed Oct 3 09:12:15 2018 New Revision: 1842694 URL: http://svn.apache.org/viewvc?rev=1842694=rev Log: Fix failing tests when testing against OpenSSL 1.1.0. The ARIA ciphers were introduced in 1.1.1, not 1.1.0. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 3 09:12:15 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747 404,1747506,1747536,1747924,1747980,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,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
