date:20180104

[Git Migration] Review board

2018-01-04 Thread Mark Thomas

Happy New Year all!

This is the first of the per issue e-mails to discuss the issues
associated with migrating from svn to git.

Some years ago we looked at using review board. It didn't really gain
traction. It is currently configured to use svn.

Rather than migrate Review Board for Tomcat to git, the proposal is to
remove Tomcat from Review Board completely. This is something we can
(and probably should) do regardless of the git migration.

Given the lack of use, I intend to work with infra to remove Tomcat from
Review Board in 72 hours unless there are objections and/or alternative
proposals.

Cheers

Mark

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

Re: [Git Migration] Review board

2018-01-04 Thread Rémy Maucherat

On Thu, Jan 4, 2018 at 11:29 AM, Mark Thomas  wrote:

> Happy New Year all!
>
> This is the first of the per issue e-mails to discuss the issues
> associated with migrating from svn to git.
>
> Some years ago we looked at using review board. It didn't really gain
> traction. It is currently configured to use svn.
>
> Rather than migrate Review Board for Tomcat to git, the proposal is to
> remove Tomcat from Review Board completely. This is something we can
> (and probably should) do regardless of the git migration.
>
> Given the lack of use, I intend to work with infra to remove Tomcat from
> Review Board in 72 hours unless there are objections and/or alternative
> proposals.
>
> +1

I had no idea what this is, had a look at
https://reviews.apache.org/groups/tomcat/ and indeed it's not been used at
all.

Rémy

[Bug 57434] Race condition in EL1.0 validation

2018-01-04 Thread bugzilla

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

--- Comment #5 from Tomas Hofman  ---
Sorry for not elaborating before - in fact my main motivation was that
currently the parseExpressionString() method can throw a NPE because of the
race, which breaks the request processing. Moreover when the NPE occurs, the
mBypassCache flag is not reset to false by the calling method
Evaluator#validate() and that affects later calls.

The patch seemed like a safe solution to prevent the NPE. The caching could
still be affected by the race condition, but that seemed like a smaller
problem.

Passing the flag as a method parameter would be ideal. Perhaps an overloaded
method with an extra parameter could be introduced while the old one is kept,
to stay backward compatible in case someone is calling the methods directly. I
opened a PR in that regard in our fork:

  https://github.com/jboss/jboss-jstl-api_spec/pull/16/files

(I overloaded also convertStaticValueToExpectedType(), which is too using the
flag.)

I understand the reluctance though.

-- 
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 57434] Race condition in EL1.0 validation

2018-01-04 Thread bugzilla

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

--- Comment #6 from Tomas Hofman  ---
Linking the JBoss issue for reference: https://issues.jboss.org/browse/JBEE-183

-- 
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 61565] Manager interface for reloading TLS config

2018-01-04 Thread bugzilla

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

--- Comment #1 from Christopher Schultz  ---
Since Tomcat 8.5.24 and similar Tomcat 9.0.x, the endpoint class contains these
new methods:

reloadSslHostConfig(String hostName)
reloadSslHostConfigs()

[ref:
https://lists.apache.org/thread.html/79f8d5201990b57fc781c6e40730888934b3d57ce7bd7509720ef8e2@%3Cusers.tomcat.apache.org%3E]

It seems this makes this enhancement much easier to accomplish, though there
may not be a natural place to show such an operation (e.g. the "endpoints"
aren't shown on the manager page).

Where were you thinking you'd like these "reload TLS config" options to be
offered?

-- 
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 61565] Manager interface for reloading TLS config

2018-01-04 Thread bugzilla

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

--- Comment #2 from Remy Maucherat  ---
Mark did it in r1818127 although I didn't test it.

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

GC allocation failure

2018-01-04 Thread Sanka, Ambica

I am seeing below highlighted errors in native_err logs in all my tomcat 
applications. I also increased memory for the VM from 4GB to 8GB. Still seeing 
those. When do we get that errors?
I am reading online that when program asks for memory and java cannot give, 
that's when we see them. Please suggest.
Java HotSpot(TM) 64-Bit Server VM (25.20-b23) for linux-amd64 JRE 
(1.8.0_20-b26), built on Jul 30 2014 13:13:52 by "java_re" with gcc 4.3.0 
20080428 (Red Hat 4.3.0-8)
Memory: 4k page, physical 8061572k(2564740k free), swap 4063228k(4063228k free)
CommandLine flags: -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=/opt/apache/ancillariesmonitoring/logs/ 
-XX:InitialHeapSize=128985152 -XX:MaxHeapSize=268435456 -XX:+PrintGC 
-XX:+PrintGCTimeStamps -XX:+UseCompressedClassPointers -XX:+UseCompressedOops 
-XX:+UseParallelGC
3.203: [GC (Allocation Failure)  31744K->6311K(121856K), 0.0097261 secs]
3.578: [GC (Allocation Failure)  38055K->12368K(121856K), 0.0089875 secs]
3.756: [GC (Allocation Failure)  44112K->19589K(121856K), 0.0100339 secs]
3.897: [GC (Allocation Failure)  51333K->25872K(153600K), 0.0092326 secs]
4.172: [GC (Allocation Failure)  89360K->38878K(153600K), 0.0152940 secs]
4.417: [GC (Allocation Failure)  102366K->50311K(148480K), 0.0148816 secs]
4.594: [GC (Allocation Failure)  95367K->49903K(151040K), 0.0197327 secs]
4.765: [GC (Allocation Failure)  94959K->50213K(148992K), 0.0149008 secs]
4.946: [GC (Allocation Failure)  96293K->52257K(150528K), 0.0172634 secs]
5.129: [GC (Allocation Failure)  98337K->53118K(151040K), 0.0139426 secs]
5.313: [GC (Allocation Failure)  102270K->53234K(152064K), 0.0122307 secs]
5.498: [GC (Allocation Failure)  102386K->53579K(153088K), 0.0166336 secs]
5.655: [GC (Allocation Failure)  104779K->54486K(153600K), 0.0161735 secs]
6.885: [GC (Allocation Failure)  105686K->51523K(153600K), 0.0123126 secs]

Thanks
Ambica.

Re: GC allocation failure

2018-01-04 Thread Coty Sutherland

This is a question for the users list, not the developers list. From
http://tomcat.apache.org/lists.html#tomcat-dev:

"This development list is only for discussion of changes to the Apache
Tomcat source code and related issues. Other questions will be
ignored."

On Thu, Jan 4, 2018 at 11:05 AM, Sanka, Ambica  wrote:
> I am seeing below highlighted errors in native_err logs in all my tomcat 
> applications. I also increased memory for the VM from 4GB to 8GB. Still 
> seeing those. When do we get that errors?
> I am reading online that when program asks for memory and java cannot give, 
> that's when we see them. Please suggest.
> Java HotSpot(TM) 64-Bit Server VM (25.20-b23) for linux-amd64 JRE 
> (1.8.0_20-b26), built on Jul 30 2014 13:13:52 by "java_re" with gcc 4.3.0 
> 20080428 (Red Hat 4.3.0-8)
> Memory: 4k page, physical 8061572k(2564740k free), swap 4063228k(4063228k 
> free)
> CommandLine flags: -XX:+HeapDumpOnOutOfMemoryError 
> -XX:HeapDumpPath=/opt/apache/ancillariesmonitoring/logs/ 
> -XX:InitialHeapSize=128985152 -XX:MaxHeapSize=268435456 -XX:+PrintGC 
> -XX:+PrintGCTimeStamps -XX:+UseCompressedClassPointers -XX:+UseCompressedOops 
> -XX:+UseParallelGC
> 3.203: [GC (Allocation Failure)  31744K->6311K(121856K), 0.0097261 secs]
> 3.578: [GC (Allocation Failure)  38055K->12368K(121856K), 0.0089875 secs]
> 3.756: [GC (Allocation Failure)  44112K->19589K(121856K), 0.0100339 secs]
> 3.897: [GC (Allocation Failure)  51333K->25872K(153600K), 0.0092326 secs]
> 4.172: [GC (Allocation Failure)  89360K->38878K(153600K), 0.0152940 secs]
> 4.417: [GC (Allocation Failure)  102366K->50311K(148480K), 0.0148816 secs]
> 4.594: [GC (Allocation Failure)  95367K->49903K(151040K), 0.0197327 secs]
> 4.765: [GC (Allocation Failure)  94959K->50213K(148992K), 0.0149008 secs]
> 4.946: [GC (Allocation Failure)  96293K->52257K(150528K), 0.0172634 secs]
> 5.129: [GC (Allocation Failure)  98337K->53118K(151040K), 0.0139426 secs]
> 5.313: [GC (Allocation Failure)  102270K->53234K(152064K), 0.0122307 secs]
> 5.498: [GC (Allocation Failure)  102386K->53579K(153088K), 0.0166336 secs]
> 5.655: [GC (Allocation Failure)  104779K->54486K(153600K), 0.0161735 secs]
> 6.885: [GC (Allocation Failure)  105686K->51523K(153600K), 0.0123126 secs]

In the spirit of helpfulness, see the first result for googling "GC
(Allocation Failure)",
https://stackoverflow.com/questions/28342736/java-gc-allocation-failure
;)

If you have further questions, direct them to the users list please.

>
> Thanks
> Ambica.

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

RE: GC allocation failure

2018-01-04 Thread Sanka, Ambica

Thank you for letting me know. Will post it there.




-Original Message-
From: Coty Sutherland [mailto:csuth...@apache.org] 
Sent: Thursday, January 04, 2018 11:14 AM
To: Tomcat Developers List 
Subject: Re: GC allocation failure

This is a question for the users list, not the developers list. From
https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Ftomcat.apache.org%2Flists.html%23tomcat-dev&data=02%7C01%7CASanka%40atpco.net%7C00fa95a791ad4eb5f6b708d5538e4199%7C25a0fe74b1cb46ee81f58cbb7b5ca144%7C1%7C0%7C636506792808426936&sdata=WIAoswgW2wPKAJsG6sFUygbNPdv%2BzgPG5UUnfPwmheM%3D&reserved=0:

"This development list is only for discussion of changes to the Apache Tomcat 
source code and related issues. Other questions will be ignored."

On Thu, Jan 4, 2018 at 11:05 AM, Sanka, Ambica  wrote:
> I am seeing below highlighted errors in native_err logs in all my tomcat 
> applications. I also increased memory for the VM from 4GB to 8GB. Still 
> seeing those. When do we get that errors?
> I am reading online that when program asks for memory and java cannot give, 
> that's when we see them. Please suggest.
> Java HotSpot(TM) 64-Bit Server VM (25.20-b23) for linux-amd64 JRE 
> (1.8.0_20-b26), built on Jul 30 2014 13:13:52 by "java_re" with gcc 
> 4.3.0 20080428 (Red Hat 4.3.0-8)
> Memory: 4k page, physical 8061572k(2564740k free), swap 
> 4063228k(4063228k free) CommandLine flags: 
> -XX:+HeapDumpOnOutOfMemoryError 
> -XX:HeapDumpPath=/opt/apache/ancillariesmonitoring/logs/ 
> -XX:InitialHeapSize=128985152 -XX:MaxHeapSize=268435456 -XX:+PrintGC 
> -XX:+PrintGCTimeStamps -XX:+UseCompressedClassPointers 
> -XX:+UseCompressedOops -XX:+UseParallelGC
> 3.203: [GC (Allocation Failure)  31744K->6311K(121856K), 0.0097261 
> secs]
> 3.578: [GC (Allocation Failure)  38055K->12368K(121856K), 0.0089875 
> secs]
> 3.756: [GC (Allocation Failure)  44112K->19589K(121856K), 0.0100339 
> secs]
> 3.897: [GC (Allocation Failure)  51333K->25872K(153600K), 0.0092326 
> secs]
> 4.172: [GC (Allocation Failure)  89360K->38878K(153600K), 0.0152940 
> secs]
> 4.417: [GC (Allocation Failure)  102366K->50311K(148480K), 0.0148816 
> secs]
> 4.594: [GC (Allocation Failure)  95367K->49903K(151040K), 0.0197327 
> secs]
> 4.765: [GC (Allocation Failure)  94959K->50213K(148992K), 0.0149008 
> secs]
> 4.946: [GC (Allocation Failure)  96293K->52257K(150528K), 0.0172634 
> secs]
> 5.129: [GC (Allocation Failure)  98337K->53118K(151040K), 0.0139426 
> secs]
> 5.313: [GC (Allocation Failure)  102270K->53234K(152064K), 0.0122307 
> secs]
> 5.498: [GC (Allocation Failure)  102386K->53579K(153088K), 0.0166336 
> secs]
> 5.655: [GC (Allocation Failure)  104779K->54486K(153600K), 0.0161735 
> secs]
> 6.885: [GC (Allocation Failure)  105686K->51523K(153600K), 0.0123126 
> secs]

In the spirit of helpfulness, see the first result for googling "GC (Allocation 
Failure)",
https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fstackoverflow.com%2Fquestions%2F28342736%2Fjava-gc-allocation-failure&data=02%7C01%7CASanka%40atpco.net%7C00fa95a791ad4eb5f6b708d5538e4199%7C25a0fe74b1cb46ee81f58cbb7b5ca144%7C1%7C0%7C636506792808426936&sdata=SWT4Q0CbrmnU%2Fzd6Q9gGpOm%2FiqLMi5l2DQSMTveq9PU%3D&reserved=0
;)

If you have further questions, direct them to the users list please.

>
> Thanks
> Ambica.

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

[Bug 61565] Manager interface for reloading TLS config

2018-01-04 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
I was working on this just before I went on PTO for the holiday period. Looks
like I forgot to resolve this once I committed the feature. Sorry for any
confusion.

-- 
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: r1820138 - in /tomcat/trunk: java/org/apache/catalina/filters/AddDefaultCharsetFilter.java test/org/apache/catalina/filters/TestAddCharSetFilter.java webapps/docs/changelog.xml

2018-01-04 Thread markt

Author: markt
Date: Thu Jan  4 17:23:41 2018
New Revision: 1820138

URL: http://svn.apache.org/viewvc?rev=1820138&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61916
Extend the AddDefaultCharsetFilter to add a character set when the content type 
is set via setHeader() or addHeader() as well as when it is set via 
setContentType().

Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1820138&r1=1820137&r2=1820138&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
Thu Jan  4 17:23:41 2018
@@ -121,6 +121,24 @@ public class AddDefaultCharsetFilter ext
 }
 
 @Override
+public void setHeader(String name, String value) {
+if (name.trim().equalsIgnoreCase("content-type")) {
+setContentType(value);
+} else {
+super.setHeader(name, value);
+}
+}
+
+@Override
+public void addHeader(String name, String value) {
+if (name.trim().equalsIgnoreCase("content-type")) {
+setContentType(value);
+} else {
+super.setHeader(name, value);
+}
+}
+
+@Override
 public void setCharacterEncoding(String charset) {
 super.setCharacterEncoding(charset);
 encoding = charset;

Modified: 
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java?rev=1820138&r1=1820137&r2=1820138&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java Thu 
Jan  4 17:23:41 2018
@@ -48,12 +48,12 @@ public class TestAddCharSetFilter extend
 
 @Test
 public void testNoneSpecifiedMode2() throws Exception {
-doTest(null, "ISO-8859-2", 2);
+doTest(null, "ISO-8859-2", 2, true);
 }
 
 @Test
 public void testNoneSpecifiedMode3() throws Exception {
-doTest(null, "ISO-8859-3", 3);
+doTest(null, "ISO-8859-3", 3, true);
 }
 
 @Test
@@ -83,10 +83,13 @@ public class TestAddCharSetFilter extend
 
 
 private void doTest(String encoding, String expected) throws Exception {
-doTest(encoding, expected, 1);
+doTest(encoding, expected, 1, true);
+tearDown();
+setUp();
+doTest(encoding, expected, 1, false);
 }
 
-private void doTest(String encoding, String expected, int mode)
+private void doTest(String encoding, String expected, int mode, boolean 
useSetContentType)
 throws Exception {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
@@ -95,7 +98,7 @@ public class TestAddCharSetFilter extend
 Context ctx = tomcat.addContext("", null);
 
 // Add the Servlet
-CharsetServlet servlet = new CharsetServlet(mode);
+CharsetServlet servlet = new CharsetServlet(mode, useSetContentType);
 Tomcat.addServlet(ctx, "servlet", servlet);
 ctx.addServletMappingDecoded("/", "servlet");
 
@@ -128,30 +131,53 @@ public class TestAddCharSetFilter extend
 private static final String OUTPUT = "OK";
 
 private final int mode;
+private final boolean useSetContentType;
 
-public CharsetServlet(int mode) {
+public CharsetServlet(int mode, boolean useSetContentType) {
 this.mode = mode;
+this.useSetContentType = useSetContentType;
 }
 
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
 
+String value;
 switch (mode) {
 case 1:
-resp.setContentType("text/plain");
+value = "text/plain";
+if (useSetContentType) {
+resp.setContentType(value);
+} else {
+resp.setHeader("Content-Type", value);
+}
 break;
 case 2:
-resp.setContentType("text/plain;charset=ISO-8859-2");
+value = "text/plain;charset=ISO-8859-2";
+if (useSetContentType) {
+

svn commit: r1820140 - in /tomcat/jk/trunk: jkstatus/build.xml native/NOTICE native/common/jk_status.c native/iis/jk_isapi_plugin.c xdocs/style.xsl

2018-01-04 Thread rjung

Author: rjung
Date: Thu Jan  4 17:25:22 2018
New Revision: 1820140

URL: http://svn.apache.org/viewvc?rev=1820140&view=rev
Log:
Happy New Year 2018

Modified:
tomcat/jk/trunk/jkstatus/build.xml
tomcat/jk/trunk/native/NOTICE
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/style.xsl

Modified: tomcat/jk/trunk/jkstatus/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/build.xml?rev=1820140&r1=1820139&r2=1820140&view=diff
==
--- tomcat/jk/trunk/jkstatus/build.xml (original)
+++ tomcat/jk/trunk/jkstatus/build.xml Thu Jan  4 17:25:22 2018
@@ -120,7 +120,7 @@
   version="true"
   windowtitle="Jk Status Internal API Documentation"
   doctitle="Jk Status API"
-  bottom="Copyright © 2000-2017 Apache Software Foundation.  All 
Rights Reserved."
+  bottom="Copyright © 2000-2018 Apache Software Foundation.  All 
Rights Reserved."
 />
   
 

Modified: tomcat/jk/trunk/native/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/NOTICE?rev=1820140&r1=1820139&r2=1820140&view=diff
==
--- tomcat/jk/trunk/native/NOTICE (original)
+++ tomcat/jk/trunk/native/NOTICE Thu Jan  4 17:25:22 2018
@@ -1,5 +1,5 @@
 Apache Tomcat Connectors
-Copyright 2002-2017 The Apache Software Foundation
+Copyright 2002-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/jk/trunk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1820140&r1=1820139&r2=1820140&view=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Thu Jan  4 17:25:22 2018
@@ -261,7 +261,7 @@
"http://www.w3.org/1999/xhtml\"; xml:lang=\"en\" lang=\"en\">" \
"JK Status 
Manager"
 
-#define JK_STATUS_COPYRIGHT"Copyright © 1999-2017, The 
Apache Software Foundation" \
+#define JK_STATUS_COPYRIGHT"Copyright © 1999-2018, The 
Apache Software Foundation" \
"Licensed under the http://www.apache.org/licenses/LICENSE-2.0\";>" \
"Apache License, Version 2.0."
 

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1820140&r1=1820139&r2=1820140&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Thu Jan  4 17:25:22 2018
@@ -216,7 +216,7 @@ char HTML_ERROR_TAIL[] ="\n \n"
 "\n"
 "\n"
-"Copyright © 1999-2017 Apache Software 
Foundation\n"
+"Copyright © 1999-2018 Apache Software 
Foundation\n"
 "All Rights Reserved\n"
 "\n\n\n";
 

Modified: tomcat/jk/trunk/xdocs/style.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/style.xsl?rev=1820140&r1=1820139&r2=1820140&view=diff
==
--- tomcat/jk/trunk/xdocs/style.xsl (original)
+++ tomcat/jk/trunk/xdocs/style.xsl Thu Jan  4 17:25:22 2018
@@ -178,7 +178,7 @@
   PAGE FOOTER
   
 
-Copyright © 1999-2017, Apache Software Foundation
+Copyright © 1999-2018, Apache Software Foundation
 
   
 



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

svn commit: r1820141 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2018-01-04 Thread markt

Author: markt
Date: Thu Jan  4 17:26:38 2018
New Revision: 1820141

URL: http://svn.apache.org/viewvc?rev=1820141&view=rev
Log:
Fix order (merge issue?)

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1820141&r1=1820140&r2=1820141&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Jan  4 17:26:38 2018
@@ -52,29 +52,6 @@
   
 
   
-  
-
-  
-Remove the Servlet 4.0 early preview example from the examples web
-application as the early preview is now deprecated in favour of Tomcat
-9 which provides a full Servlet 4.0 implementation. (markt)
-  
-
-  
-  
-
-  
-61854: When using sets and/or maps in EL expressions, ensure
-that Jasper correctly parses the expression. Patch provided by Ricardo
-Martin Camarero. (markt)
-  
-  
-Improve the handling of methods with varargs in EL expressions. In
-particular, the calling of a varargs method with no parameters now 
works
-correctly. Based on a patch by Nitkalya (Ing) Wiriyanuparb. (markt)
-  
-
-  
   
 
   
@@ -107,8 +84,27 @@
   
 
   
+  
+
+  
+61854: When using sets and/or maps in EL expressions, ensure
+that Jasper correctly parses the expression. Patch provided by Ricardo
+Martin Camarero. (markt)
+  
+  
+Improve the handling of methods with varargs in EL expressions. In
+particular, the calling of a varargs method with no parameters now 
works
+correctly. Based on a patch by Nitkalya (Ing) Wiriyanuparb. (markt)
+  
+
+  
   
 
+  
+Remove the Servlet 4.0 early preview example from the examples web
+application as the early preview is now deprecated in favour of Tomcat
+9 which provides a full Servlet 4.0 implementation. (markt)
+  
   
 61223: Add the mbeans-descriptors.dtd file to the custom
 MBean documentation so users have a reference to use when constructing



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

svn commit: r1820142 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/AddDefaultCharsetFilter.java test/org/apache/catalina/filters/TestAddCharSetFilter.java webapps/docs/changelog.xml

2018-01-04 Thread markt

Author: markt
Date: Thu Jan  4 17:27:22 2018
New Revision: 1820142

URL: http://svn.apache.org/viewvc?rev=1820142&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61916
Extend the AddDefaultCharsetFilter to add a character set when the content type 
is set via setHeader() or addHeader() as well as when it is set via 
setContentType().

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  4 17:27:22 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,17

svn commit: r1820143 - in /tomcat/native/trunk: NOTICE build.xml xdocs/style.xsl

2018-01-04 Thread rjung

Author: rjung
Date: Thu Jan  4 17:28:38 2018
New Revision: 1820143

URL: http://svn.apache.org/viewvc?rev=1820143&view=rev
Log:
Happy New Year 2018

Modified:
tomcat/native/trunk/NOTICE
tomcat/native/trunk/build.xml
tomcat/native/trunk/xdocs/style.xsl

Modified: tomcat/native/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/NOTICE?rev=1820143&r1=1820142&r2=1820143&view=diff
==
--- tomcat/native/trunk/NOTICE (original)
+++ tomcat/native/trunk/NOTICE Thu Jan  4 17:28:38 2018
@@ -1,5 +1,5 @@
 Apache Tomcat Native Library
-Copyright 2002-2017 The Apache Software Foundation
+Copyright 2002-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/native/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=1820143&r1=1820142&r2=1820143&view=diff
==
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Thu Jan  4 17:28:38 2018
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 
@@ -174,7 +174,7 @@
 packagenames="org.apache.tomcat.*"
 windowtitle="${title} (Version ${version})"
 doctitle="${title} (Version ${version})"
-bottom="Copyright 2002-2017 The Apache Software Foundation.