svn commit: r1757485 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 24 10:24:04 2016
New Revision: 1757485

URL: http://svn.apache.org/viewvc?rev=1757485&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60030
Correct a potential infinite loop in the SNI parsing code triggered by failing 
to handle an end of stream condition.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1757485&r1=1757484&r2=1757485&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Wed Aug 
24 10:24:04 2016
@@ -257,7 +257,12 @@ public class SecureNioChannel extends Ni
  */
 private int processSNI() throws IOException {
 // Read some data into the network input buffer so we can peek at it.
-sc.read(netInBuffer);
+int bytesRead = sc.read(netInBuffer);
+if (bytesRead == -1) {
+// Reached end of stream before SNI could be processed. Treat this
+// as if no SNI was present.
+return 0;
+}
 TLSClientHelloExtractor extractor = new 
TLSClientHelloExtractor(netInBuffer);
 
 while (extractor.getResult() == ExtractorResult.UNDERFLOW &&

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1757485&r1=1757484&r2=1757485&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 24 10:24:04 2016
@@ -204,6 +204,10 @@
 Ensure that Semaphore.release is called in all cases. Even
 when there is an exception. (violetagg)
   
+  
+60030: Correct a potential infinite loop in the SNI parsing
+code triggered by failing to handle an end of stream condition. (markt)
+  
 
   
   



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

svn commit: r1757487 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 24 10:26:08 2016
New Revision: 1757487

URL: http://svn.apache.org/viewvc?rev=1757487&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60030
Correct a potential infinite loop in the SNI parsing code triggered by failing 
to handle an end of stream condition.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 10:26:08 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,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
+/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,174210

[Bug 60030] Run away CPU with JSSE / OpenSSL with IE8

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
This has been fixed in the following branches:
- 9.0.x for 9.0.0.M10 onwards
- 8.5.x for 8.5.5 onwards

8.0.x and earlier are not affected as they do not support SNI.

-- 
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 60013] Non-ASCII characters in querystring get mangled after URL Rewrite using RewriteValve

[bugzilla]

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

--- Comment #3 from santhanapreeth...@gmail.com ---
I configured UTF-8 everywhere as mentioned in
https://wiki.apache.org/tomcat/FAQ/CharacterEncoding#Q1 

1. I set URIEncoding="UTF-8" and useBodyEncodingForURI="true" for the
connectors in server.xml 
2. configured org.apache.catalina.filters.SetCharacterEncodingFilter at the top
in web.xml 
3. Explicitly set strict servlet compliance to false using setenv.sh 
4. Ensured that no other valves like Request Dumper Valve in
http://www.mail-archive.com/users@tomcat.apache.org/msg21117.html was
configured.

Still the rewritten querystring was getting mangled. 
Also when there is a redirect like 

RewriteRule ^/abc/(.*)$ /xyz/$1 [R]

In access log
"GET /xyz/.xml HTTP/1.1"

the non-ASCII characters in the request URI is also getting mangled like this

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 60013] Non-ASCII characters in querystring get mangled after URL Rewrite using RewriteValve

[bugzilla]

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

--- Comment #4 from santhanapreeth...@gmail.com ---
I tested by encoding the querystring in the RewriteValve

if (queryString != null) 
{  
 request.getCoyoteRequest().queryString().setString(null);
 chunk = request.getCoyoteRequest().queryString().getCharChunk();
 chunk.recycle();
 //chunk.append(queryString);

 chunk.append(URLEncoder.DEFAULT.encode(queryString));
 request.getCoyoteRequest().queryString().toChars();
}

-- 
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 60013] Non-ASCII characters in querystring get mangled after URL Rewrite using RewriteValve

[bugzilla]

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

--- Comment #5 from santhanapreeth...@gmail.com ---
I tested by encoding the querystring in the RewriteValve

if (queryString != null) 
{  
 request.getCoyoteRequest().queryString().setString(null);
 chunk = request.getCoyoteRequest().queryString().getCharChunk();
 chunk.recycle();
 //chunk.append(queryString);
 // encode queryString 
 chunk.append(URLEncoder.DEFAULT.encode(queryString));
 request.getCoyoteRequest().queryString().toChars();
}

I found that = and & in the querystring also was getting encoded 
I had to decode the encoded = and & to get it to work as expected.

 String encQueryString = URLEncoder.DEFAULT.encode(queryString);
 encQueryString = encQueryString.replaceAll("%3D","=");
 encQueryString = encQueryString.replaceAll("%26","&");
 chunk.append(encQueryString);

After making these changes the URL rewriting was working fine 

Access log 

/xyz.do?param=%E5%9C%A8%E7%BA%BF%E6%B5%8B%E8%AF%95

I wrote a test jsp and request.getParameter was working fine and retrieved the
non-ASCII data with both GET and POST methods 

Because the rewritten and done flags are set in case of redirect, the issue
still remain when there is a redirect.

-- 
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: r1757495 - in /tomcat/trunk: java/org/apache/el/parser/ test/org/apache/el/ test/webapp/WEB-INF/ test/webapp/bug6nnnn/ webapps/docs/

[markt]

Author: markt
Date: Wed Aug 24 11:27:29 2016
New Revision: 1757495

URL: http://svn.apache.org/viewvc?rev=1757495&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60032
Fix handling of method calls that use varargs within EL value expressions.

Added:
tomcat/trunk/test/webapp/bug6/
tomcat/trunk/test/webapp/bug6/bug60032.jsp   (with props)
Modified:
tomcat/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/el/TesterFunctions.java
tomcat/trunk/test/webapp/WEB-INF/test.tld
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/el/parser/AstFunction.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstFunction.java?rev=1757495&r1=1757494&r2=1757495&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstFunction.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFunction.java Wed Aug 24 11:27:29 
2016
@@ -178,6 +178,8 @@ public final class AstFunction extends S
 varargs[j-i] = 
parameters.jjtGetChild(j).getValue(ctx);
 varargs[j-i] = coerceToType(ctx, varargs[j-i], 
target);
 }
+params[i] = varargs;
+params[i] = coerceToType(ctx, params[i], 
paramTypes[i]);
 }
 } else {
 params[i] = parameters.jjtGetChild(i).getValue(ctx);

Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1757495&r1=1757494&r2=1757495&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Wed Aug 24 11:27:29 2016
@@ -489,6 +489,16 @@ public class TestELInJsp extends TomcatB
 }
 
 
+@Test
+public void testBug60032() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() + 
"/test/bug6/bug60032.jsp");
+String result = res.toString();
+assertEcho(result, "{OK}");
+}
+
+
 // Assertion for text contained with , e.g. printed by tags:echo
 private static void assertEcho(String result, String expected) {
 Assert.assertTrue(result, result.indexOf("" + expected + "") > 
0);

Modified: tomcat/trunk/test/org/apache/el/TesterFunctions.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterFunctions.java?rev=1757495&r1=1757494&r2=1757495&view=diff
==
--- tomcat/trunk/test/org/apache/el/TesterFunctions.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterFunctions.java Wed Aug 24 11:27:29 
2016
@@ -22,6 +22,18 @@ public class TesterFunctions {
 return input.trim();
 }
 
+public static String concat(String... inputs) {
+if (inputs == null || inputs.length == 0) {
+return null;
+}
+StringBuilder result = new StringBuilder();
+for (String input : inputs) {
+result.append(input);
+}
+return result.toString();
+}
+
+
 public static class Inner$Class {
 
 public static final String RETVAL = "Return from bug49555";

Modified: tomcat/trunk/test/webapp/WEB-INF/test.tld
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/test.tld?rev=1757495&r1=1757494&r2=1757495&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/test.tld (original)
+++ tomcat/trunk/test/webapp/WEB-INF/test.tld Wed Aug 24 11:27:29 2016
@@ -31,4 +31,13 @@
   java.lang.String trim(java.lang.String)
 
   
+  
+  
+concat
+org.apache.el.TesterFunctions
+
+  java.lang.String concat(java.lang.String[])
+
+  
+  
 
\ No newline at end of file

Added: tomcat/trunk/test/webapp/bug6/bug60032.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug6/bug60032.jsp?rev=1757495&view=auto
==
--- tomcat/trunk/test/webapp/bug6/bug60032.jsp (added)
+++ tomcat/trunk/test/webapp/bug6/bug60032.jsp Wed Aug 24 11:27:29 2016
@@ -0,0 +1,24 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the Lice

svn commit: r1757496 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/el/parser/AstFunction.java test/org/apache/el/TestELInJsp.java test/org/apache/el/TesterFunctions.java test/webapp/WEB-INF/test.tld

[markt]

Author: markt
Date: Wed Aug 24 11:27:57 2016
New Revision: 1757496

URL: http://svn.apache.org/viewvc?rev=1757496&view=rev
Log:
Fix handling of method calls that use varargs within EL value expressions.

Added:
tomcat/tc8.5.x/trunk/test/webapp/bug6/
  - copied from r1757495, tomcat/trunk/test/webapp/bug6/
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/tc8.5.x/trunk/test/org/apache/el/TestELInJsp.java
tomcat/tc8.5.x/trunk/test/org/apache/el/TesterFunctions.java
tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/test.tld
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 11:27:57 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,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
+/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,17411

svn commit: r1757497 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/el/parser/AstFunction.java test/org/apache/el/TestELInJsp.java test/org/apache/el/TesterFunctions.java test/webapp/WEB-INF/test.tld

[markt]

Author: markt
Date: Wed Aug 24 11:28:13 2016
New Revision: 1757497

URL: http://svn.apache.org/viewvc?rev=1757497&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60032
Fix handling of method calls that use varargs within EL value expressions.

Added:
tomcat/tc8.0.x/trunk/test/webapp/bug6/
  - copied from r1757495, tomcat/trunk/test/webapp/bug6/
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java
tomcat/tc8.0.x/trunk/test/org/apache/el/TesterFunctions.java
tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/test.tld
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 11:28:13 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/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

[Bug 60032] EL function resolve varargs values but not send it to function call

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 OS||All
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
This has been fixed in the following branches:
- 9.0.x for 9.0.0.M10 onwards
- 8.5.x for 8.5.5 onwards
- 8.0.x for 8.0.37 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

svn commit: r1757499 - in /tomcat/trunk/webapps/docs: changelog.xml manager-howto.xml

[markt]

Author: markt
Date: Wed Aug 24 11:38:20 2016
New Revision: 1757499

URL: http://svn.apache.org/viewvc?rev=1757499&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60034
Fix typo

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1757499&r1=1757498&r2=1757499&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 24 11:38:20 2016
@@ -261,6 +261,10 @@
 Update NIO Connector configuration documentation with an information
 about socket.directSslBuffer. (violetagg)
   
+  
+60034: Correct a typo in the Manager How-To page of the
+documentation web application. (markt) 
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1757499&r1=1757498&r2=1757499&view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Wed Aug 24 11:38:20 2016
@@ -1018,7 +1018,7 @@ on each of deployed web applications wil
 The JMX Proxy Servlet is a lightweight proxy to get and set the
 tomcat internals. (Or any class that has been exposed via an MBean)
 Its usage is not very user friendly but the UI is
-extremely help for integrating command line scripts for monitoring
+extremely helpful for integrating command line scripts for monitoring
 and changing the internals of tomcat. You can do two things with the proxy:
 get information and set information. For you to really understand the
 JMX Proxy Servlet, you should have a general understanding of JMX.



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

svn commit: r1757501 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/manager-howto.xml

[markt]

Author: markt
Date: Wed Aug 24 11:38:53 2016
New Revision: 1757501

URL: http://svn.apache.org/viewvc?rev=1757501&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60034
Fix typo

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 11:38:53 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,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
+/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,17

svn commit: r1757502 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/manager-howto.xml

[markt]

Author: markt
Date: Wed Aug 24 11:39:16 2016
New Revision: 1757502

URL: http://svn.apache.org/viewvc?rev=1757502&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60034
Fix typo

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 11:39:16 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/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,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,16927

svn commit: r1757503 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/manager-howto.xml

[markt]

Author: markt
Date: Wed Aug 24 11:40:51 2016
New Revision: 1757503

URL: http://svn.apache.org/viewvc?rev=1757503&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60034
Fix typo

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 11:40:51 2016
@@ -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,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,1702742,1702
 
744,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,1726171-1
 
726173,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
-/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,1755944,1756040,1756412,1756940,1757134,1757176,1757203,1757272,1757282,1757348,1757355,1757423
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1

svn commit: r1757504 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/manager-howto.xml

[markt]

Author: markt
Date: Wed Aug 24 11:43:21 2016
New Revision: 1757504

URL: http://svn.apache.org/viewvc?rev=1757504&view=rev
Log:
Fix typo

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 11:43:21 2016
@@ -1,4 +1,4 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503
 
/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,17265

[Bug 60034] typo in proxy servlet docs - "is extremely help"

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks for pointing that out.

This has been fixed in the following branches:
- 9.0.x for 9.0.0.M10 onwards
- 8.5.x for 8.5.5 onwards
- 8.0.x for 8.0.37 onwards
- 7.0.x for 7.0.71 onwards
- 6.0.x for 6.0.46 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 59649] org.apache.coyote.http11.Http11Processor.service Error parsing HTTP request header

[bugzilla]

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

Mircea  changed:

   What|Removed |Added

 CC||zmircmir...@gmail.com

--- Comment #3 from Mircea  ---
I have just experienced this error with 8.5.4
Exactly identical logs.
The solution was to restart the server. I set the log level on DEBUG, so now
I'll have more info when it happens again.

-- 
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 59649] org.apache.coyote.http11.Http11Processor.service Error parsing HTTP request header

[bugzilla]

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

--- Comment #4 from Mircea  ---
Here is my stacktrace with Tomcat 8.5.4. Seems to be almost identical:

2016-08-24 07:48:38,236 INFO  [http-nio-8080-exec-10]
o.a.coyote.http11.Http11Processor DirectJDKLog.java:181 Error parsing HTTP
request header
 Note: further occurrences of HTTP header parsing errors will be logged at
DEBUG level.
java.lang.IllegalStateException: Unexpected state: headers already parsed.
Buffer not recycled?
at
org.apache.coyote.http11.Http11InputBuffer.parseHeaders(Http11InputBuffer.java:587)
at
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:1010)
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:785)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1425)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)
2016-08-24 07:48:38,255 ERROR [http-nio-8080-exec-6]
o.a.c.c.C.[.[.[.[.w.w.a.b.p.ApiProjectList] DirectJDKLog.java:181
Servlet.service() for servlet
[dk.wordmaps.wordmaps4.api.boundary.project.ApiProjectList] in context with
path [/api] threw exception
java.lang.NullPointerException: null
at
org.apache.catalina.connector.Request.getServletContext(Request.java:1618)
at org.apache.catalina.connector.Request.getContextPath(Request.java:1975)
at
org.apache.catalina.connector.RequestFacade.getContextPath(RequestFacade.java:784)
at
dk.wordmaps.wordmaps4.api.boundary.util.security.StatelessSecurityFilter.doFilter(StatelessSecurityFilter.java:58)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:192)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:165)
at
dk.wordmaps.wordmaps4.api.boundary.util.UTF8ServletFilter.doFilter(UTF8ServletFilter.java:25)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:192)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:165)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:198)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:108)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:522)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:140)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79)
at ch.qos.logback.access.tomcat.LogbackValve.invoke(LogbackValve.java:256)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:87)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:349)
at
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:1110)
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:785)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1425)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)
2016-08-24 07:48:38,256 ERROR [http-nio-8080-exec-6]
o.a.c.c.C.[Catalina].[localhost] DirectJDKLog.java:181 Exception Processing
null
java.lang.NullPointerException: null
at
org.apache.catalina.connector.Request.notifyAttributeAssigned(Request.java:1519)
at org.apache.catalina.connector.Request.setAttribute(Request.java:1505)
at
org.apache.catalina.core.StandardWrapperValve.exception(StandardWrapperValve.java:313)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:249)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:108)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:522)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:140)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79)
at ch.qos.logback.access.tomcat.LogbackValve.invoke(LogbackValve.java:256)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:87)
at
org.

[Bug 59649] org.apache.coyote.http11.Http11Processor.service Error parsing HTTP request header

[bugzilla]

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

Mircea  changed:

   What|Removed |Added

 Status|NEEDINFO|NEW

--- Comment #5 from Mircea  ---
As a continuation to my previous 2 comments...

The Tomcat 8.5.4 server was started yesterday at noon. Everything was fine.
By midnight, this error appeared, then most of the POST request triggered this
error, even though the requests were totally identical to those sent between
noon and midnight.

The solution was to restart Tomcat.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 59649] org.apache.coyote.http11.Http11Processor.service Error parsing HTTP request header

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #6 from Mark Thomas  ---
Restoring state to NEDDINFO. Absent a way to reproduce this, there is little we
can do to investigate.

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

[markt]

Author: markt
Date: Wed Aug 24 13:11:23 2016
New Revision: 1757518

URL: http://svn.apache.org/viewvc?rev=1757518&view=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=1757518&r1=1757517&r2=1757518&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 24 13:11:23 2016
@@ -89,8 +89,8 @@
 processing by default. (markt)
   
   
-59839: Apply roleSearchAsUser to all nested 
searches
-in JNDIRealm. (fschumacher)
+59839: Apply roleSearchAsUser to all nested
+searches in JNDIRealm. (fschumacher)
   
   
 59859: Fix resource leak in WebDAV servlet. Based on patch 
by



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

svn commit: r1757520 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/JSSEUtil.java test/webapp/WEB-INF/test.tld webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 24 13:13:48 2016
New Revision: 1757520

URL: http://svn.apache.org/viewvc?rev=1757520&view=rev
Log:
ws police

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/test/webapp/WEB-INF/test.tld
tomcat/trunk/webapps/docs/changelog.xml

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=1757520&r1=1757519&r2=1757520&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 Wed Aug 24 
13:13:48 2016
@@ -32,6 +32,7 @@ import java.security.cert.CertificateFac
 import java.security.cert.CollectionCertStoreParameters;
 import java.security.cert.PKIXBuilderParameters;
 import java.security.cert.X509CertSelector;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -50,6 +51,7 @@ import javax.net.ssl.SSLSessionContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -275,7 +277,16 @@ public class JSSEUtil extends SSLUtilBas
 }
 }
 
-return tms;
+if (tms == null) {
+return tms;
+}
+
+TrustManager[] result = new TrustManager[tms.length];
+
+for (int i = 0; i < tms.length; i++) {
+result[i] = new DebugTrustManager((X509TrustManager) tms[i]);
+}
+return result;
 }
 
 @Override
@@ -340,4 +351,30 @@ public class JSSEUtil extends SSLUtilBas
 }
 return crls;
 }
+
+
+private static class DebugTrustManager implements X509TrustManager {
+
+private final X509TrustManager tm;
+
+private DebugTrustManager(X509TrustManager tm) {
+this.tm = tm;
+}
+
+
+@Override
+public void checkClientTrusted(X509Certificate[] chain, String 
authType) throws CertificateException {
+tm.checkClientTrusted(chain, authType);
+}
+
+@Override
+public void checkServerTrusted(X509Certificate[] chain, String 
authType) throws CertificateException {
+tm.checkServerTrusted(chain, authType);
+}
+
+@Override
+public X509Certificate[] getAcceptedIssuers() {
+return tm.getAcceptedIssuers();
+}
+}
 }

Modified: tomcat/trunk/test/webapp/WEB-INF/test.tld
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/test.tld?rev=1757520&r1=1757519&r2=1757520&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/test.tld (original)
+++ tomcat/trunk/test/webapp/WEB-INF/test.tld Wed Aug 24 13:13:48 2016
@@ -31,7 +31,7 @@
   java.lang.String trim(java.lang.String)
 
   
-  
+
   
 concat
 org.apache.el.TesterFunctions
@@ -39,5 +39,5 @@
   java.lang.String concat(java.lang.String[])
 
   
-  
+
 
\ No newline at end of file

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1757520&r1=1757519&r2=1757520&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 24 13:13:48 2016
@@ -263,7 +263,7 @@
   
   
 60034: Correct a typo in the Manager How-To page of the
-documentation web application. (markt) 
+documentation web application. (markt)
   
 
   



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

svn commit: r1757522 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java

[markt]

Author: markt
Date: Wed Aug 24 13:22:27 2016
New Revision: 1757522

URL: http://svn.apache.org/viewvc?rev=1757522&view=rev
Log:
Revert accidental commit of debug code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java

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=1757522&r1=1757521&r2=1757522&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 Wed Aug 24 
13:22:27 2016
@@ -32,7 +32,6 @@ import java.security.cert.CertificateFac
 import java.security.cert.CollectionCertStoreParameters;
 import java.security.cert.PKIXBuilderParameters;
 import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -51,7 +50,6 @@ import javax.net.ssl.SSLSessionContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509KeyManager;
-import javax.net.ssl.X509TrustManager;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -277,16 +275,7 @@ public class JSSEUtil extends SSLUtilBas
 }
 }
 
-if (tms == null) {
-return tms;
-}
-
-TrustManager[] result = new TrustManager[tms.length];
-
-for (int i = 0; i < tms.length; i++) {
-result[i] = new DebugTrustManager((X509TrustManager) tms[i]);
-}
-return result;
+return tms;
 }
 
 @Override
@@ -351,30 +340,4 @@ public class JSSEUtil extends SSLUtilBas
 }
 return crls;
 }
-
-
-private static class DebugTrustManager implements X509TrustManager {
-
-private final X509TrustManager tm;
-
-private DebugTrustManager(X509TrustManager tm) {
-this.tm = tm;
-}
-
-
-@Override
-public void checkClientTrusted(X509Certificate[] chain, String 
authType) throws CertificateException {
-tm.checkClientTrusted(chain, authType);
-}
-
-@Override
-public void checkServerTrusted(X509Certificate[] chain, String 
authType) throws CertificateException {
-tm.checkServerTrusted(chain, authType);
-}
-
-@Override
-public X509Certificate[] getAcceptedIssuers() {
-return tm.getAcceptedIssuers();
-}
-}
 }



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

Introduce methods read/write with ByteBuffer in CoyoteInputStream/CoyoteOutputStream

[Violeta Georgieva]

Hi,

Currently it is not possible to use
ServletInputStream.read/ServletOutputStream.write methods with ByteBuffer.
To enable such scenarios in Tomcat I would like to extend the Tomcat’s
internal implementation (CoyoteInputStream/CoyoteOutputStream). I already
did some refactoring in ByteChunk/CharChunk/SocketWrapperBase so that I can
introduce read/write with ByteBuffer. I executed Autobahn test suite to
check the performance impact after the refactoring and it showed no
performance regression. If there are no objections I want to commit these
changes in Tomcat 9 and Tomcat 8.5.x.

Best Regards,
Violeta

[Bug 60039] New: Provide a switch to disable sending exception stacktrace to client

[bugzilla]

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

Bug ID: 60039
   Summary: Provide a switch to disable sending exception
stacktrace to client
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: saschakarc...@gmx.de

In case a servlet throws an exception which runs through to the the container
the method org.apache.catalina.valves.ErrorReportValve#report is used to send a
generic error page to the client. This generic error page contains the
exception's stacktrace which is great for debugging and development.

This does of course not happen when appropriate s have been defined
in the web app's deployment descriptor.

But in my scenario we do have lots of webapps. Some of them specify an
error-page for HTTP Status 500, some don't. So sometimes it happens that
stacktraces are sent to the client.

>From perspective of administration the easiest possibility to avoid this would
to have a configuration option which tells the generic error page whether to
include details about the exception or instead just contains a generic error
message like "Sorry. An internal server error occurred ..."

Wouldn't it be useful to have such a configuration option?
What do you guys think?

-- 
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: r1757527 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/tomcat/util/descriptor/InputSourceUtil.java java/org/apache/tomcat/util/descriptor/web/WebX

[markt]

Author: markt
Date: Wed Aug 24 14:02:16 2016
New Revision: 1757527

URL: http://svn.apache.org/viewvc?rev=1757527&view=rev
Log:
Fix a file descriptor leak when reading the global web.xml.

Added:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java   
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.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=1757527&r1=1757526&r2=1757527&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Aug 24 
14:02:16 2016
@@ -80,6 +80,7 @@ import org.apache.tomcat.util.bcel.class
 import org.apache.tomcat.util.bcel.classfile.ElementValuePair;
 import org.apache.tomcat.util.bcel.classfile.JavaClass;
 import org.apache.tomcat.util.buf.UriUtil;
+import org.apache.tomcat.util.descriptor.InputSourceUtil;
 import org.apache.tomcat.util.descriptor.XmlErrorHandler;
 import org.apache.tomcat.util.descriptor.web.ContextEjb;
 import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -1504,6 +1505,8 @@ public class ContextConfig implements Li
 
 if (entry != null && entry.getGlobalTimeStamp() == globalTimeStamp &&
 entry.getHostTimeStamp() == hostTimeStamp) {
+InputSourceUtil.close(globalWebXml);
+InputSourceUtil.close(hostWebXml);
 return entry.getWebXml();
 }
 

Added: tomcat/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java?rev=1757527&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java 
(added)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java 
Wed Aug 24 14:02:16 2016
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.descriptor;
+
+import java.io.InputStream;
+
+import org.apache.tomcat.util.ExceptionUtils;
+import org.xml.sax.InputSource;
+
+public final class InputSourceUtil {
+
+private InputSourceUtil() {
+// Utility class. Hide default constructor.
+}
+
+
+public static void close(InputSource inputSource) {
+if (inputSource == null) {
+// Nothing to do
+return;
+}
+
+InputStream is = inputSource.getByteStream();
+if (is != null) {
+try {
+is.close();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+}
+}
+
+}
+}

Propchange: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java
--
svn:eol-style = native

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java?rev=1757527&r1=1757526&r2=1757527&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java 
Wed Aug 24 14:02:16 2016
@@ -17,13 +17,12 @@
 package org.apache.tomcat.util.descriptor.web;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.descriptor.DigesterFactory;
+import org.apache.tomcat.util.descriptor.InputSourceUtil;
 import org.apache.tomcat.util.descriptor.XmlErrorHandler;
 import org.apache.tomcat.

[Bug 60039] Provide a switch to disable sending exception stacktrace to client

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #1 from Violeta Georgieva  ---
Hi,

There is such configuration.

http://tomcat.apache.org/tomcat-8.5-doc/config/valve.html#Error_Report_Valve
- showReport
- showServerInfo

Regards,
Violeta

-- 
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: r1757535 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/tomcat/util/descriptor/InputSourceUtil.java java/org/apache/tomcat/util/descript

[markt]

Author: markt
Date: Wed Aug 24 14:49:31 2016
New Revision: 1757535

URL: http://svn.apache.org/viewvc?rev=1757535&view=rev
Log:
Fix a file descriptor leak when reading the global web.xml.

Added:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java
  - copied unchanged from r1757527, 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java
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/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 14:49:31 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,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
+/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,

svn commit: r1757537 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/tomcat/util/descriptor/InputSourceUtil.java java/org/apache/tomcat/util/descript

[markt]

Author: markt
Date: Wed Aug 24 14:50:25 2016
New Revision: 1757537

URL: http://svn.apache.org/viewvc?rev=1757537&view=rev
Log:
Fix a file descriptor leak when reading the global web.xml.

Added:

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java
  - copied unchanged from r1757527, 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 14:50:25 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/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,

svn commit: r1757538 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/tomcat/util/descriptor/InputSourceUtil.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 24 14:57:11 2016
New Revision: 1757538

URL: http://svn.apache.org/viewvc?rev=1757538&view=rev
Log:
Fix a file descriptor leak when reading the global web.xml.

Added:

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java
  - copied unchanged from r1757535, 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/InputSourceUtil.java
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 Aug 24 14:57:11 2016
@@ -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,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,1702742,1702
 
744,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,1726171-1
 
726173,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
-/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,17

[Bug 60035] java.io.IOException: Too many open files

[bugzilla]

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

--- Comment #1 from Mark Thomas  ---
I'm starting to look at this. I've already found and fixed an unrelated file
descriptor leak and I can see a couple more places where fixes might be
required. However, I haven't - yet - seen anything that looks like the leak
described in this report.

Any information on how to reproduce it would be very helpful. For example, does
it require HTTPS, WebSocket, Servlet 3.0 Async or Servlet 3.1 non-blocking? A
test case that generates the leak would be even better.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (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-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-tc8.0.x-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-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.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 min 1 sec
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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.2-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
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-7.2-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20160824.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.jar
 
:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20160824.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20160824.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-20.0-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-8.0.x/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.0.x/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-7.2-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 7.2-SNAPSHOT on 3009 files
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/webapp/WEB-INF/test.tld:34: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/webapp/WEB-INF/test.tld:42: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/changelog.xml:293: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]

BUILD FAILED
/srv/gump/public/workspace/tomcat-8.0.x/build.xml:545: Got 3 errors and 0 
warnings.

Total time: 1 minute 0 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20160824180004, vmgump.apache.org:vmgump:20160824180004
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

svn commit: r1757578 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/JSSEUtil.java java/org/apache/tomcat/util/net/jsse/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 24 21:37:39 2016
New Revision: 1757578

URL: http://svn.apache.org/viewvc?rev=1757578&view=rev
Log:
Refactor the JSSE client certificate validation so that the effectiveness of 
the certificateVerificationDepth configuration attribute does not depend on the 
presence of a certificate revokation list.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml

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=1757578&r1=1757577&r2=1757578&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 Wed Aug 24 
21:37:39 2016
@@ -241,9 +241,6 @@ public class JSSEUtil extends SSLUtilBas
 
 @Override
 public TrustManager[] getTrustManagers() throws Exception {
-String algorithm = sslHostConfig.getTruststoreAlgorithm();
-
-String crlf = sslHostConfig.getCertificateRevocationListFile();
 
 String className = sslHostConfig.getTrustManagerClassName();
 if(className != null && className.length() > 0) {
@@ -261,17 +258,24 @@ public class JSSEUtil extends SSLUtilBas
 TrustManager[] tms = null;
 
 KeyStore trustStore = sslHostConfig.getTruststore();
-if (trustStore != null || className != null) {
-if (crlf == null) {
+if (trustStore != null) {
+String algorithm = sslHostConfig.getTruststoreAlgorithm();
+String crlf = sslHostConfig.getCertificateRevocationListFile();
+
+if ("PKIX".equalsIgnoreCase(algorithm)) {
 TrustManagerFactory tmf = 
TrustManagerFactory.getInstance(algorithm);
-tmf.init(trustStore);
+CertPathParameters params = getParameters(crlf, trustStore);
+ManagerFactoryParameters mfp = new 
CertPathTrustManagerParameters(params);
+tmf.init(mfp);
 tms = tmf.getTrustManagers();
 } else {
 TrustManagerFactory tmf = 
TrustManagerFactory.getInstance(algorithm);
-CertPathParameters params = getParameters(algorithm, crlf, 
trustStore);
-ManagerFactoryParameters mfp = new 
CertPathTrustManagerParameters(params);
-tmf.init(mfp);
+tmf.init(trustStore);
 tms = tmf.getTrustManagers();
+if (crlf != null && crlf.length() > 0) {
+throw new 
CRLException(sm.getString("jsseUtil.noCrlSupport", algorithm));
+}
+log.warn(sm.getString("jsseUtil.noVerificationDepth"));
 }
 }
 
@@ -289,28 +293,26 @@ public class JSSEUtil extends SSLUtilBas
  * Return the initialization parameters for the TrustManager.
  * Currently, only the default PKIX is supported.
  *
- * @param algorithm The algorithm to get parameters for.
  * @param crlf The path to the CRL file.
  * @param trustStore The configured TrustStore.
  * @return The parameters including the CRLs and TrustStore.
  * @throws Exception An error occurred
  */
-protected CertPathParameters getParameters(String algorithm, String crlf,
-KeyStore trustStore) throws Exception {
+protected CertPathParameters getParameters(String crlf, KeyStore 
trustStore) throws Exception {
 
-if("PKIX".equalsIgnoreCase(algorithm)) {
-PKIXBuilderParameters xparams =
-new PKIXBuilderParameters(trustStore, new 
X509CertSelector());
+PKIXBuilderParameters xparams =
+new PKIXBuilderParameters(trustStore, new X509CertSelector());
+if (crlf != null && crlf.length() > 0) {
 Collection crls = getCRLs(crlf);
 CertStoreParameters csp = new CollectionCertStoreParameters(crls);
 CertStore store = CertStore.getInstance("Collection", csp);
 xparams.addCertStore(store);
 xparams.setRevocationEnabled(true);
-
xparams.setMaxPathLength(sslHostConfig.getCertificateVerificationDepth());
-return xparams;
 } else {
-throw new CRLException("CRLs not supported for type: "+algorithm);
+xparams.setRevocationEnabled(false);
 }
+
xparams.setMaxPathLength(sslHostConfig.getCertificateVerificationDepth());
+return xparams;
 }
 
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties?rev=1757578&r1=1757577&r2=1757578&view=diff
===

svn commit: r1757583 - in /tomcat/trunk/webapps/docs: changelog.xml config/http.xml

[markt]

Author: markt
Date: Wed Aug 24 22:44:45 2016
New Revision: 1757583

URL: http://svn.apache.org/viewvc?rev=1757583&view=rev
Log: (empty)

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1757583&r1=1757582&r2=1757583&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 24 22:44:45 2016
@@ -274,6 +274,10 @@
 60034: Correct a typo in the Manager How-To page of the
 documentation web application. (markt)
   
+  
+Correct the name of the CRL location configuration attributes in the
+documentation web application. (markt)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1757583&r1=1757582&r2=1757583&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Wed Aug 24 22:44:45 2016
@@ -1080,7 +1080,7 @@
 
   
 
-
+
   Name of the file that contains the concatenated certificate revocation
   lists for the certificate authorities. The format is PEM-encoded. If not
   defined, client certificates will not be checked against a certificate
@@ -1090,7 +1090,7 @@
   connectors may also specify a URL for this attribute.
 
 
-
+
   OpenSSL only.
   Name of the directory that contains the certificate revocation lists
   for the certificate authorities. The format is PEM-encoded. Relative 
paths



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

[Bug 60035] java.io.IOException: Too many open files

[bugzilla]

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

--- Comment #2 from joe.stepow...@gmail.com ---
Hi Mark

I have been able to pinpoint that the issue started with 8.5.3.  8.5.2 seems to
be ok.  

I can see from the 8.5.3 changlog at least one change around sockets: "Fix a
cause of multiple attempts to close the same socket"

I downloaded, built and deployed the sample Spring Boot app from one of the
tutorials.  Couldn't reproduce the issue, even with 8.5.4, although the app is
pretty "dumb":
https://spring.io/guides/gs/spring-boot/
https://github.com/spring-guides/gs-spring-boot/archive/master.zip 

Users connect to our app over https, and our app connects to ldap over http and
other webservices over https.  No WebSocket, Servlet 3.0 Async or Servlet 3.1
non-blocking.

Cheers
Joe

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