date:20200421

[GitHub] [tomcat] KangZhiDong commented on issue #279: Optimize concurrency

2020-04-21 Thread GitBox



KangZhiDong commented on issue #279:
URL: https://github.com/apache/tomcat/pull/279#issuecomment-617485732


   > What is the basis for this change?
   > While the thread is in `wait()`, `notify()` should only be called if one 
of the conditions in the surrounding `if(...)` is no longer true. I'd expect 
the change in this PR to make performance marginally worse, not better.
   
   i think because "while (sendfileRunning && sendfileCount < 1 && addS.size() 
< 1)"  in outer layer check again,so it  can use "if" there ，do not need check 
again in synchronized block



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] KangZhiDong commented on issue #279: Optimize concurrency

2020-04-21 Thread GitBox



KangZhiDong commented on issue #279:
URL: https://github.com/apache/tomcat/pull/279#issuecomment-617483507


   > What is the basis for this change?
   > While the thread is in `wait()`, `notify()` should only be called if one 
of the conditions in the surrounding `if(...)` is no longer true. I'd expect 
the change in this PR to make performance marginally worse, not better.
   
   When this thread is notify , it do not check "(sendfileRunning && 
sendfileCount < 1 && addS.size() < 1)" ,but "while" check again,avoid other 
thread  may change it



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on issue #279: Optimize concurrency

2020-04-21 Thread GitBox



markt-asf commented on issue #279:
URL: https://github.com/apache/tomcat/pull/279#issuecomment-617338009


   What is the basis for this change?
   While the thread is in `wait()`, `notify()` should only be called if one of 
the conditions in the surrounding `if(...)` is no longer true. I'd expect the 
change in this PR to make performance marginally worse, not better.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] KangZhiDong opened a new pull request #279: Optimize concurrency

2020-04-21 Thread GitBox



KangZhiDong opened a new pull request #279:
URL: https://github.com/apache/tomcat/pull/279


   more performance



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on issue #278: display build status on the readme file

2020-04-21 Thread GitBox



markt-asf commented on issue #278:
URL: https://github.com/apache/tomcat/pull/278#issuecomment-617270786


   For the full list:
   http://tomcat.apache.org/ci.html



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] govi20 commented on issue #278: display build status on the readme file

2020-04-21 Thread GitBox



govi20 commented on issue #278:
URL: https://github.com/apache/tomcat/pull/278#issuecomment-617266944


   My assumption was Travis is the only CI. We can add status' at bottom just 
like apache/spark readme.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[Bug 64366] [sse] NPE while closing async http/2 connector

2020-04-21 Thread bugzilla

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

--- Comment #4 from Mark Thomas  ---
When I try this on both Tomcat 10.0.x and 9.0.x I get a variation of the
following:

21-Apr-2020 17:20:36.818 WARNING [Thread-4]
org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web
application [tomcat-bugs] appears to have started a thread named [Thread-5] but
has failed to stop it. This is very likely to create a memory leak. Stack trace
of thread:
 java.lang.Object.wait(Native Method)
 org.apache.tomcat.Bug64366$NotStoppedService.run(Bug64366.java:50)
 java.lang.Thread.run(Thread.java:748)


That looks to be a reasonable error message for the circumstances. I am unable
to reproduce the NPE in the description above.

Are there other configuration changes to make to a clean Tomcat install to
trigger this error. I note you are using systemctl. Are you using a package
provided by your distribution? If so, so you see the same error with a Tomcat
installation obtained directly from the ASF?

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

[GitHub] [tomcat] rmaucher commented on issue #277: Refuse adding invalid HTTP 2.0 headers

2020-04-21 Thread GitBox



rmaucher commented on issue #277:
URL: https://github.com/apache/tomcat/pull/277#issuecomment-617239514


   I will maintain my -1
   For starters, any such HTTP/2 specific nonsense safety nets need to be added 
to StreamProcessor.prepareHeaders instead of other random locations.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on issue #278: display build status on the readme file

2020-04-21 Thread GitBox



markt-asf commented on issue #278:
URL: https://github.com/apache/tomcat/pull/278#issuecomment-617224872


   This assumes Travis is the primary CI system for Tomcat. It isn't. I'm not 
against this information being added somewhere to the readme file but it needs 
to make clear Travis is not the primary CI and, as such, I don;t think it 
belongs at the top of the file.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] govi20 opened a new pull request #278: display build status on the readme file

2020-04-21 Thread GitBox



govi20 opened a new pull request #278:
URL: https://github.com/apache/tomcat/pull/278


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch 7.0.x updated: Add more descriptive error messages in DefaultServlet/JspServlet for SC_NOT_FOUND

2020-04-21 Thread michaelo

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new f73fe83  Add more descriptive error messages in 
DefaultServlet/JspServlet for SC_NOT_FOUND
f73fe83 is described below

commit f73fe83ee417106531e008ca924dec04e9ce3e29
Author: Michael Osipov 
AuthorDate: Tue Apr 21 15:49:59 2020 +0200

Add more descriptive error messages in DefaultServlet/JspServlet for 
SC_NOT_FOUND
---
 java/org/apache/catalina/servlets/DefaultServlet.java   | 6 --
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
 java/org/apache/jasper/servlet/JspServlet.java  | 8 +++-
 webapps/docs/changelog.xml  | 8 
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index a959844..fa2806c 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -849,7 +849,8 @@ public class DefaultServlet extends HttpServlet {
 response.sendError(((Integer) request.getAttribute(
 RequestDispatcher.ERROR_STATUS_CODE)).intValue());
 } else {
-response.sendError(HttpServletResponse.SC_NOT_FOUND);
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+sm.getString("defaultServlet.missingResource", 
requestUri));
 }
 return;
 }
@@ -885,7 +886,8 @@ public class DefaultServlet extends HttpServlet {
 // Skip directory listings if we have been configured to
 // suppress them
 if (!listings) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND);
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+sm.getString("defaultServlet.missingResource", 
request.getRequestURI()));
 return;
 }
 contentType = "text/html;charset=UTF-8";
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index df88df1..1220274 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -69,7 +69,7 @@ jsp.error.el_interpreter_class.instantiation=Failed to load 
or instantiate ELInt
 jsp.error.fallback.invalidUse=jsp:fallback must be a direct child of jsp:plugin
 jsp.error.file.already.registered=Recursive include of file [{0}]
 jsp.error.file.cannot.read=Cannot read file: [{0}]
-jsp.error.file.not.found=File [{0}] not found
+jsp.error.file.not.found=JSP file [{0}] not found
 jsp.error.file.not.registered=file [{0}] not seen in include
 jsp.error.flush=Exception occurred when flushing data
 jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as '{0}'
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index d6891ca..44a1c29 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -24,7 +24,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
 jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
 jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
 jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von 
jsp:plugin sein
-jsp.error.file.not.found=Datei [{0}] nicht gefunden
+jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
 jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
 jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]
 jsp.error.invalid.tagdir=Tag Verzeichnis [{0}] beginnt nicht mit 
"/WEB-INF/tags"
diff --git a/java/org/apache/jasper/servlet/JspServlet.java 
b/java/org/apache/jasper/servlet/JspServlet.java
index 0db97ed..13e2979 100644
--- a/java/org/apache/jasper/servlet/JspServlet.java
+++ b/java/org/apache/jasper/servlet/JspServlet.java
@@ -407,20 +407,18 @@ public class JspServlet extends HttpServlet implements 
PeriodicEventListener {
 String includeRequestUri =
 
(String)request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI);
 
+String msg = Localizer.getMessage("jsp.error.file.not.found",jspUri);
 if (includeRequestUri != null) {
 // This file was included. Throw an exception as
 // a response.sendError() will be ignored
-String msg =
-Localizer.getMessage("jsp.error.file.not.found",jspUri);

[tomcat] branch master updated: Add more descriptive error messages in DefaultServlet/JspServlet for SC_NOT_FOUND

2020-04-21 Thread michaelo

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new ddcc3dd  Add more descriptive error messages in 
DefaultServlet/JspServlet for SC_NOT_FOUND
ddcc3dd is described below

commit ddcc3ddabe7deddf84cd2d83e2a645b17becc66e
Author: Michael Osipov 
AuthorDate: Tue Apr 21 15:49:59 2020 +0200

Add more descriptive error messages in DefaultServlet/JspServlet for 
SC_NOT_FOUND
---
 java/org/apache/catalina/servlets/DefaultServlet.java   | 6 --
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
 java/org/apache/jasper/servlet/JspServlet.java  | 8 +++-
 webapps/docs/changelog.xml  | 8 
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index d0bb994..fe43c53 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -850,7 +850,8 @@ public class DefaultServlet extends HttpServlet {
 response.sendError(((Integer) request.getAttribute(
 RequestDispatcher.ERROR_STATUS_CODE)).intValue());
 } else {
-response.sendError(HttpServletResponse.SC_NOT_FOUND);
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+sm.getString("defaultServlet.missingResource", 
requestUri));
 }
 return;
 }
@@ -939,7 +940,8 @@ public class DefaultServlet extends HttpServlet {
 // Skip directory listings if we have been configured to
 // suppress them
 if (!listings) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND);
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+sm.getString("defaultServlet.missingResource", 
request.getRequestURI()));
 return;
 }
 contentType = "text/html;charset=UTF-8";
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index dedb9cb..d2f303c 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -74,7 +74,7 @@ jsp.error.el_interpreter_class.instantiation=Failed to load 
or instantiate ELInt
 jsp.error.fallback.invalidUse=jsp:fallback must be a direct child of jsp:plugin
 jsp.error.file.already.registered=Recursive include of file [{0}]
 jsp.error.file.cannot.read=Cannot read file: [{0}]
-jsp.error.file.not.found=File [{0}] not found
+jsp.error.file.not.found=JSP file [{0}] not found
 jsp.error.flush=Exception occurred when flushing data
 jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as '{0}'
 jsp.error.function.classnotfound=The class [{0}] specified in TLD for the 
function [{1}] cannot be found: [{2}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 591e5e9..bc7f582 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -28,7 +28,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
 jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
 jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
 jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von 
jsp:plugin sein
-jsp.error.file.not.found=Datei [{0}] nicht gefunden
+jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
 jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
 jsp.error.internal.unexpectedNodeType=Unerwarteter Knotentyp
 jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]
diff --git a/java/org/apache/jasper/servlet/JspServlet.java 
b/java/org/apache/jasper/servlet/JspServlet.java
index 2e13ccc..ab572b1 100644
--- a/java/org/apache/jasper/servlet/JspServlet.java
+++ b/java/org/apache/jasper/servlet/JspServlet.java
@@ -398,20 +398,18 @@ public class JspServlet extends HttpServlet implements 
PeriodicEventListener {
 String includeRequestUri =
 
(String)request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI);
 
+String msg = Localizer.getMessage("jsp.error.file.not.found",jspUri);
 if (includeRequestUri != null) {
 // This file was included. Throw an exception as
 // a response.sendError() will be ignored
-String msg =
-

[tomcat] branch 8.5.x updated: Add more descriptive error messages in DefaultServlet/JspServlet for SC_NOT_FOUND

2020-04-21 Thread michaelo

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 70544d1  Add more descriptive error messages in 
DefaultServlet/JspServlet for SC_NOT_FOUND
70544d1 is described below

commit 70544d11b0b96b8fe8a5e09cb5df86015ee3cb40
Author: Michael Osipov 
AuthorDate: Tue Apr 21 15:49:59 2020 +0200

Add more descriptive error messages in DefaultServlet/JspServlet for 
SC_NOT_FOUND
---
 java/org/apache/catalina/servlets/DefaultServlet.java   | 6 --
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
 java/org/apache/jasper/servlet/JspServlet.java  | 8 +++-
 webapps/docs/changelog.xml  | 8 
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index cacf06c..2e7bc46 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -857,7 +857,8 @@ public class DefaultServlet extends HttpServlet {
 response.sendError(((Integer) request.getAttribute(
 RequestDispatcher.ERROR_STATUS_CODE)).intValue());
 } else {
-response.sendError(HttpServletResponse.SC_NOT_FOUND);
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+sm.getString("defaultServlet.missingResource", 
requestUri));
 }
 return;
 }
@@ -946,7 +947,8 @@ public class DefaultServlet extends HttpServlet {
 // Skip directory listings if we have been configured to
 // suppress them
 if (!listings) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND);
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+sm.getString("defaultServlet.missingResource", 
request.getRequestURI()));
 return;
 }
 contentType = "text/html;charset=UTF-8";
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 0736ae9..edd2477 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -68,7 +68,7 @@ jsp.error.el_interpreter_class.instantiation=Failed to load 
or instantiate ELInt
 jsp.error.fallback.invalidUse=jsp:fallback must be a direct child of jsp:plugin
 jsp.error.file.already.registered=Recursive include of file [{0}]
 jsp.error.file.cannot.read=Cannot read file: [{0}]
-jsp.error.file.not.found=File [{0}] not found
+jsp.error.file.not.found=JSP file [{0}] not found
 jsp.error.flush=Exception occurred when flushing data
 jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as '{0}'
 jsp.error.function.classnotfound=The class [{0}] specified in TLD for the 
function [{1}] cannot be found: [{2}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 826a08b..561324d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -24,7 +24,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
 jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
 jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
 jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von 
jsp:plugin sein
-jsp.error.file.not.found=Datei [{0}] nicht gefunden
+jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
 jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
 jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]
 jsp.error.invalid.tagdir=Tag Verzeichnis [{0}] beginnt nicht mit 
"/WEB-INF/tags"
diff --git a/java/org/apache/jasper/servlet/JspServlet.java 
b/java/org/apache/jasper/servlet/JspServlet.java
index 3407aef..ab419d7 100644
--- a/java/org/apache/jasper/servlet/JspServlet.java
+++ b/java/org/apache/jasper/servlet/JspServlet.java
@@ -398,20 +398,18 @@ public class JspServlet extends HttpServlet implements 
PeriodicEventListener {
 String includeRequestUri =
 
(String)request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI);
 
+String msg = Localizer.getMessage("jsp.error.file.not.found",jspUri);
 if (includeRequestUri != null) {
 // This file was included. Throw an exception as
 // a response.sendError() will be ignored
-String msg =
-

[tomcat] branch 9.0.x updated: Add more descriptive error messages in DefaultServlet/JspServlet for SC_NOT_FOUND

2020-04-21 Thread michaelo

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 564434d  Add more descriptive error messages in 
DefaultServlet/JspServlet for SC_NOT_FOUND
564434d is described below

commit 564434dff163832149ceebb02ee9a20bdf889a7c
Author: Michael Osipov 
AuthorDate: Tue Apr 21 15:49:59 2020 +0200

Add more descriptive error messages in DefaultServlet/JspServlet for 
SC_NOT_FOUND
---
 java/org/apache/catalina/servlets/DefaultServlet.java   | 6 --
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
 java/org/apache/jasper/servlet/JspServlet.java  | 8 +++-
 webapps/docs/changelog.xml  | 8 
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index a7968b1..ebb622a 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -850,7 +850,8 @@ public class DefaultServlet extends HttpServlet {
 response.sendError(((Integer) request.getAttribute(
 RequestDispatcher.ERROR_STATUS_CODE)).intValue());
 } else {
-response.sendError(HttpServletResponse.SC_NOT_FOUND);
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+sm.getString("defaultServlet.missingResource", 
requestUri));
 }
 return;
 }
@@ -939,7 +940,8 @@ public class DefaultServlet extends HttpServlet {
 // Skip directory listings if we have been configured to
 // suppress them
 if (!listings) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND);
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+sm.getString("defaultServlet.missingResource", 
request.getRequestURI()));
 return;
 }
 contentType = "text/html;charset=UTF-8";
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 2443f05..392b0e2 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -74,7 +74,7 @@ jsp.error.el_interpreter_class.instantiation=Failed to load 
or instantiate ELInt
 jsp.error.fallback.invalidUse=jsp:fallback must be a direct child of jsp:plugin
 jsp.error.file.already.registered=Recursive include of file [{0}]
 jsp.error.file.cannot.read=Cannot read file: [{0}]
-jsp.error.file.not.found=File [{0}] not found
+jsp.error.file.not.found=JSP file [{0}] not found
 jsp.error.flush=Exception occurred when flushing data
 jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as '{0}'
 jsp.error.function.classnotfound=The class [{0}] specified in TLD for the 
function [{1}] cannot be found: [{2}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 591e5e9..bc7f582 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -28,7 +28,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
 jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
 jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
 jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von 
jsp:plugin sein
-jsp.error.file.not.found=Datei [{0}] nicht gefunden
+jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
 jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
 jsp.error.internal.unexpectedNodeType=Unerwarteter Knotentyp
 jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]
diff --git a/java/org/apache/jasper/servlet/JspServlet.java 
b/java/org/apache/jasper/servlet/JspServlet.java
index db93257..ae9788b 100644
--- a/java/org/apache/jasper/servlet/JspServlet.java
+++ b/java/org/apache/jasper/servlet/JspServlet.java
@@ -397,20 +397,18 @@ public class JspServlet extends HttpServlet implements 
PeriodicEventListener {
 String includeRequestUri =
 
(String)request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI);
 
+String msg = Localizer.getMessage("jsp.error.file.not.found",jspUri);
 if (includeRequestUri != null) {
 // This file was included. Throw an exception as
 // a response.sendError() will be ignored
-String msg =
-

[tomcat-jakartaee-migration] branch master updated: Change the curve of the EC key to run the tests on OpenJDK 15 or later

2020-04-21 Thread ebourg

This is an automated email from the ASF dual-hosted git repository.

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 102f42a  Change the curve of the EC key to run the tests on OpenJDK 15 
or later
102f42a is described below

commit 102f42ade3e94a14e64e20ce187295c4a4597674
Author: Emmanuel Bourg 
AuthorDate: Tue Apr 21 15:26:40 2020 +0200

Change the curve of the EC key to run the tests on OpenJDK 15 or later
---
 pom.xml |   7 +++
 src/test/resources/keystore.p12 | Bin 3848 -> 3450 bytes
 2 files changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3ddfc68..6aaa90d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,13 @@
   
 
 
+
+
 
   
 
diff --git a/src/test/resources/keystore.p12 b/src/test/resources/keystore.p12
index 6f1cf7a..8332948 100644
Binary files a/src/test/resources/keystore.p12 and 
b/src/test/resources/keystore.p12 differ


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

Re: StoreConfig and creating context.xml files

2020-04-21 Thread Rémy Maucherat

On Tue, Apr 21, 2020 at 9:27 AM Mark Thomas  wrote:

> On 20/04/2020 23:01, Rémy Maucherat wrote:
> > On Mon, Apr 20, 2020 at 9:46 PM Mark Thomas  > > wrote:
> >
> > Hi,
> >
> > I'm working in the issue reported on users@
> >
> > I've fixed the errors described there and have got to the point where
> > StoreConfig.store(Context) is being called but the call fails if the
> > Context doesn't already have a configuration file. Is this intended?
> The
> > docs suggest that the file will be created if necessary.
> >
> > What is meant to happen in this case?
> >
> >
> > No idea, probably it's supposed to create the file.
>
> OK. Good to know I wasn't missing anything. I'll see what I can do.
>

I'm quite sure I never tested this, the method was still there from the old
storeconfig and that's it. The main "save Server" did work and saves
context.xml files for each context, so I can confirm again it is the
consistent thing to do.

Rémy


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

[Bug 64366] [sse] NPE while closing async http/2 connector

2020-04-21 Thread bugzilla

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

--- Comment #2 from Claude Brisson  ---
Created attachment 37190
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37190=edit
Servlet keeping running services

-- 
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 64366] [sse] NPE while closing async http/2 connector

2020-04-21 Thread bugzilla

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

--- Comment #3 from Claude Brisson  ---
The web application *should* close long-living connections, and tomcat *should*
report the problem, I agree.

The point is whether tomcat can do better than report an NPE.

I attached a simple servlet.

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

buildbot success in on tomcat-9-trunk

2020-04-21 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/183

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 22c0ead83368f206d07c7cdf0170d29073ceb4aa
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[GitHub] [tomcat] michael-o commented on a change in pull request #277: Filter invalid HTTP 2.0 headers from response

2020-04-21 Thread GitBox



michael-o commented on a change in pull request #277:
URL: https://github.com/apache/tomcat/pull/277#discussion_r412098476



##
File path: java/org/apache/coyote/Response.java
##
@@ -435,6 +435,20 @@ private boolean checkSpecialHeader( String name, String 
value) {
 return false;
 }
 }
+
+if (outputBuffer instanceof Http2OutputBuffer && 
name.equalsIgnoreCase("Connection") ) {
+
+/*
+ *Connection headers are invalid in HTTP/2.0, and some clients 
(like Safari or curl)
+ *are very touchy about it. Most probably, an application 
component has added the
+ *typical HTTP/1.x "Connection: keep-alive" header, but 
despide the component's
+ *good intention, the header is faulty in HTTP/2.0 and 
*should* be refused.
+ * .
+ *@see https: *tools.ietf.org/html/rfc7540#section-8.1.2.2

Review comment:
   URL is broken

##
File path: java/org/apache/coyote/Response.java
##
@@ -435,6 +435,20 @@ private boolean checkSpecialHeader( String name, String 
value) {
 return false;
 }
 }
+
+if (outputBuffer instanceof Http2OutputBuffer && 
name.equalsIgnoreCase("Connection") ) {
+
+/*
+ *Connection headers are invalid in HTTP/2.0, and some clients 
(like Safari or curl)

Review comment:
   Please to HTTP/2. There is not HTTP/2.0.

##
File path: java/org/apache/coyote/Response.java
##
@@ -435,6 +435,20 @@ private boolean checkSpecialHeader( String name, String 
value) {
 return false;
 }
 }
+
+if (outputBuffer instanceof Http2OutputBuffer && 
name.equalsIgnoreCase("Connection") ) {
+
+/*
+ *Connection headers are invalid in HTTP/2.0, and some clients 
(like Safari or curl)
+ *are very touchy about it. Most probably, an application 
component has added the
+ *typical HTTP/1.x "Connection: keep-alive" header, but 
despide the component's

Review comment:
   despite





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] 01/02: Add missing JARs. Patch provided by Brian Burch.

2020-04-21 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e5cf33b8ab264368f523d08af5d84bddbaa989b0
Author: Mark Thomas 
AuthorDate: Tue Apr 21 10:05:45 2020 +0100

Add missing JARs. Patch provided by Brian Burch.
---
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 webapps/docs/changelog.xml  | 4 
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 7e083e6..336306a 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 609766b..f4c25ee 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
 1.7
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a9e8226..eadcc1f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -96,6 +96,10 @@
   
 Update JUnit to version 4.13. (markt)
   
+  
+Add missing entries to test class path in sample NetBeans configuration
+files. Patch provided by Brian Burch. (markt)
+  
 
   
 


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

[tomcat] branch 8.5.x updated (acd0cc3 -> 4815be4)

2020-04-21 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from acd0cc3  Log a warning if addind CredentialHandler to CombinedRealm
 new e5cf33b  Add missing JARs. Patch provided by Brian Burch.
 new 4815be4  Fix saving of context.xml file from Manager app

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../catalina/manager/LocalStrings.properties   |  1 +
 .../apache/catalina/manager/ManagerServlet.java| 11 +---
 .../apache/catalina/storeconfig/StoreConfig.java   | 31 +-
 .../catalina/storeconfig/mbeans-descriptors.xml|  2 +-
 .../netbeans/nb-tomcat-build.properties|  2 +-
 res/ide-support/netbeans/project.xml   |  2 +-
 webapps/docs/changelog.xml | 12 +
 7 files changed, 36 insertions(+), 25 deletions(-)


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

[tomcat] 02/02: Fix saving of context.xml file from Manager app

2020-04-21 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 4815be414ab82af37fca351422b9af82a175aa15
Author: Mark Thomas 
AuthorDate: Tue Apr 21 11:50:51 2020 +0100

Fix saving of context.xml file from Manager app
---
 .../catalina/manager/LocalStrings.properties   |  1 +
 .../apache/catalina/manager/ManagerServlet.java| 11 +---
 .../apache/catalina/storeconfig/StoreConfig.java   | 31 +-
 .../catalina/storeconfig/mbeans-descriptors.xml|  2 +-
 webapps/docs/changelog.xml |  8 ++
 5 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index 34a63a5..91c3697 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -150,6 +150,7 @@ managerServlet.resourcesType=OK - Listed global resources 
of type [{0}]
 managerServlet.saveFail=FAIL - Configuration save failed: [{0}]
 managerServlet.saved=OK - Server configuration saved
 managerServlet.savedContext=OK - Context [{0}] configuration saved
+managerServlet.savedContextFail=FAIL - Context [{0}] configuration save failed
 managerServlet.serverInfo=OK - Server info\n\
 Tomcat Version: [{0}]\n\
 OS Name: [{1}]\n\
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java 
b/java/org/apache/catalina/manager/ManagerServlet.java
index 73f3593..41ca512 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -703,11 +703,14 @@ public class ManagerServlet extends HttpServlet 
implements ContainerServlet {
 return;
 }
 try {
-mBeanServer.invoke(storeConfigOname, "store",
+Boolean result = (Boolean) 
mBeanServer.invoke(storeConfigOname, "store",
 new Object[] {context},
-new String [] { "java.lang.String"});
-
writer.println(smClient.getString("managerServlet.savedContext",
-path));
+new String [] { "org.apache.catalina.Context"});
+if (result.booleanValue()) {
+
writer.println(smClient.getString("managerServlet.savedContext", path));
+} else {
+
writer.println(smClient.getString("managerServlet.savedContextFail", path));
+}
 } catch (Exception e) {
 log("managerServlet.save[" + path + "]", e);
 writer.println(smClient.getString("managerServlet.exception",
diff --git a/java/org/apache/catalina/storeconfig/StoreConfig.java 
b/java/org/apache/catalina/storeconfig/StoreConfig.java
index 8a0fcad..0f0ddcd 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfig.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfig.java
@@ -253,26 +253,21 @@ public class StoreConfig implements IStoreConfig {
  */
 @Override
 public synchronized boolean store(Context aContext) {
-URL configFile = aContext.getConfigFile();
-if (configFile != null) {
-try {
-StoreDescription desc = null;
-desc = getRegistry().findDescription(aContext.getClass());
-if (desc != null) {
-boolean old = desc.isStoreSeparate();
-try {
-desc.setStoreSeparate(true);
-desc.getStoreFactory().store(null, -2, aContext);
-} finally {
-desc.setStoreSeparate(old);
-}
+try {
+StoreDescription desc = null;
+desc = getRegistry().findDescription(aContext.getClass());
+if (desc != null) {
+boolean old = desc.isStoreSeparate();
+try {
+desc.setStoreSeparate(true);
+desc.getStoreFactory().store(null, -2, aContext);
+} finally {
+desc.setStoreSeparate(old);
 }
-return true;
-} catch (Exception e) {
-log.error(sm.getString("config.storeContextError", 
aContext.getName()), e);
 }
-} else {
-log.error("Missing configFile at Context " + aContext.getPath());
+return true;
+} catch (Exception e) {
+log.error(sm.getString("config.storeContextError", 
aContext.getName()), e);
 }
 return false;
 }
diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml 
b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
index bec2fc2..f0f402d 100644
--- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
+++

[tomcat] branch 9.0.x updated: Fix saving of context.xml file from Manager app

2020-04-21 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 22c0ead  Fix saving of context.xml file from Manager app
22c0ead is described below

commit 22c0ead83368f206d07c7cdf0170d29073ceb4aa
Author: Mark Thomas 
AuthorDate: Tue Apr 21 11:50:51 2020 +0100

Fix saving of context.xml file from Manager app
---
 .../catalina/manager/LocalStrings.properties   |  1 +
 .../apache/catalina/manager/ManagerServlet.java| 11 +---
 .../apache/catalina/storeconfig/StoreConfig.java   | 31 +-
 .../catalina/storeconfig/mbeans-descriptors.xml|  2 +-
 webapps/docs/changelog.xml |  8 ++
 5 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index 001e73b..96f28d3 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -165,6 +165,7 @@ managerServlet.resourcesType=OK - Listed global resources 
of type [{0}]
 managerServlet.saveFail=FAIL - Configuration save failed: [{0}]
 managerServlet.saved=OK - Server configuration saved
 managerServlet.savedContext=OK - Context [{0}] configuration saved
+managerServlet.savedContextFail=FAIL - Context [{0}] configuration save failed
 managerServlet.serverInfo=OK - Server info\n\
 Tomcat Version: [{0}]\n\
 OS Name: [{1}]\n\
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java 
b/java/org/apache/catalina/manager/ManagerServlet.java
index 1e3c7b4..3606c4c 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -710,11 +710,14 @@ public class ManagerServlet extends HttpServlet 
implements ContainerServlet {
 return;
 }
 try {
-mBeanServer.invoke(storeConfigOname, "store",
+Boolean result = (Boolean) 
mBeanServer.invoke(storeConfigOname, "store",
 new Object[] {context},
-new String [] { "java.lang.String"});
-
writer.println(smClient.getString("managerServlet.savedContext",
-path));
+new String [] { "org.apache.catalina.Context"});
+if (result.booleanValue()) {
+
writer.println(smClient.getString("managerServlet.savedContext", path));
+} else {
+
writer.println(smClient.getString("managerServlet.savedContextFail", path));
+}
 } catch (Exception e) {
 log(sm.getString("managerServlet.error.storeContextConfig", 
path), e);
 writer.println(smClient.getString("managerServlet.exception",
diff --git a/java/org/apache/catalina/storeconfig/StoreConfig.java 
b/java/org/apache/catalina/storeconfig/StoreConfig.java
index 8708fe9..3d3cba1 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfig.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfig.java
@@ -241,26 +241,21 @@ public class StoreConfig implements IStoreConfig {
  */
 @Override
 public synchronized boolean store(Context aContext) {
-URL configFile = aContext.getConfigFile();
-if (configFile != null) {
-try {
-StoreDescription desc = null;
-desc = getRegistry().findDescription(aContext.getClass());
-if (desc != null) {
-boolean old = desc.isStoreSeparate();
-try {
-desc.setStoreSeparate(true);
-desc.getStoreFactory().store(null, -2, aContext);
-} finally {
-desc.setStoreSeparate(old);
-}
+try {
+StoreDescription desc = null;
+desc = getRegistry().findDescription(aContext.getClass());
+if (desc != null) {
+boolean old = desc.isStoreSeparate();
+try {
+desc.setStoreSeparate(true);
+desc.getStoreFactory().store(null, -2, aContext);
+} finally {
+desc.setStoreSeparate(old);
 }
-return true;
-} catch (Exception e) {
-log.error(sm.getString("config.storeContextError", 
aContext.getName()), e);
 }
-} else {
-log.error(sm.getString("config.missingContextFile", 
aContext.getPath()));
+return true;
+} catch (Exception e) {
+log.error(sm.getString("config.storeContextError", 
aContext.getName()), e);
 }
 return false;
 }
diff --git

[tomcat] branch master updated: Fix saving of context.xml file from Manager app

2020-04-21 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 1a03823  Fix saving of context.xml file from Manager app
1a03823 is described below

commit 1a0382392e318854ec84e3981d30cec35bc4f347
Author: Mark Thomas 
AuthorDate: Tue Apr 21 11:50:51 2020 +0100

Fix saving of context.xml file from Manager app
---
 .../catalina/manager/LocalStrings.properties   |  1 +
 .../apache/catalina/manager/ManagerServlet.java| 11 +---
 .../apache/catalina/storeconfig/StoreConfig.java   | 31 +-
 .../catalina/storeconfig/mbeans-descriptors.xml|  2 +-
 webapps/docs/changelog.xml |  8 ++
 5 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index 001e73b..96f28d3 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -165,6 +165,7 @@ managerServlet.resourcesType=OK - Listed global resources 
of type [{0}]
 managerServlet.saveFail=FAIL - Configuration save failed: [{0}]
 managerServlet.saved=OK - Server configuration saved
 managerServlet.savedContext=OK - Context [{0}] configuration saved
+managerServlet.savedContextFail=FAIL - Context [{0}] configuration save failed
 managerServlet.serverInfo=OK - Server info\n\
 Tomcat Version: [{0}]\n\
 OS Name: [{1}]\n\
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java 
b/java/org/apache/catalina/manager/ManagerServlet.java
index 5c87831..44f0db5 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -711,11 +711,14 @@ public class ManagerServlet extends HttpServlet 
implements ContainerServlet {
 return;
 }
 try {
-mBeanServer.invoke(storeConfigOname, "store",
+Boolean result = (Boolean) 
mBeanServer.invoke(storeConfigOname, "store",
 new Object[] {context},
-new String [] { "java.lang.String"});
-
writer.println(smClient.getString("managerServlet.savedContext",
-path));
+new String [] { "org.apache.catalina.Context"});
+if (result.booleanValue()) {
+
writer.println(smClient.getString("managerServlet.savedContext", path));
+} else {
+
writer.println(smClient.getString("managerServlet.savedContextFail", path));
+}
 } catch (Exception e) {
 log(sm.getString("managerServlet.error.storeContextConfig", 
path), e);
 writer.println(smClient.getString("managerServlet.exception",
diff --git a/java/org/apache/catalina/storeconfig/StoreConfig.java 
b/java/org/apache/catalina/storeconfig/StoreConfig.java
index 8708fe9..3d3cba1 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfig.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfig.java
@@ -241,26 +241,21 @@ public class StoreConfig implements IStoreConfig {
  */
 @Override
 public synchronized boolean store(Context aContext) {
-URL configFile = aContext.getConfigFile();
-if (configFile != null) {
-try {
-StoreDescription desc = null;
-desc = getRegistry().findDescription(aContext.getClass());
-if (desc != null) {
-boolean old = desc.isStoreSeparate();
-try {
-desc.setStoreSeparate(true);
-desc.getStoreFactory().store(null, -2, aContext);
-} finally {
-desc.setStoreSeparate(old);
-}
+try {
+StoreDescription desc = null;
+desc = getRegistry().findDescription(aContext.getClass());
+if (desc != null) {
+boolean old = desc.isStoreSeparate();
+try {
+desc.setStoreSeparate(true);
+desc.getStoreFactory().store(null, -2, aContext);
+} finally {
+desc.setStoreSeparate(old);
 }
-return true;
-} catch (Exception e) {
-log.error(sm.getString("config.storeContextError", 
aContext.getName()), e);
 }
-} else {
-log.error(sm.getString("config.missingContextFile", 
aContext.getPath()));
+return true;
+} catch (Exception e) {
+log.error(sm.getString("config.storeContextError", 
aContext.getName()), e);
 }
 return false;
 }
diff --git

[GitHub] [tomcat] arkanovicz commented on issue #277: Filter invalid HTTP 2.0 headers from response

2020-04-21 Thread GitBox



arkanovicz commented on issue #277:
URL: https://github.com/apache/tomcat/pull/277#issuecomment-617075551


   > Could you expand the SSE acronym please. I want to make sure I understand 
you correctly.
   
   [Server-Side 
Events](https://html.spec.whatwg.org/multipage/server-sent-events.html)
   
   > Code format issues are opening braces `{` should not be on a new line and 
multi-line comments either use `//` before every line or, if the `/* ... */` 
style is used each intermediate line starts with an aligned `*`
   
   Ok, noted.
   
   > More generally...
   > 
   > It would be worth reviewing the HTTP/2 spec to check if there are any 
other headers that are invalid for HTTP/2.
   
   To my knowledge, only the Connection headers.
   
   > The global blocking off applications setting Connection headers seems 
reasonable at first consideration but needs more thought/review in case there 
are use cases where it is arguably valid / necessary to do so.
   
   At best, if the faulty header doesn't provoke an error (required by the 
specs), it will be ignored. Here's what the spec says:
   
   > Intermediaries that process HTTP requests or responses (i.e., any 
intermediary not acting as a tunnel) MUST NOT forward a malformed request or 
response. Malformed requests or responses that are detected MUST be treated as 
a stream error (Section 5.4.2) of type PROTOCOL_ERROR.
   
   > For malformed requests, a server MAY send an HTTP response prior to 
closing or resetting the stream. Clients MUST NOT accept a malformed response. 
Note that these requirements are intended to protect against several types of 
common attacks against HTTP; they are deliberately strict because being 
permissive can expose implementations to these vulnerabilities.
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

buildbot failure in on tomcat-9-trunk

2020-04-21 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/182

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 8e63f02dc43ea327a6e281d9af42332c37af26af
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[GitHub] [tomcat] arkanovicz commented on a change in pull request #277: Filter invalid HTTP 2.0 headers from response

2020-04-21 Thread GitBox



arkanovicz commented on a change in pull request #277:
URL: https://github.com/apache/tomcat/pull/277#discussion_r412030387



##
File path: java/org/apache/coyote/Response.java
##
@@ -61,6 +62,11 @@
  */
 private static final Locale DEFAULT_LOCALE = Locale.getDefault();
 
+/**
+ * Helper to log the invalid HTTP/2.0 header error only once per instance
+ */
+private static AtomicBoolean invalidHeaderWarningEmitted = new 
AtomicBoolean(false);

Review comment:
   @martin-g It's a langage abuse. Per instance of running tomcat, sorry. 
Anyhow, @rmaucher suggestion to just throw the exception is simpler, so the 
AtomicBoolean is deprecated.
   





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[Bug 64366] [sse] NPE while closing async http/2 connector

2020-04-21 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #1 from Mark Thomas  ---
Tomcat should be signalling that the web application is stopping enabling the
application to stop cleanly.

What I can't tell is whether Tomcat isn't sending that notification, is sending
it to late or if the application isn't handling it correctly.

Can you please provide the simplest possible web application that reproduces
this issue on the latest 9.0.x release (or latest 7.0.x, 8.5.x or 10.0.x if
that is easier) so we can reproduce this issue. Thanks.

-- 
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 64335] org.apache.catalina.realm.TestJNDIRealm debug fails missing dependent jars

2020-04-21 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Thanks for the patch.

Fixed in:
- master for 10.0.0-M5 onwards
- 9.0.x for 9.0.35 onwards
- 8.5.x for 8.5.55 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

[tomcat] branch 9.0.x updated: Add missing JARs. Patch provided by Brian Burch.

2020-04-21 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 8e63f02  Add missing JARs. Patch provided by Brian Burch.
8e63f02 is described below

commit 8e63f02dc43ea327a6e281d9af42332c37af26af
Author: Mark Thomas 
AuthorDate: Tue Apr 21 10:05:45 2020 +0100

Add missing JARs. Patch provided by Brian Burch.
---
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 webapps/docs/changelog.xml  | 4 
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 6897798..beb4276 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 8e71143..c2809e7 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
 1.7
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 50b57a9..49c8606 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -94,6 +94,10 @@
   
 Update JUnit to version 4.13. (markt)
   
+  
+Add missing entries to test class path in sample NetBeans configuration
+files. Patch provided by Brian Burch. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Add missing JARs. Patch provided by Brian Burch.

2020-04-21 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 8ab1eec  Add missing JARs. Patch provided by Brian Burch.
8ab1eec is described below

commit 8ab1eec3e3a1bd08b8da9a192c228fe62334ab42
Author: Mark Thomas 
AuthorDate: Tue Apr 21 10:05:45 2020 +0100

Add missing JARs. Patch provided by Brian Burch.
---
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 webapps/docs/changelog.xml  | 4 
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 6897798..beb4276 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 8e71143..c2809e7 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
 1.7
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a333475..4bbb5c6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -109,6 +109,10 @@
   
 Update JUnit to version 4.13. (markt)
   
+  
+Add missing entries to test class path in sample NetBeans configuration
+files. Patch provided by Brian Burch. (markt)
+  
 
   
 


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

[Bug 64335] org.apache.catalina.realm.TestJNDIRealm debug fails missing dependent jars

2020-04-21 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

  Attachment #37164|0   |1
   is patch||

--- Comment #1 from Mark Thomas  ---
Comment on attachment 37164
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37164
diffs to netbeans test classpaths

Mark attachment as a patch (enables easier viewing)

-- 
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 64312] Many memberDisappeared messages are logged on all nodes of the cluster with JDK versions 12 or above, even when system is idle

2020-04-21 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |WORKSFORME
 Status|REOPENED|RESOLVED

--- Comment #7 from Mark Thomas  ---
I've retested this with a 4 node cluster of 8.5.x using the defaults from the
documentation with dropTime as low as 1000ms with Adopt OpenJDK 14_36 and I
don't see this issue.

The evidence so far isn't pointing towards a Tomcat issue. If you want help
debugging this further, the users list is the place to seek such help.

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

[GitHub] [tomcat] martin-g commented on a change in pull request #277: Filter invalid HTTP 2.0 headers from response

2020-04-21 Thread GitBox



martin-g commented on a change in pull request #277:
URL: https://github.com/apache/tomcat/pull/277#discussion_r411969053



##
File path: java/org/apache/coyote/Response.java
##
@@ -61,6 +62,11 @@
  */
 private static final Locale DEFAULT_LOCALE = Locale.getDefault();
 
+/**
+ * Helper to log the invalid HTTP/2.0 header error only once per instance
+ */
+private static AtomicBoolean invalidHeaderWarningEmitted = new 
AtomicBoolean(false);

Review comment:
   `per instance` of what ? Because you use `static` here, so it is on 
class loader level.





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

Re: StoreConfig and creating context.xml files

2020-04-21 Thread Mark Thomas

On 20/04/2020 23:01, Rémy Maucherat wrote:
> On Mon, Apr 20, 2020 at 9:46 PM Mark Thomas  > wrote:
> 
> Hi,
> 
> I'm working in the issue reported on users@
> 
> I've fixed the errors described there and have got to the point where
> StoreConfig.store(Context) is being called but the call fails if the
> Context doesn't already have a configuration file. Is this intended? The
> docs suggest that the file will be created if necessary.
> 
> What is meant to happen in this case?
> 
> 
> No idea, probably it's supposed to create the file.

OK. Good to know I wasn't missing anything. I'll see what I can do.

Mark

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

[GitHub] [tomcat] martin-g commented on a change in pull request #276: Add s390x Travis support

2020-04-21 Thread GitBox



martin-g commented on a change in pull request #276:
URL: https://github.com/apache/tomcat/pull/276#discussion_r411923652



##
File path: .travis.yml
##
@@ -32,14 +36,7 @@ addons:
 - libtool-bin
 
 install:
-- ARCH=`uname -p`
-- echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz;
-- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else 
JDK_URL=$JDK_X64; fi
-- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
-- mv jdk8* jdk
-- export JAVA_HOME=`pwd`/jdk

Review comment:
   The above was here for two reasons:
   1) because TravisCI is really inconsistent in what is available in the 
different types of VMs
   1.1) JAVA_HOME is exported for AMD64, but not for ARM64
   1.2) `mvn` is available for AMD64, but not for ARM
   1.3.) most important - to keep the version of the used JDK the same for all 
environments. The one provided by Travis for ARM64 was older than the one for 
AMD64
   
   For the above reasons I'd prefer to keep the control

##
File path: .travis.yml
##
@@ -15,8 +15,12 @@
 
 dist: bionic
 language: java
-jdk: oraclejdk8
-arch: arm64
+jobs:
+include:
+  - arch: s390x
+jdk: openjdk11

Review comment:
   any reason to use JDK 11 for s390x ? 





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on issue #277: Filter invalid HTTP 2.0 headers from response

2020-04-21 Thread GitBox



markt-asf commented on issue #277:
URL: https://github.com/apache/tomcat/pull/277#issuecomment-616991103


   @arkanovicz 
   You can ignore requests to retest this. I was able to recreate the issue 
with curl using the steps you describe.
   Could you expand the SSE acronym please. I want to make sure I understand 
you correctly.
   Code format issues are opening braces `{` should not be on a new line and 
multi-line comments either use `//` before every line or, if the `/* ... */` 
style is used each intermediate line starts with an aligned `*`
   
   More generally...
   
   It would be worth reviewing the HTTP/2 spec to check if there are any other 
headers that are invalid for HTTP/2.
   
   The global blocking off applications setting Connection headers seems 
reasonable at first consideration but needs more thought/review in case there 
are use cases where it is arguably valid / necessary to do so.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

38 matches

Mail list logo