svn commit: r1782934 - in /tomcat/trunk: java/org/apache/catalina/authenticator/AuthenticatorBase.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 09:23:57 2017
New Revision: 1782934

URL: http://svn.apache.org/viewvc?rev=1782934&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60694
Prevent NPE during authentication when no JASPIC AuthConfigFactory is available.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1782934&r1=1782933&r2=1782934&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
Tue Feb 14 09:23:57 2017
@@ -1194,14 +1194,21 @@ public abstract class AuthenticatorBase
 return provider.orElse(null);
 }
 
+
 private Optional findJaspicProvider() {
 AuthConfigFactory factory = AuthConfigFactory.getFactory();
-Optional provider =
-Optional.ofNullable(factory.getConfigProvider("HttpServlet", 
jaspicAppContextID, this));
+Optional provider;
+if (factory == null) {
+provider = Optional.empty();
+} else {
+provider = Optional.ofNullable(
+factory.getConfigProvider("HttpServlet", 
jaspicAppContextID, this));
+}
 jaspicProvider = provider;
 return provider;
 }
 
+
 @Override
 public void notify(String layer, String appContext) {
 findJaspicProvider();

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1782934&r1=1782933&r2=1782934&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb 14 09:23:57 2017
@@ -80,6 +80,10 @@
 code. (markt)
   
   
+60694: Prevent NPE during authentication when no JASPIC
+AuthConfigFactory is available. (markt)
+  
+  
 60720: Replace "WWW-Authenticate" literal with static final
 AUTH_HEADER_NAME in SpnegoAuthenticator. Patch provided by Michael
 Osipov. (violetagg)



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

svn commit: r1782936 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/AuthenticatorBase.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 09:28:36 2017
New Revision: 1782936

URL: http://svn.apache.org/viewvc?rev=1782936&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60694
Prevent NPE during authentication when no JASPIC AuthConfigFactory is available.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 09:28:36 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,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-1756289,1756408-1756410,1
 
756778,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-1762053,1762123,1762168,176217
 
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1

[Bug 60694] Potential NullPointerException in AuthenticatorBase.getJaspicProvider()

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks for the report.

Fixed in:
- trunk for 9.0.0.M18 onwards
- 8.5.x for 8.5.12 onwards

Earlier versions are not affected (no JASPIC support)

-- 
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 60697] TRACE method incorrectly advertised as a supported HTTP method for custom servlet

[bugzilla]

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

--- Comment #1 from Mark Thomas  ---
This has been looked at before which is why the DefaultServlet handles this
correctly. Requests for "OPTIONS *" are also handled correctly.

It is difficult to do this for custom servlets since the code that handles the
OPTIONS request is in javax.servlet.http.HttpServlet. This is a specification
class so we can't change the API and neither can it depend on any Tomcat
specific classes.

That leaves us with two options. Use reflection in HttpServlet or filter  TRACE
from the Allow header when it is disabled.

I don't really like either option. Using reflection in HttpServlet is a fairly
ugly hack and filtering the headers is going to add overhead to every request.
Of the two, reflection is the least bad option.

A third option is never including TRACE in Allow headers generated by
HttpServlet. The problem with that is that it may well break applications that
depend on it and it would result in a non-specification compliant response when
TRACE was allowed.

I have a test case for this that I'll commit shortly. That test case identified
a scenario when the WebDAV servlet included TRACE in the response when it was
disabled. That is an easy fix.

I'll take a look at what the reflection code looks like for HttpServlet. If it
isn't too ugly I'll go that route.

A completely different option is to always include TRACE in the OPTIONS
response but respond with a 403 rather than a 405 which is, arguably, more
specification compliant behaviour - although the security scanners might not
like 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

svn commit: r1782946 - in /tomcat/trunk: java/org/apache/catalina/servlets/WebdavServlet.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 11:00:18 2017
New Revision: 1782946

URL: http://svn.apache.org/viewvc?rev=1782946&view=rev
Log:
Correct OPTIONS response for WebDAV so TRACE is not included when it is disabled

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1782946&r1=1782945&r2=1782946&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Tue Feb 
14 11:00:18 2017
@@ -40,6 +40,7 @@ import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.catalina.WebResource;
+import org.apache.catalina.connector.RequestFacade;
 import org.apache.catalina.util.ConcurrentDateFormat;
 import org.apache.catalina.util.DOMWriter;
 import org.apache.catalina.util.XMLWriter;
@@ -2303,7 +2304,12 @@ public class WebdavServlet
 return methodsAllowed;
 }
 
-methodsAllowed.append("OPTIONS, GET, HEAD, POST, DELETE, TRACE");
+methodsAllowed.append("OPTIONS, GET, HEAD, POST, DELETE");
+// Trace - assume disabled unless we can prove otherwise
+if (req instanceof RequestFacade &&
+((RequestFacade) req).getAllowTrace()) {
+methodsAllowed.append(", TRACE");
+}
 methodsAllowed.append(", PROPPATCH, COPY, MOVE, LOCK, UNLOCK");
 
 if (listings) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1782946&r1=1782945&r2=1782946&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb 14 11:00:18 2017
@@ -97,6 +97,11 @@
 Improve the performance of AuthenticatorBase when there is
 no JASPIC configuration available. (violetagg)
   
+  
+When HTTP TRACE requests are disabled on the Connector, ensure that the
+HTTP OPTIONS response from custom the WebDAV servlet does not include
+TRACE in the returned Allow header. (markt)
+  
 
   
   



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

svn commit: r1782947 - in /tomcat/trunk: java/javax/servlet/http/HttpServlet.java test/org/apache/catalina/connector/TestConnector.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 11:01:35 2017
New Revision: 1782947

URL: http://svn.apache.org/viewvc?rev=1782947&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60697
Correct OPTIONS response for custom servlets so TRACE is not included when it 
is disabled

Modified:
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1782947&r1=1782946&r2=1782947&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Tue Feb 14 11:01:35 
2017
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
 import java.util.Enumeration;
@@ -489,6 +490,18 @@ public abstract class HttpServlet extend
 boolean ALLOW_TRACE = true;
 boolean ALLOW_OPTIONS = true;
 
+// Tomcat specific hack to see if TRACE is allowed
+Class clazz = null;
+try {
+clazz = 
Class.forName("org.apache.catalina.connector.RequestFacade");
+Method getAllowTrace = clazz.getMethod("getAllowTrace", 
(Class[]) null);
+ALLOW_TRACE = ((Boolean) getAllowTrace.invoke(req, (Object[]) 
null)).booleanValue();
+} catch (ClassNotFoundException | NoSuchMethodException | 
SecurityException |
+IllegalAccessException | IllegalArgumentException | 
InvocationTargetException e) {
+// Ignore. Not running on Tomcat. TRACE is always allowed.
+}
+// End of Tomcat specific hack
+
 for (int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java?rev=1782947&r1=1782946&r2=1782947&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java Tue Feb 
14 11:01:35 2017
@@ -16,16 +16,25 @@
  */
 package org.apache.catalina.connector;
 
+import java.io.File;
 import java.net.SocketTimeoutException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.Servlet;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Wrapper;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.servlets.WebdavServlet;
 import org.apache.catalina.startup.TesterServlet;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -139,4 +148,76 @@ public class TestConnector extends Tomca
 
 c2.start();
 }
+
+
+@Test
+public void testTraceAllowedDefault() throws Exception {
+doTestTrace(new DefaultServlet(), true);
+}
+
+
+@Test
+public void testTraceNotAllowedDefault() throws Exception {
+doTestTrace(new DefaultServlet(), false);
+}
+
+
+@Test
+public void testTraceAllowedWebDav() throws Exception {
+doTestTrace(new WebdavServlet(), true);
+}
+
+
+@Test
+public void testTraceNotAllowedWebDav() throws Exception {
+doTestTrace(new WebdavServlet(), false);
+}
+
+
+@Test
+public void testTraceAllowedCustom() throws Exception {
+doTestTrace(new TesterServlet(), true);
+}
+
+
+@Test
+public void testTraceNotAllowedCustom() throws Exception {
+doTestTrace(new TesterServlet(), false);
+}
+
+
+private void doTestTrace(Servlet servlet, boolean allowTrace) throws 
Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp");
+Context root = tomcat.addContext("", appDir.getAbsolutePath());
+Tomcat.addServlet(root, "default", servlet);
+root.addServletMappingDecoded("/", "default");
+
+Connector connector = tomcat.getConnector();
+connector.setAllowTrace(allowTrace);
+
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+Map> respHeaders = new HashMap<>();
+int rc = methodUrl("http://localhost:"; + getPort() + "/index.html",
+bc, 3, null, respHeaders, "OPTIONS");
+
+assertEquals(200, rc);
+
+boolean foundTrace = false;
+for (String header : respHeaders.get("Allow")) {
+if (header.contains("TRAC

svn commit: r1782948 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/servlets/WebdavServlet.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 11:03:19 2017
New Revision: 1782948

URL: http://svn.apache.org/viewvc?rev=1782948&view=rev
Log:
Correct OPTIONS response for WebDAV so TRACE is not included when it is disabled

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 11:03:19 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,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-1756289,1756408-1756410,1
 
756778,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-1762053,1762123,1762168,176217
 
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763

svn commit: r1782949 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/WebdavServlet.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 11:04:00 2017
New Revision: 1782949

URL: http://svn.apache.org/viewvc?rev=1782949&view=rev
Log:
Correct OPTIONS response for WebDAV so TRACE is not included when it is disabled

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 11:04:00 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,

svn commit: r1782950 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/servlets/WebdavServlet.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 11:05:47 2017
New Revision: 1782950

URL: http://svn.apache.org/viewvc?rev=1782950&view=rev
Log:
Correct OPTIONS response for WebDAV so TRACE is not included when it is disabled

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 11:05:47 2017
@@ -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,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,1702739,1702
 
742,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,1725974,1
 
726171-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,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330
-/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,1754312,1754614,1754726,1754806,1754878,1754889,1754894,1754900,1754945,1754954,1754958,1755891,175

svn commit: r1782951 - in /tomcat/tc8.5.x/trunk: ./ java/javax/servlet/http/HttpServlet.java test/org/apache/catalina/connector/TestConnector.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 11:07:17 2017
New Revision: 1782951

URL: http://svn.apache.org/viewvc?rev=1782951&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60697
Correct OPTIONS response for custom servlets so TRACE is not included when it 
is disabled

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 11:07:17 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,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-1756289,1756408-1756410,1
 
756778,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-1762053,1762123,1762168,176217
 
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332

[Bug 60697] TRACE method incorrectly advertised as a supported HTTP method for custom servlet

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
The hack wasn't too bad although I still don't really like having to do it.

I've fixed WebDAV in:
- trunk for 9.0.0.M18 onwards
- 8.5.x for 8.5.12 onwards
- 8.0.x for 8.0.42 onwards
- 7.0.x for 7.0.76 onwards

I've fixed custom servlets in:
- trunk for 9.0.0.M18 onwards
- 8.5.x for 8.5.12 onwards

I don't intend back-porting this to 8.0.x and 7.0.x.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60578] Server CPU maxed out (100% per core) randomly after a few hours

[bugzilla]

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

--- Comment #4 from Mark Thomas  ---
Note the root cause of this in Debian, Ubuntu etc. was back-porting the
security fix for CVE-2016-6816 without back-porting the 57544 fix. This made it
trivial to trigger the loop described in bug 57544.

Without the back-port of the CVE-2016-6816 the loop described in bug 57544 was
significantly harder to trigger. The root cause of 57544 has not been
identified. It may have been user triggered but it may also have been triggered
by an application bug.

-- 
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 60702] JSP debugging is isn't working after upgrade from 8.0.29 to 8.0.39

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #2 from Mark Thomas  ---
This works for me as well with a clean 8.0.x build.

All the indications are that this is a configuration problem. The users list is
the place to seek further help.

-- 
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 60632] Last logs lost when running Tomcat with systemd and journald

[bugzilla]

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

--- Comment #5 from Konstantin Kolinko  ---
Re: r1782805

+if [ -n "${CATALINA_EXIT_DELAY:-}" ]; then
+trap 'sleep ${CATALINA_EXIT_DELAY}' INT EXIT TERM
+fi

1. I suspect that "trap" won't see the value of CATALINA_EXIT_DELAY variable.

I think that you either need double quotes there (so that variable expansion
occurs), or add a line to export the variable, e.g.

export CATALINA_EXIT_DELAY


2. I think that whatever sets the CATALINA_EXIT_DELAY variable, can also
execute a "trap" command.

E.g. you can do it in bin/setenv.sh

In the systemd example, I suspect that you can write several commands
(connected with '&&') in the ExecStart line.

The original issue concerns all programs, started with systemd, so you have to
patch all other services that you are starting, not only Tomcat?

Why a Tomcat-specific patch?


Overall, an interesting feature, but
- if someone configures a significant delay, it will cause concerns
- it is a bit of a hack

3.
+#   CATALINA_EXIT_DELAY
+#   (Optional) If started with systemd, add
+#   'Environment=CATALINA_EXIT_DELAY=0.1' to your service file
+#   to prevent systemd losing the last few log messages.
+#   See https://github.com/systemd/systemd/issues/1347

1) POSIX says that sleep expects an integer number.

http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sleep.html

GNU implementation of sleep (in Linux) allows a floating point number and
allows suffixes (s m h d).

2) Maybe reference this bug as well.
At least it this bug has an example of how Tomcat can be run with systemd.

-- 
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 60716] SSL certificate CRLDP section is ignored, when NIO connection is used

[bugzilla]

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

--- Comment #3 from Mark Thomas  ---
Another example of why configuration via system property is just wrong. Sigh.

The call to setRevocationEnabled(false) is necessary when no revocation is
configured since the default is true. Without it, all certs fail validation.

I think the simplest solution is a new JSSE property on SSLHostConfig -
revocationEnabled. It will be ignored / assumed to be true if
certificateRevocationListFile is set. Default will be false (current
behaviour). If you need to configure revocation via proprietary methods for
your JSSE provider then you can do so and set the new attribute to true.

I should have a patch for this shortly.

-- 
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: r1782954 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb 14 12:38:48 2017
New Revision: 1782954

URL: http://svn.apache.org/viewvc?rev=1782954&view=rev
Log:
Correct Apache id

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=1782954&r1=1782953&r2=1782954&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb 14 12:38:48 2017
@@ -72,7 +72,7 @@
   
   
 60683: Security manager failure causing NPEs when doing IO
-on some JVMs. (coty)
+on some JVMs. (csutherl)
   
   
 60688: Update the internal fork of Apache Commons BCEL to



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

svn commit: r1782956 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SSLHostConfig.java java/org/apache/tomcat/util/net/jsse/JSSEUtil.java webapps/docs/changelog.xml webapps/docs/config/http.xml

[markt]

Author: markt
Date: Tue Feb 14 12:50:05 2017
New Revision: 1782956

URL: http://svn.apache.org/viewvc?rev=1782956&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60716
Add a new JSSE specific attribute, revocationEnabled, to SSLHostConfig to 
permit JSSE provider revocation checks to be enabled when no 
certificateRevocationListFile has been configured. The expectation is that 
configuration will be performed via a JSSE provider specific mechanisms.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1782956&r1=1782955&r2=1782956&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue Feb 14 
12:50:05 2017
@@ -93,6 +93,7 @@ public class SSLHostConfig implements Se
 private Set protocols = new HashSet<>();
 // JSSE
 private String keyManagerAlgorithm = 
KeyManagerFactory.getDefaultAlgorithm();
+private boolean revocationEnabled = false;
 private int sessionCacheSize = 0;
 private int sessionTimeout = 86400;
 private String sslProtocol = Constants.SSL_PROTO_TLS;
@@ -475,6 +476,17 @@ public class SSLHostConfig implements Se
 }
 
 
+public void setRevocationEnabled(boolean revocationEnabled) {
+setProperty("revocationEnabled", Type.JSSE);
+this.revocationEnabled = revocationEnabled;
+}
+
+
+public boolean getRevocationEnabled() {
+return revocationEnabled;
+}
+
+
 public void setSessionCacheSize(int sessionCacheSize) {
 setProperty("sessionCacheSize", Type.JSSE);
 this.sessionCacheSize = sessionCacheSize;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1782956&r1=1782955&r2=1782956&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Tue Feb 14 
12:50:05 2017
@@ -258,10 +258,11 @@ public class JSSEUtil extends SSLUtilBas
 checkTrustStoreEntries(trustStore);
 String algorithm = sslHostConfig.getTruststoreAlgorithm();
 String crlf = sslHostConfig.getCertificateRevocationListFile();
+boolean revocationEnabled = sslHostConfig.getRevocationEnabled();
 
 if ("PKIX".equalsIgnoreCase(algorithm)) {
 TrustManagerFactory tmf = 
TrustManagerFactory.getInstance(algorithm);
-CertPathParameters params = getParameters(crlf, trustStore);
+CertPathParameters params = getParameters(crlf, trustStore, 
revocationEnabled);
 ManagerFactoryParameters mfp = new 
CertPathTrustManagerParameters(params);
 tmf.init(mfp);
 tms = tmf.getTrustManagers();
@@ -324,10 +325,15 @@ public class JSSEUtil extends SSLUtilBas
  *
  * @param crlf The path to the CRL file.
  * @param trustStore The configured TrustStore.
+ * @param revocationEnabled Should the JSSE provider perform revocation
+ *  checks? Ignored if {@code crlf} is non-null.
+ *  Configuration of revocation checks are expected
+ *  to be via proprietary JSSE provider methods.
  * @return The parameters including the CRLs and TrustStore.
  * @throws Exception An error occurred
  */
-protected CertPathParameters getParameters(String crlf, KeyStore 
trustStore) throws Exception {
+protected CertPathParameters getParameters(String crlf, KeyStore 
trustStore,
+boolean revocationEnabled) throws Exception {
 
 PKIXBuilderParameters xparams =
 new PKIXBuilderParameters(trustStore, new X509CertSelector());
@@ -338,7 +344,7 @@ public class JSSEUtil extends SSLUtilBas
 xparams.addCertStore(store);
 xparams.setRevocationEnabled(true);
 } else {
-xparams.setRevocationEnabled(false);
+xparams.setRevocationEnabled(revocationEnabled);
 }
 
xparams.setMaxPathLength(sslHostConfig.getCertificateVerificationDepth());
 return xparams;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1782956&r1=1782955&r2=1782956&view=diff

svn commit: r1782957 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/SSLHostConfig.java java/org/apache/tomcat/util/net/jsse/JSSEUtil.java webapps/docs/changelog.xml webapps/docs/config

[markt]

Author: markt
Date: Tue Feb 14 12:51:36 2017
New Revision: 1782957

URL: http://svn.apache.org/viewvc?rev=1782957&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60716
Add a new JSSE specific attribute, revocationEnabled, to SSLHostConfig to 
permit JSSE provider revocation checks to be enabled when no 
certificateRevocationListFile has been configured. The expectation is that 
configuration will be performed via a JSSE provider specific mechanisms.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 12:51:36 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,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-1756289,1756408-1756410,1
 
756778,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-1762053,1762123,1762168,176217
 
2,1762182,176220

[Bug 60716] SSL certificate CRLDP section is ignored, when NIO connection is used

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #4 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.0.M18 onwards
- 8.5.x for 8.5.12 onwards

-- 
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 60716] SSL certificate CRLDP section is ignored, when NIO connection is used

[bugzilla]

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

--- Comment #5 from Kirill  ---
(In reply to Mark Thomas from comment #3)
> Another example of why configuration via system property is just wrong. Sigh.
> 
> The call to setRevocationEnabled(false) is necessary when no revocation is
> configured since the default is true. Without it, all certs fail validation.
> 
> I think the simplest solution is a new JSSE property on SSLHostConfig -
> revocationEnabled. It will be ignored / assumed to be true if
> certificateRevocationListFile is set. Default will be false (current
> behaviour). If you need to configure revocation via proprietary methods for
> your JSSE provider then you can do so and set the new attribute to true.
> 
> I should have a patch for this shortly.

Agree with you. Thank you.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



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

[Bug 60718] requestDestroyed not called for asynchronous after I/O error

[bugzilla]

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

--- Comment #4 from Remy Maucherat  ---
I think it's not going to "work" unless AsyncContextImpl.fireOnComplete calls
context.fireRequestDestroyEvent(request). Or something like that.

The Tomcat code is based on the thinking that the request remains "in scope"
while the async is started (so even when the Servlet's service method is no
longer executed), which is what the spec seems to say (section 3.12).

Although it seems to contradict section 3.12 of the spec, it could be
interpreted wrong in Tomcat and requestInitialized and requestDestroyed should
simply be called around the Servlet's service method call. Right now, the code
is very careful to not call requestDestroyed if async is started, and then it's
obvious there are cases where it's not going to be called. And doing it like
that is a duplicate for what AsyncListener does so that's rather weird, but
maybe it's better for some frameworks (?). I would remove !request.isAsync() in
StandardHostValve, and drop fireRequestDestroyEvent from async dispatch.

So there is likely two possibilities, but Tomcat currently does neither.

-- 
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 60716] SSL certificate CRLDP section is ignored, when NIO connection is used

[bugzilla]

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

--- Comment #6 from Christopher Schultz  ---
(In reply to Mark Thomas from comment #3)
> I think the simplest solution is a new JSSE property on SSLHostConfig -
> revocationEnabled.

That's a confusing configuration attribute: it implies that revocation is
actually happening instead of just being consulted. Can we get a better name
for that?

-- 
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 60718] requestDestroyed not called for asynchronous after I/O error

[bugzilla]

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

--- Comment #5 from Brett Kail  ---
Tomcat doesn't appear to call AsyncListener for these scenarios either.

FWIW, I agree with the "in scope" interpretation.  I was expecting
requestDestroyed to be called only after the request is no longer "in scope",
not just after service returns for async.

-- 
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: Read events suspend/resume logic in websocket impl to achieve backpressure

[Violeta Georgieva]

Hi,

2017-02-10 11:07 GMT+02:00 Mark Thomas :
>
> On 09/02/17 22:08, Violeta Georgieva wrote:
>>
>> 2017-02-08 11:25 GMT+02:00 Violeta Georgieva :
>>>
>>> 2017-02-08 1:51 GMT+02:00 Mark Thomas :
>
>
> 
>
 I guess that makes me reluctantly in favour of it in principle but I'd
>>
>> very much prefer to review a patch proposal minus the reformatting.


>>>
>>> There is a new patch
>>> - no formatting noise
>>> - Martin's comments included
>>
>>
>> There is a new patch:
>> - With a fix for the Martin's comment (StringManager)
>> - I switched from AtomicBoolean to AtomicIntegerFieldUpdater in order to
>> minimize the memory usage
>
>
> Thanks. Much easier to read.
>
> Having reviewed the patch, I'm concerned about thread-safety on resume.
I'll use NIO terminology but I believe the same issues apply to all three
connectors.
>
> Consider the case where the client is sending data as fast as it can.
>
> On suspension, the socket will be added to the poller. More data will
arrive, the socket will be processed, no data will be read (because
processing is suspended) and the socket will be added to the poller again.
I'm fairly sure (but haven't confirmed with a test) that when more data
arrives the poller will trigger socket processing again. This loop will
continue until the network buffers are full. (Even if I am wrong on the
poller firing again immediately, there is still a problem.)
>
> On resume, the backlog of data needs to be processed. As currently
implemented, this backlog will be processed on the thread that calls
resume(). That may be undesirable for several reasons:
> - it might not be a container thread;
> - processing the backlog may take time impacting on other work the
>   thread expects to do
> - when the poller triggers socket processing again there could be
>   two threads processing the same socket (very bad)
>
> Therefore, I think resume needs to call
socketWrapper.processSocket(SocketEvent.OPEN_READ, true)
>
> That will solve the concurrent threads processing the same socket problem
but it could cause another problem. When that container thread completes,
it will add the socket to the poller again. The problem is that the socket
will already have been added to the poller. Adding a socket to the poller
more than once has caused problems in the past.
>
> That brings me to the conclusion that a different approach is needed. I
think we need a new SocketState value SUSPEND. Currently returning UPGRADED
from upgradeDispatch() registers the socket for read. SUSPEND would
essentially be a NO-OP. When resume() is called, it would trigger a call to
socketWrapper.processSocket(SocketEvent.OPEN_READ, true) during which when
upgradeDispatch() completes it would return UPGRADE, adding the socket to
the poller and allowing processing to continue.
>

A new patch is available based on the provided comments.
Can you please review it.

> This approach would mean some internal API changes but that is fine for
9.0.x and I don't see a problem with 8.5.x either. Whether this is
back-ported to 8.0.x and 7.0.x is TBD. It also opens up the possibility of
being able to suspend/resume other protocols but I haven't thought a great
deal about how that might work.

I need this functionality only for 9.0.x and 8.5.x.

Thanks,
Violeta

>
> Because I started thinking about thread-safety on resume, I haven't dug
into the patch in detail.
>
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

[Bug 60702] JSP debugging is isn't working after upgrade from 8.0.29 to 8.0.39

[bugzilla]

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

--- Comment #3 from M. Manna  ---
 (In reply to Mark Thomas from comment #2)
> This works for me as well with a clean 8.0.x build.
> 
> All the indications are that this is a configuration problem. The users list
> is the place to seek further help.

I have specifically mentioned 8.0.39. Using 8.0.x as your example isn't valid.
Try and check with 8.0.39 because I know that it stopped working immediately
after I switched from 8.0.29. I have made no configuration changes which will
trigger this and I have 100 developers working for me, who all have the same
problems. I am sure this is not a user configuration. 

Additionally, if you read Violeta's comment, she confirmed that 8.0.41 doesn't
have any issue. My point is that the developers should not need to change any
configuration as such when upgrading just to make normal things such as
debugging work. If this needs to be done, then this hasn't been communicated in
any user guide or 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 60702] JSP debugging is isn't working after upgrade from 8.0.29 to 8.0.39

[bugzilla]

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

--- Comment #4 from mgrigorov  ---
Hi,

8.0.39 is released and if it has this problem then it cannot be fixed in
8.0.39!
It can be fixed in the next release!
But Violeta already said that there is no such issue in 8.0.41 so there is
nothing to be done by Tomcat developers! You (and your team) should upgrade to
8.0.41 (or 8.5.11).

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 3 runs.
The current state of this project is 'Failed', with reason 'Build Timed Out'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build timed out
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



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

[Bug 60632] Last logs lost when running Tomcat with systemd and journald

[bugzilla]

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

Jeff Turner  changed:

   What|Removed |Added

 Resolution|FIXED   |---
 Status|RESOLVED|REOPENED

--- Comment #6 from Jeff Turner  ---
Konstantin, thanks for reviewing. You caused me to test and think it over some
more. This patch is indeed useless, and should be removed (sorry Mark!).

The reasons are:

- This patch doesn't help for logs generated by Java/Tomcat/webapps (I thought
it would, but never actually tested). That's because 'catalina.sh run' calls
'exec', which replaces the entire bash process, and so the trap is never
called. Besides which, it seems that the worry of systemd losing Java output is
theoretical, at least on my system. In practice JVM shutdown is sufficiently
slow that all output, even from shutdown hooks, is actually caught by systemd
[1].

- Making the delay opt-in means most systemd users won't benefit from it
automatically. If something must be explicitly done, why not, as Konstantin
points out, apply the workaround directly in the systemd service file:

ExecStart=/bin/sh -c '/tmp/apache-tomcat-8.5.11/bin/catalina.sh run; sleep 0.1'


Regards,
Jeff


[1] To verify that the last Java stdout is actually caught by systemd:

cd /tmp
cat > PrintExit.java < /etc/systemd/system/printexit.service < Re: r1782805
>

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