Position on failing tests with vendor-modified OpenSSL packages

[Michael Osipov]

Folks,

I run test from Tomcat master and libtcnative master on FreeBSD, RHEL 7 
and HP-UX 11.31 on a regular basis and noticed that the OpenSSL 1.0.2 
packages provided by Red Hat and HPE are modified which make several 
tests fail. See an excerpt here [1].
To verify this I have compiled OpenSSL from OpenSSL_1_0_2-stable on 
FreeBSD w/o any modification and all tests pass, so other must have 
modified OpenSSL.


What is our position in terms of support/testing for modified OpenSSL 
packages from OS vendors? Should we add a big fat warning somewhere? Add 
this to tcnative README that we test/recommend upstream only?


[1] http://home.apache.org/~michaelo/issues/openssl-tests/

-
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 pull request #282: Improve IDE support for IntelliJ IDEA

[GitBox]

michael-o commented on pull request #282:
URL: https://github.com/apache/tomcat/pull/282#issuecomment-618717780


   Please skim to IDEA only.



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-native] branch master updated: Fix linking against OpenSSL in non-standard locations on FreeBSD

[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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new 692dd48  Fix linking against OpenSSL in non-standard locations on 
FreeBSD
692dd48 is described below

commit 692dd48da587ebead9f03f1a00bc3a7a17108b19
Author: Michael Osipov 
AuthorDate: Fri Apr 24 00:52:12 2020 +0200

Fix linking against OpenSSL in non-standard locations on FreeBSD

When libtcnative is configured with OpenSSL from a non-standard location the
linker fails to find libssl/libcrypto because the run path is not embedded
into the executable. Use the same approach as on GNU/Linux by passing 
'-rpath'
followed by the path to the linker.
---
 native/build/tcnative.m4  | 2 +-
 xdocs/miscellaneous/changelog.xml | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4
index 3047371..b99fe93 100644
--- a/native/build/tcnative.m4
+++ b/native/build/tcnative.m4
@@ -220,7 +220,7 @@ case "$use_openssl" in
 ssllibdir=lib/hpux32
 TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir -Wl,+b: -lssl 
-lcrypto"
 ;;
-*linux*)
+*linux*|*freebsd*)
 TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir 
-Wl,-rpath,$use_openssl/$ssllibdir -lssl -lcrypto"
 ;;
 *)
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index a04005a..74c964f 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -64,6 +64,10 @@ This will have been 
 
   Introduce tcn_get_thread_id(void) to reduce code duplication. (michaelo)
 
+
+  Fix linking against OpenSSL in non-standard locations on FreeBSD.
+  (michaelo)
+
   
 
 


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

[tomcat-native] branch master updated: Introduce tcn_get_thread_id(void) to reduce code duplication

[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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new f95f531  Introduce tcn_get_thread_id(void) to reduce code duplication
f95f531 is described below

commit f95f531e98278cc7555367084b967e3550734559
Author: Michael Osipov 
AuthorDate: Thu Apr 23 18:52:44 2020 +0200

Introduce tcn_get_thread_id(void) to reduce code duplication

At two spots (ssl.c and thread.c) we need to obtain the native thread id.
This has been done with two different approaches. Move out to
tcn_get_thread(void) which uses the previous ssl_thread_id(void) 
implementation
while the previous functions delegate to the new one. 
apr_os_thread_current(void)
is not used anymore which does internally the same thing as 
ssl_thread_id(void)
was doing.

Also add properly #ifdefs for Windows and macOS for function prototype 
includes.
---
 native/include/tcn.h  |  1 +
 native/src/jnilib.c   | 45 +++
 native/src/ssl.c  | 33 +---
 native/src/thread.c   |  3 ++-
 xdocs/miscellaneous/changelog.xml |  5 -
 5 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/native/include/tcn.h b/native/include/tcn.h
index 2b2ae59..d2f316b 100644
--- a/native/include/tcn.h
+++ b/native/include/tcn.h
@@ -175,6 +175,7 @@ char   *tcn_strdup(JNIEnv *, jstring);
 char   *tcn_pstrdup(JNIEnv *, jstring, apr_pool_t *);
 apr_status_ttcn_load_finfo_class(JNIEnv *, jclass);
 apr_status_ttcn_load_ainfo_class(JNIEnv *, jclass);
+unsigned long   tcn_get_thread_id(void);
 
 #define J2S(V)  c##V
 #define J2L(V)  p##V
diff --git a/native/src/jnilib.c b/native/src/jnilib.c
index dae3ade..e88d4d5 100644
--- a/native/src/jnilib.c
+++ b/native/src/jnilib.c
@@ -23,6 +23,22 @@
 
 #include "tcn_version.h"
 
+#ifdef WIN32
+#include 
+#endif
+
+#ifdef DARWIN
+#include 
+#endif
+
+#ifdef __FreeBSD__
+#include 
+#endif
+
+#ifdef __linux__
+#include 
+#endif
+
 #ifdef TCN_DO_STATISTICS
 extern void sp_poll_dump_statistics();
 extern void sp_network_dump_statistics();
@@ -481,3 +497,32 @@ jint tcn_get_java_env(JNIEnv **env)
 }
 return JNI_OK;
 }
+
+unsigned long tcn_get_thread_id(void)
+{
+/* OpenSSL needs this to return an unsigned long.  On OS/390, the pthread
+ * id is a structure twice that big.  Use the TCB pointer instead as a
+ * unique unsigned long.
+ */
+#ifdef __MVS__
+struct PSA {
+char unmapped[540];
+unsigned long PSATOLD;
+} *psaptr = 0;
+
+return psaptr->PSATOLD;
+#elif defined(WIN32)
+return (unsigned long)GetCurrentThreadId();
+#elif defined(DARWIN)
+uint64_t tid;
+pthread_threadid_np(NULL, );
+return (unsigned long)tid;
+#elif defined(__FreeBSD__)
+return (unsigned long)pthread_getthreadid_np();
+#elif defined(__linux__)
+return (unsigned long)syscall(SYS_gettid);
+#else
+return (unsigned long)pthread_self();
+#endif
+}
+
diff --git a/native/src/ssl.c b/native/src/ssl.c
index 57fbb53..98d77eb 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -20,14 +20,6 @@
 #include "apr_atomic.h"
 #include "apr_poll.h"
 
-#ifdef __linux__
-#include 
-#endif
-
-#ifdef __FreeBSD__
-#include 
-#endif
-
 #ifdef HAVE_OPENSSL
 #include "ssl_private.h"
 
@@ -465,30 +457,7 @@ static void ssl_thread_lock(int mode, int type,
 
 static unsigned long ssl_thread_id(void)
 {
-/* OpenSSL needs this to return an unsigned long.  On OS/390, the pthread
- * id is a structure twice that big.  Use the TCB pointer instead as a
- * unique unsigned long.
- */
-#ifdef __MVS__
-struct PSA {
-char unmapped[540];
-unsigned long PSATOLD;
-} *psaptr = 0;
-
-return psaptr->PSATOLD;
-#elif defined(WIN32)
-return (unsigned long)GetCurrentThreadId();
-#elif defined(DARWIN)
-uint64_t tid;
-pthread_threadid_np(NULL, );
-return (unsigned long)tid;
-#elif defined(__FreeBSD__)
-return (unsigned long)pthread_getthreadid_np();
-#elif defined(__linux__)
-return (unsigned long)syscall(SYS_gettid);
-#else
-return (unsigned long)(apr_os_thread_current());
-#endif
+return (unsigned long)tcn_get_thread_id();
 }
 
 #if OPENSSL_VERSION_NUMBER < 0x1010L
diff --git a/native/src/thread.c b/native/src/thread.c
index bddaee3..6696dc0 100644
--- a/native/src/thread.c
+++ b/native/src/thread.c
@@ -19,5 +19,6 @@
 TCN_IMPLEMENT_CALL(jlong, Thread, current)(TCN_STDARGS)
 {
 UNREFERENCED_STDARGS;
-return (jlong)((unsigned long)apr_os_thread_current());
+return (jlong)tcn_get_thread_id();
 }
+
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 0b64cee..a04005a 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ 

[GitHub] [tomcat] larsgrefer opened a new pull request #284: Improve General IDE support

[GitBox]

larsgrefer opened a new pull request #284:
URL: https://github.com/apache/tomcat/pull/284


   see also: 
https://github.com/apache/tomcat/pull/282#pullrequestreview-399324287



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 9.0.x updated: Another IDE file to ignore

[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 3cf66c7  Another IDE file to ignore
3cf66c7 is described below

commit 3cf66c79fcc2741d9eb4637538aa1a821fb4a4cb
Author: Mark Thomas 
AuthorDate: Thu Apr 23 23:11:59 2020 +0100

Another IDE file to ignore
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 08b1edc..9783881 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ mvn.properties
 .ant-targets-build.xml
 .checkstyle
 .classpath
+.externalToolBuilders
 .fbprefs
 .project
 .settings


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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 7d66c652a3e4d64b9711712fa1409ba1261effd8
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

Re: [GitHub] [tomcat] markt-asf commented on pull request #283: Remove implicit unboxing

[Mark Thomas]

On 23/04/2020 19:43, GitBox wrote:
> 
> markt-asf commented on pull request #283:
> URL: https://github.com/apache/tomcat/pull/283#issuecomment-618583682
> 
> 
>Thank you. That prompted me to figure out why I got the warning in the 
> text editor but not in the problems tab. I now have ~1,500 errors and 
> warnings to look at. But I'll merge this first. At least it will be one less 
> ;)

I'm down to less than 1000 after filtering out the output directory
which was causing some double counting.

You'll see I've fixed some generics issues and worked on the MBean
descriptors.

Next on my list are the various HTML warnings and errors.

It does look like some of these are false positives caused by the test
JSPs we have with deliberate errors in them. There may be too many to
exclude easily - although we could go down the route of a naming
convention for invalid test JSPs so validation can more easily skip
them. Something to think about.

Mark

-
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 (a006140 -> adf93c8)

[markt]

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

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


from a006140  Remove implicit unboxing
 new 9c2fd70  pageContext is never null
 new 1be170f  Generics fixes for JSPs
 new 1f1877c  Add DTD definition to all mbean-descriptor files
 new ebeefd1  Attributes don't have an impact attribute
 new adf93c8  Order matters

The 5 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/authenticator/mbeans-descriptors.xml  |  3 +++
 .../catalina/connector/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/core/mbeans-descriptors.xml|  3 +++
 .../apache/catalina/deploy/mbeans-descriptors.xml  |  3 +++
 .../ha/authenticator/mbeans-descriptors.xml|  3 +++
 .../catalina/ha/deploy/mbeans-descriptors.xml  |  3 +++
 .../catalina/ha/session/mbeans-descriptors.xml |  4 +--
 .../apache/catalina/loader/mbeans-descriptors.xml  |  3 +++
 java/org/apache/catalina/mbeans-descriptors.xml|  3 +++
 .../apache/catalina/mbeans/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/realm/mbeans-descriptors.xml   |  3 +++
 .../apache/catalina/session/mbeans-descriptors.xml |  3 +++
 .../apache/catalina/startup/mbeans-descriptors.xml |  3 +++
 .../apache/catalina/users/mbeans-descriptors.xml   |  4 ++-
 .../apache/catalina/valves/mbeans-descriptors.xml  |  3 +++
 .../apache/jasper/servlet/mbeans-descriptors.xml   |  3 +++
 .../jdbc/pool/interceptor/mbeans-descriptors.xml   |  6 -
 .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml |  3 +++
 test/webapp/jsp/pageContext1.jsp   | 30 ++
 webapps/examples/jsp/tagplugin/foreach.jsp |  2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp  |  4 +--
 21 files changed, 71 insertions(+), 24 deletions(-)


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

[tomcat] 01/05: pageContext is never null

[markt]

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

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

commit 9c2fd70f99f031489425d96359eac7580cef2803
Author: Mark Thomas 
AuthorDate: Thu Apr 23 20:17:40 2020 +0100

pageContext is never null
---
 test/webapp/jsp/pageContext1.jsp | 30 +-
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index d4bb322..1f44f97 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -17,23 +17,19 @@
 <%@ page import="java.io.IOException" contentType="text/plain"%>
 <%
 boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
-if (pageContext != null) {
-try {
-if (flush) {
-out.println("Flush");
-pageContext.include("/jsp/pageContext2.jsp", true);
-} else {
-pageContext.include("/jsp/pageContext2.jsp");
-}
-} catch (IOException e) {
-out.println("OK");
-return;
-} catch (Throwable t) {
-out.println("FAILED. Expected IOException, received: " + 
t.getClass().getName());
-return;
+try {
+if (flush) {
+out.println("Flush");
+pageContext.include("/jsp/pageContext2.jsp", true);
+} else {
+pageContext.include("/jsp/pageContext2.jsp");
 }
-out.println("FAILED. Expected IOException.");
-} else {
-out.println("FAILED. Expected IOException.");
+} catch (IOException e) {
+out.println("OK");
+return;
+} catch (Throwable t) {
+out.println("FAILED. Expected IOException, received: " + 
t.getClass().getName());
+return;
 }
+out.println("FAILED. Expected IOException.");
 %>
\ No newline at end of file


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

[tomcat] 03/05: Add DTD definition to all mbean-descriptor files

[markt]

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

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

commit 1f1877c3d888f519f0544386cebc3c3f0ca16786
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:03:35 2020 +0100

Add DTD definition to all mbean-descriptor files

The DTD is in the org.apache.tomcat.util.modeler package
---
 java/org/apache/catalina/authenticator/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/core/mbeans-descriptors.xml  | 3 +++
 java/org/apache/catalina/deploy/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml  | 3 +++
 java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/ha/session/mbeans-descriptors.xml| 4 ++--
 java/org/apache/catalina/loader/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/mbeans/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/realm/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/session/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/startup/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/users/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/valves/mbeans-descriptors.xml| 3 +++
 java/org/apache/jasper/servlet/mbeans-descriptors.xml | 3 +++
 .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml| 3 +++
 .../src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml  | 3 +++
 18 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml 
b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
index de95ae4..cb4b4f7 100644
--- a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
@@ -15,6 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
 http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
+   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
+   "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
 

[tomcat] 02/05: Generics fixes for JSPs

[markt]

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

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

commit 1be170fcf07e6105ecd4761e04fad6382540a534
Author: Mark Thomas 
AuthorDate: Thu Apr 23 21:02:10 2020 +0100

Generics fixes for JSPs
---
 webapps/examples/jsp/tagplugin/foreach.jsp| 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/examples/jsp/tagplugin/foreach.jsp 
b/webapps/examples/jsp/tagplugin/foreach.jsp
index 81621cc..2def434 100644
--- a/webapps/examples/jsp/tagplugin/foreach.jsp
+++ b/webapps/examples/jsp/tagplugin/foreach.jsp
@@ -39,7 +39,7 @@
 ${item}
 
 
-<% Vector v = new Vector();
+<% Vector v = new Vector();
 v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
 
 pageContext.setAttribute("vector", v);
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 41c2134..1eb1222 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -119,7 +119,7 @@
 

<% int nAttributes = 0;
-  Enumeration attributeNamesEnumeration = 
currentHttpSession.getAttributeNames();
+  Enumeration attributeNamesEnumeration = 
currentHttpSession.getAttributeNames();
   while (attributeNamesEnumeration.hasMoreElements()) {
   attributeNamesEnumeration.nextElement();
   ++nAttributes;
@@ -143,7 +143,7 @@

<% attributeNamesEnumeration = currentHttpSession.getAttributeNames();
   while (attributeNamesEnumeration.hasMoreElements()) {
-  String attributeName = (String) 
attributeNamesEnumeration.nextElement();
+  String attributeName = attributeNamesEnumeration.nextElement();
%>




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

[tomcat] 05/05: Order matters

[markt]

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

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

commit adf93c80384b0f2dad1d1dedd1716e88a17f222c
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:07:26 2020 +0100

Order matters
---
 .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
index f10978e..965fa16 100644
--- 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
+++ 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
@@ -26,7 +26,6 @@
 
 
 
-
 
 
   Slow query
@@ -35,5 +34,7 @@
 
   Failed query execution
 
+
+
   
 
\ No newline at end of file


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

[tomcat] 04/05: Attributes don't have an impact attribute

[markt]

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

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

commit ebeefd18840b46aa9428078211655af957941c69
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:05:47 2020 +0100

Attributes don't have an impact attribute
---
 java/org/apache/catalina/users/mbeans-descriptors.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml 
b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 216a416..c476cb9 100644
--- a/java/org/apache/catalina/users/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/users/mbeans-descriptors.xml
@@ -52,7 +52,6 @@
 
 
 


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

[tomcat] 03/06: Add DTD definition to all mbean-descriptor files

[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 0d493ae70ae736af7e20a2d66f2834ef07887b20
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:03:35 2020 +0100

Add DTD definition to all mbean-descriptor files

The DTD is in the org.apache.tomcat.util.modeler package
---
 java/org/apache/catalina/authenticator/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/core/mbeans-descriptors.xml  | 3 +++
 java/org/apache/catalina/deploy/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml  | 3 +++
 java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/ha/session/mbeans-descriptors.xml| 4 ++--
 java/org/apache/catalina/loader/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/mapper/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/mbeans/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/realm/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/session/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/startup/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/storeconfig/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/users/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/valves/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/webresources/mbeans-descriptors.xml  | 3 +++
 java/org/apache/jasper/servlet/mbeans-descriptors.xml | 3 +++
 java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml | 3 +++
 java/org/apache/tomcat/util/net/mbeans-descriptors.xml| 3 +++
 .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml| 3 +++
 .../src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml  | 3 +++
 24 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml 
b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
index 6b448c9..bcb6601 100644
--- a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
@@ -15,6 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
 http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
+   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
+   "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
 

[tomcat] branch 8.5.x updated (b5ba5a1 -> b551b40)

[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 b5ba5a1  Remove implicit unboxing
 new 3e7423e  pageContext is never null
 new 2d6dfcb  Generics fixes for JSPs
 new 0d493ae  Add DTD definition to all mbean-descriptor files
 new 66e0f7b  Attributes don't have an impact attribute
 new f05ad39  Order matters
 new b551b40  Default value not supported

The 6 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/authenticator/mbeans-descriptors.xml  |  3 +++
 .../catalina/connector/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/core/mbeans-descriptors.xml|  3 +++
 .../apache/catalina/deploy/mbeans-descriptors.xml  |  3 +++
 .../ha/authenticator/mbeans-descriptors.xml|  3 +++
 .../catalina/ha/deploy/mbeans-descriptors.xml  |  3 +++
 .../catalina/ha/session/mbeans-descriptors.xml |  4 +--
 .../apache/catalina/loader/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/mapper/mbeans-descriptors.xml  |  3 +++
 java/org/apache/catalina/mbeans-descriptors.xml|  3 +++
 .../apache/catalina/mbeans/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/realm/mbeans-descriptors.xml   |  3 +++
 .../apache/catalina/session/mbeans-descriptors.xml |  3 +++
 .../apache/catalina/startup/mbeans-descriptors.xml |  3 +++
 .../catalina/storeconfig/mbeans-descriptors.xml|  6 +++--
 .../apache/catalina/users/mbeans-descriptors.xml   |  4 ++-
 .../apache/catalina/valves/mbeans-descriptors.xml  |  3 +++
 .../catalina/valves/rewrite/mbeans-descriptors.xml |  3 +++
 .../catalina/webresources/mbeans-descriptors.xml   |  3 +++
 .../apache/jasper/servlet/mbeans-descriptors.xml   |  3 +++
 .../util/descriptor/web/mbeans-descriptors.xml |  3 +++
 .../apache/tomcat/util/net/mbeans-descriptors.xml  |  3 +++
 .../jdbc/pool/interceptor/mbeans-descriptors.xml   |  6 -
 .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml |  3 +++
 test/webapp/WEB-INF/tags/bug49297.tag  |  2 +-
 test/webapp/bug49nnn/bug49297MultipleImport1.jsp   |  2 +-
 test/webapp/bug49nnn/bug49297MultipleImport2.jsp   |  2 +-
 test/webapp/jsp/pageContext1.jsp   | 30 ++
 webapps/examples/jsp/tagplugin/foreach.jsp |  2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp  |  4 +--
 30 files changed, 93 insertions(+), 29 deletions(-)


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

[tomcat] 02/06: Generics fixes for JSPs

[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 2d6dfcb75e63b585e27e3dc69d5f227b28f574a0
Author: Mark Thomas 
AuthorDate: Thu Apr 23 21:02:10 2020 +0100

Generics fixes for JSPs
---
 test/webapp/WEB-INF/tags/bug49297.tag| 2 +-
 test/webapp/bug49nnn/bug49297MultipleImport1.jsp | 2 +-
 test/webapp/bug49nnn/bug49297MultipleImport2.jsp | 2 +-
 webapps/examples/jsp/tagplugin/foreach.jsp   | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp| 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/webapp/WEB-INF/tags/bug49297.tag 
b/test/webapp/WEB-INF/tags/bug49297.tag
index f3fc275..940d968 100644
--- a/test/webapp/WEB-INF/tags/bug49297.tag
+++ b/test/webapp/WEB-INF/tags/bug49297.tag
@@ -16,6 +16,6 @@
 --%><%@ tag import="java.util.List" import="java.util.ArrayList"%><%@
 tag body-content="empty" %><%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %><%=l.get(0)%>
\ No newline at end of file
diff --git a/test/webapp/bug49nnn/bug49297MultipleImport1.jsp 
b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
index 63c102b..01fa614 100644
--- a/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
+++ b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
@@ -20,7 +20,7 @@
   
 <%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %>
 <%=l.get(0)%>
diff --git a/test/webapp/bug49nnn/bug49297MultipleImport2.jsp 
b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
index 28629a4..33b0dbd 100644
--- a/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
+++ b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
@@ -21,7 +21,7 @@
   
 <%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %>
 <%=l.get(0)%>
diff --git a/webapps/examples/jsp/tagplugin/foreach.jsp 
b/webapps/examples/jsp/tagplugin/foreach.jsp
index 81621cc..4803506 100644
--- a/webapps/examples/jsp/tagplugin/foreach.jsp
+++ b/webapps/examples/jsp/tagplugin/foreach.jsp
@@ -39,7 +39,7 @@
 ${item}
 
 
-<% Vector v = new Vector();
+<% Vector v = new Vector<>();
 v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
 
 pageContext.setAttribute("vector", v);
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 3771fe3..b2482e1 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -119,7 +119,7 @@
 

<% int nAttributes = 0;
-  Enumeration attributeNamesEnumeration = 
currentHttpSession.getAttributeNames();
+  Enumeration attributeNamesEnumeration = 
currentHttpSession.getAttributeNames();
   while (attributeNamesEnumeration.hasMoreElements()) {
   attributeNamesEnumeration.nextElement();
   ++nAttributes;
@@ -143,7 +143,7 @@

<% attributeNamesEnumeration = currentHttpSession.getAttributeNames();
   while (attributeNamesEnumeration.hasMoreElements()) {
-  String attributeName = (String) 
attributeNamesEnumeration.nextElement();
+  String attributeName = attributeNamesEnumeration.nextElement();
%>




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

[tomcat] 05/06: Order matters

[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 f05ad39d787959b6d13a35dd71f6cf2c91aaf149
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:07:26 2020 +0100

Order matters
---
 .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
index 279a3ed..4db1108 100644
--- 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
+++ 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
@@ -26,7 +26,6 @@
 
 
 
-
 
 
   Slow query
@@ -35,5 +34,7 @@
 
   Failed query execution
 
+
+
   
 
\ No newline at end of file


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

[tomcat] 01/06: pageContext is never null

[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 3e7423e6a314e812c56a4d8b10857cd3398400c7
Author: Mark Thomas 
AuthorDate: Thu Apr 23 20:17:40 2020 +0100

pageContext is never null
---
 test/webapp/jsp/pageContext1.jsp | 30 +-
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index d4bb322..1f44f97 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -17,23 +17,19 @@
 <%@ page import="java.io.IOException" contentType="text/plain"%>
 <%
 boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
-if (pageContext != null) {
-try {
-if (flush) {
-out.println("Flush");
-pageContext.include("/jsp/pageContext2.jsp", true);
-} else {
-pageContext.include("/jsp/pageContext2.jsp");
-}
-} catch (IOException e) {
-out.println("OK");
-return;
-} catch (Throwable t) {
-out.println("FAILED. Expected IOException, received: " + 
t.getClass().getName());
-return;
+try {
+if (flush) {
+out.println("Flush");
+pageContext.include("/jsp/pageContext2.jsp", true);
+} else {
+pageContext.include("/jsp/pageContext2.jsp");
 }
-out.println("FAILED. Expected IOException.");
-} else {
-out.println("FAILED. Expected IOException.");
+} catch (IOException e) {
+out.println("OK");
+return;
+} catch (Throwable t) {
+out.println("FAILED. Expected IOException, received: " + 
t.getClass().getName());
+return;
 }
+out.println("FAILED. Expected IOException.");
 %>
\ No newline at end of file


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

[tomcat] 04/06: Attributes don't have an impact attribute

[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 66e0f7bfe077227a708e13f8e0cf0f75aa6e6dd5
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:05:47 2020 +0100

Attributes don't have an impact attribute
---
 java/org/apache/catalina/users/mbeans-descriptors.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml 
b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 32a680c..ea7acfd 100644
--- a/java/org/apache/catalina/users/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/users/mbeans-descriptors.xml
@@ -52,7 +52,6 @@
 
 
 


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

[tomcat] 06/06: Default value not supported

[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 b551b40a506024abad9c310dee4572c8c829f0ed
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:12:38 2020 +0100

Default value not supported
---
 java/org/apache/catalina/storeconfig/mbeans-descriptors.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml 
b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
index 4a3f17f..06aad64 100644
--- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
@@ -34,8 +34,7 @@
impact="ACTION" returnType="void" >
  
+ type="java.lang.String"/>
  


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

[tomcat] 02/06: Generics fixes for JSPs

[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

commit cc0056cad9da0fa0f3d5b081544b0953a2cd1304
Author: Mark Thomas 
AuthorDate: Thu Apr 23 21:02:10 2020 +0100

Generics fixes for JSPs
---
 test/webapp/WEB-INF/tags/bug49297.tag| 2 +-
 test/webapp/bug49nnn/bug49297MultipleImport1.jsp | 2 +-
 test/webapp/bug49nnn/bug49297MultipleImport2.jsp | 2 +-
 webapps/examples/jsp/tagplugin/foreach.jsp   | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp| 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/webapp/WEB-INF/tags/bug49297.tag 
b/test/webapp/WEB-INF/tags/bug49297.tag
index f3fc275..940d968 100644
--- a/test/webapp/WEB-INF/tags/bug49297.tag
+++ b/test/webapp/WEB-INF/tags/bug49297.tag
@@ -16,6 +16,6 @@
 --%><%@ tag import="java.util.List" import="java.util.ArrayList"%><%@
 tag body-content="empty" %><%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %><%=l.get(0)%>
\ No newline at end of file
diff --git a/test/webapp/bug49nnn/bug49297MultipleImport1.jsp 
b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
index 63c102b..01fa614 100644
--- a/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
+++ b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
@@ -20,7 +20,7 @@
   
 <%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %>
 <%=l.get(0)%>
diff --git a/test/webapp/bug49nnn/bug49297MultipleImport2.jsp 
b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
index 28629a4..33b0dbd 100644
--- a/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
+++ b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
@@ -21,7 +21,7 @@
   
 <%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %>
 <%=l.get(0)%>
diff --git a/webapps/examples/jsp/tagplugin/foreach.jsp 
b/webapps/examples/jsp/tagplugin/foreach.jsp
index 81621cc..4803506 100644
--- a/webapps/examples/jsp/tagplugin/foreach.jsp
+++ b/webapps/examples/jsp/tagplugin/foreach.jsp
@@ -39,7 +39,7 @@
 ${item}
 
 
-<% Vector v = new Vector();
+<% Vector v = new Vector<>();
 v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
 
 pageContext.setAttribute("vector", v);
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 2f81e05..c24d337 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -119,7 +119,7 @@
 

<% int nAttributes = 0;
-  Enumeration attributeNamesEnumeration = 
currentHttpSession.getAttributeNames();
+  Enumeration attributeNamesEnumeration = 
currentHttpSession.getAttributeNames();
   while (attributeNamesEnumeration.hasMoreElements()) {
   attributeNamesEnumeration.nextElement();
   ++nAttributes;
@@ -143,7 +143,7 @@

<% attributeNamesEnumeration = currentHttpSession.getAttributeNames();
   while (attributeNamesEnumeration.hasMoreElements()) {
-  String attributeName = (String) 
attributeNamesEnumeration.nextElement();
+  String attributeName = attributeNamesEnumeration.nextElement();
%>




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

[tomcat] 04/06: Attributes don't have an impact attribute

[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

commit c0f8f026865a16f89ec7ca7bc6487cc29231d983
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:05:47 2020 +0100

Attributes don't have an impact attribute
---
 java/org/apache/catalina/users/mbeans-descriptors.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml 
b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 32a680c..ea7acfd 100644
--- a/java/org/apache/catalina/users/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/users/mbeans-descriptors.xml
@@ -52,7 +52,6 @@
 
 
 


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

[tomcat] 06/06: Default value not supported

[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

commit 7d66c652a3e4d64b9711712fa1409ba1261effd8
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:12:38 2020 +0100

Default value not supported
---
 java/org/apache/catalina/storeconfig/mbeans-descriptors.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml 
b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
index 4a3f17f..06aad64 100644
--- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
@@ -34,8 +34,7 @@
impact="ACTION" returnType="void" >
  
+ type="java.lang.String"/>
  


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

[tomcat] 03/06: Add DTD definition to all mbean-descriptor files

[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

commit 0dbb6c0b1b74d78191965fe3d40060eeedcde5b0
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:03:35 2020 +0100

Add DTD definition to all mbean-descriptor files

The DTD is in the org.apache.tomcat.util.modeler package
---
 java/org/apache/catalina/authenticator/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/core/mbeans-descriptors.xml  | 3 +++
 java/org/apache/catalina/deploy/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml  | 3 +++
 java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/ha/session/mbeans-descriptors.xml| 4 ++--
 java/org/apache/catalina/loader/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/mapper/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/mbeans/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/realm/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/session/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/startup/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/storeconfig/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/users/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/valves/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/webresources/mbeans-descriptors.xml  | 3 +++
 java/org/apache/coyote/mbeans-descriptors.xml | 3 +++
 java/org/apache/jasper/servlet/mbeans-descriptors.xml | 3 +++
 java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml | 3 +++
 java/org/apache/tomcat/util/net/mbeans-descriptors.xml| 3 +++
 .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml| 3 +++
 .../src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml  | 3 +++
 25 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml 
b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
index 6b448c9..bcb6601 100644
--- a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
@@ -15,6 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
 http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
+   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
+   "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
 
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
 

[tomcat] branch master updated (110e084 -> 7d66c65)

[markt]

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

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


from 110e084  Remove implicit unboxing
 new fb6c67c  pageContext is never null
 new cc0056c  Generics fixes for JSPs
 new 0dbb6c0  Add DTD definition to all mbean-descriptor files
 new c0f8f02  Attributes don't have an impact attribute
 new a3ada04  Order matters
 new 7d66c65  Default value not supported

The 6 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/authenticator/mbeans-descriptors.xml  |  3 +++
 .../catalina/connector/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/core/mbeans-descriptors.xml|  3 +++
 .../apache/catalina/deploy/mbeans-descriptors.xml  |  3 +++
 .../ha/authenticator/mbeans-descriptors.xml|  3 +++
 .../catalina/ha/deploy/mbeans-descriptors.xml  |  3 +++
 .../catalina/ha/session/mbeans-descriptors.xml |  4 +--
 .../apache/catalina/loader/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/mapper/mbeans-descriptors.xml  |  3 +++
 java/org/apache/catalina/mbeans-descriptors.xml|  3 +++
 .../apache/catalina/mbeans/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/realm/mbeans-descriptors.xml   |  3 +++
 .../apache/catalina/session/mbeans-descriptors.xml |  3 +++
 .../apache/catalina/startup/mbeans-descriptors.xml |  3 +++
 .../catalina/storeconfig/mbeans-descriptors.xml|  6 +++--
 .../apache/catalina/users/mbeans-descriptors.xml   |  4 ++-
 .../apache/catalina/valves/mbeans-descriptors.xml  |  3 +++
 .../catalina/valves/rewrite/mbeans-descriptors.xml |  3 +++
 .../catalina/webresources/mbeans-descriptors.xml   |  3 +++
 java/org/apache/coyote/mbeans-descriptors.xml  |  3 +++
 .../apache/jasper/servlet/mbeans-descriptors.xml   |  3 +++
 .../util/descriptor/web/mbeans-descriptors.xml |  3 +++
 .../apache/tomcat/util/net/mbeans-descriptors.xml  |  3 +++
 .../jdbc/pool/interceptor/mbeans-descriptors.xml   |  6 -
 .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml |  3 +++
 test/webapp/WEB-INF/tags/bug49297.tag  |  2 +-
 test/webapp/bug49nnn/bug49297MultipleImport1.jsp   |  2 +-
 test/webapp/bug49nnn/bug49297MultipleImport2.jsp   |  2 +-
 test/webapp/jsp/pageContext1.jsp   | 30 ++
 webapps/examples/jsp/tagplugin/foreach.jsp |  2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp  |  4 +--
 31 files changed, 96 insertions(+), 29 deletions(-)


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

[tomcat] 05/06: Order matters

[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

commit a3ada04132bae2c53b21af1f3731a020b0d3b6aa
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:07:26 2020 +0100

Order matters
---
 .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
index 279a3ed..4db1108 100644
--- 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
+++ 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
@@ -26,7 +26,6 @@
 
 
 
-
 
 
   Slow query
@@ -35,5 +34,7 @@
 
   Failed query execution
 
+
+
   
 
\ No newline at end of file


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

[tomcat] 01/06: pageContext is never null

[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

commit fb6c67c9f9d1a753458b0e2a730c0c4c21ecc566
Author: Mark Thomas 
AuthorDate: Thu Apr 23 20:17:40 2020 +0100

pageContext is never null
---
 test/webapp/jsp/pageContext1.jsp | 30 +-
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index d4bb322..1f44f97 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -17,23 +17,19 @@
 <%@ page import="java.io.IOException" contentType="text/plain"%>
 <%
 boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
-if (pageContext != null) {
-try {
-if (flush) {
-out.println("Flush");
-pageContext.include("/jsp/pageContext2.jsp", true);
-} else {
-pageContext.include("/jsp/pageContext2.jsp");
-}
-} catch (IOException e) {
-out.println("OK");
-return;
-} catch (Throwable t) {
-out.println("FAILED. Expected IOException, received: " + 
t.getClass().getName());
-return;
+try {
+if (flush) {
+out.println("Flush");
+pageContext.include("/jsp/pageContext2.jsp", true);
+} else {
+pageContext.include("/jsp/pageContext2.jsp");
 }
-out.println("FAILED. Expected IOException.");
-} else {
-out.println("FAILED. Expected IOException.");
+} catch (IOException e) {
+out.println("OK");
+return;
+} catch (Throwable t) {
+out.println("FAILED. Expected IOException, received: " + 
t.getClass().getName());
+return;
 }
+out.println("FAILED. Expected IOException.");
 %>
\ No newline at end of file


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

[tomcat] 04/06: Attributes don't have an impact attribute

[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

commit ce4622e1891ae9defd73d5353599c5d050d0318d
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:05:47 2020 +0100

Attributes don't have an impact attribute
---
 java/org/apache/catalina/users/mbeans-descriptors.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml 
b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 32a680c..ea7acfd 100644
--- a/java/org/apache/catalina/users/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/users/mbeans-descriptors.xml
@@ -52,7 +52,6 @@
 
 
 


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

[tomcat] 03/06: Add DTD definition to all mbean-descriptor files

[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

commit 228dae2bf2a1b16dcbd8756c10e41fcb5d484a5b
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:03:35 2020 +0100

Add DTD definition to all mbean-descriptor files

The DTD is in the org.apache.tomcat.util.modeler package
---
 java/org/apache/catalina/authenticator/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/core/mbeans-descriptors.xml  | 3 +++
 java/org/apache/catalina/deploy/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml  | 3 +++
 java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/ha/session/mbeans-descriptors.xml| 4 ++--
 java/org/apache/catalina/loader/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/mapper/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/mbeans/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/realm/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/session/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/startup/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/storeconfig/mbeans-descriptors.xml   | 3 +++
 java/org/apache/catalina/users/mbeans-descriptors.xml | 3 +++
 java/org/apache/catalina/valves/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml| 3 +++
 java/org/apache/catalina/webresources/mbeans-descriptors.xml  | 3 +++
 java/org/apache/coyote/mbeans-descriptors.xml | 3 +++
 java/org/apache/jasper/servlet/mbeans-descriptors.xml | 3 +++
 java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml | 3 +++
 java/org/apache/tomcat/util/net/mbeans-descriptors.xml| 3 +++
 .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml| 3 +++
 .../src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml  | 3 +++
 25 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml 
b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
index 6b448c9..bcb6601 100644
--- a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
@@ -15,6 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
 http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
+   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
+   "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
 
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
   
+http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd;>
 
 
 

[tomcat] 01/06: pageContext is never null

[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

commit b2c2b7f90a1629bddf09997a02e29546dd9023a1
Author: Mark Thomas 
AuthorDate: Thu Apr 23 20:17:40 2020 +0100

pageContext is never null
---
 test/webapp/jsp/pageContext1.jsp | 30 +-
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index d4bb322..1f44f97 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -17,23 +17,19 @@
 <%@ page import="java.io.IOException" contentType="text/plain"%>
 <%
 boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
-if (pageContext != null) {
-try {
-if (flush) {
-out.println("Flush");
-pageContext.include("/jsp/pageContext2.jsp", true);
-} else {
-pageContext.include("/jsp/pageContext2.jsp");
-}
-} catch (IOException e) {
-out.println("OK");
-return;
-} catch (Throwable t) {
-out.println("FAILED. Expected IOException, received: " + 
t.getClass().getName());
-return;
+try {
+if (flush) {
+out.println("Flush");
+pageContext.include("/jsp/pageContext2.jsp", true);
+} else {
+pageContext.include("/jsp/pageContext2.jsp");
 }
-out.println("FAILED. Expected IOException.");
-} else {
-out.println("FAILED. Expected IOException.");
+} catch (IOException e) {
+out.println("OK");
+return;
+} catch (Throwable t) {
+out.println("FAILED. Expected IOException, received: " + 
t.getClass().getName());
+return;
 }
+out.println("FAILED. Expected IOException.");
 %>
\ No newline at end of file


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

[tomcat] 06/06: Default value not supported

[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

commit fd81ab91ae52bf6a47bcc07d2264a46c14cebb8d
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:12:38 2020 +0100

Default value not supported
---
 java/org/apache/catalina/storeconfig/mbeans-descriptors.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml 
b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
index 4a3f17f..06aad64 100644
--- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
@@ -34,8 +34,7 @@
impact="ACTION" returnType="void" >
  
+ type="java.lang.String"/>
  


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

[tomcat] 02/06: Generics fixes for JSPs

[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

commit 3c4c1a048147baa032ab8ec409dbbe573c59b7fb
Author: Mark Thomas 
AuthorDate: Thu Apr 23 21:02:10 2020 +0100

Generics fixes for JSPs
---
 test/webapp/WEB-INF/tags/bug49297.tag| 2 +-
 test/webapp/bug49nnn/bug49297MultipleImport1.jsp | 2 +-
 test/webapp/bug49nnn/bug49297MultipleImport2.jsp | 2 +-
 webapps/examples/jsp/tagplugin/foreach.jsp   | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp| 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/webapp/WEB-INF/tags/bug49297.tag 
b/test/webapp/WEB-INF/tags/bug49297.tag
index f3fc275..940d968 100644
--- a/test/webapp/WEB-INF/tags/bug49297.tag
+++ b/test/webapp/WEB-INF/tags/bug49297.tag
@@ -16,6 +16,6 @@
 --%><%@ tag import="java.util.List" import="java.util.ArrayList"%><%@
 tag body-content="empty" %><%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %><%=l.get(0)%>
\ No newline at end of file
diff --git a/test/webapp/bug49nnn/bug49297MultipleImport1.jsp 
b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
index 63c102b..01fa614 100644
--- a/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
+++ b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
@@ -20,7 +20,7 @@
   
 <%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %>
 <%=l.get(0)%>
diff --git a/test/webapp/bug49nnn/bug49297MultipleImport2.jsp 
b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
index 28629a4..33b0dbd 100644
--- a/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
+++ b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
@@ -21,7 +21,7 @@
   
 <%
 // Make sure the imports above do work
-List l = new ArrayList();
+List l = new ArrayList<>();
 l.add("OK");
 %>
 <%=l.get(0)%>
diff --git a/webapps/examples/jsp/tagplugin/foreach.jsp 
b/webapps/examples/jsp/tagplugin/foreach.jsp
index 81621cc..4803506 100644
--- a/webapps/examples/jsp/tagplugin/foreach.jsp
+++ b/webapps/examples/jsp/tagplugin/foreach.jsp
@@ -39,7 +39,7 @@
 ${item}
 
 
-<% Vector v = new Vector();
+<% Vector v = new Vector<>();
 v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
 
 pageContext.setAttribute("vector", v);
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 3771fe3..b2482e1 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -119,7 +119,7 @@
 

<% int nAttributes = 0;
-  Enumeration attributeNamesEnumeration = 
currentHttpSession.getAttributeNames();
+  Enumeration attributeNamesEnumeration = 
currentHttpSession.getAttributeNames();
   while (attributeNamesEnumeration.hasMoreElements()) {
   attributeNamesEnumeration.nextElement();
   ++nAttributes;
@@ -143,7 +143,7 @@

<% attributeNamesEnumeration = currentHttpSession.getAttributeNames();
   while (attributeNamesEnumeration.hasMoreElements()) {
-  String attributeName = (String) 
attributeNamesEnumeration.nextElement();
+  String attributeName = attributeNamesEnumeration.nextElement();
%>




-
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 (9091fa0 -> fd81ab9)

[markt]

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

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


from 9091fa0  Remove implicit unboxing
 new b2c2b7f  pageContext is never null
 new 3c4c1a0  Generics fixes for JSPs
 new 228dae2  Add DTD definition to all mbean-descriptor files
 new ce4622e  Attributes don't have an impact attribute
 new d2f9341  Order matters
 new fd81ab9  Default value not supported

The 6 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/authenticator/mbeans-descriptors.xml  |  3 +++
 .../catalina/connector/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/core/mbeans-descriptors.xml|  3 +++
 .../apache/catalina/deploy/mbeans-descriptors.xml  |  3 +++
 .../ha/authenticator/mbeans-descriptors.xml|  3 +++
 .../catalina/ha/deploy/mbeans-descriptors.xml  |  3 +++
 .../catalina/ha/session/mbeans-descriptors.xml |  4 +--
 .../apache/catalina/loader/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/mapper/mbeans-descriptors.xml  |  3 +++
 java/org/apache/catalina/mbeans-descriptors.xml|  3 +++
 .../apache/catalina/mbeans/mbeans-descriptors.xml  |  3 +++
 .../apache/catalina/realm/mbeans-descriptors.xml   |  3 +++
 .../apache/catalina/session/mbeans-descriptors.xml |  3 +++
 .../apache/catalina/startup/mbeans-descriptors.xml |  3 +++
 .../catalina/storeconfig/mbeans-descriptors.xml|  6 +++--
 .../apache/catalina/users/mbeans-descriptors.xml   |  4 ++-
 .../apache/catalina/valves/mbeans-descriptors.xml  |  3 +++
 .../catalina/valves/rewrite/mbeans-descriptors.xml |  3 +++
 .../catalina/webresources/mbeans-descriptors.xml   |  3 +++
 java/org/apache/coyote/mbeans-descriptors.xml  |  3 +++
 .../apache/jasper/servlet/mbeans-descriptors.xml   |  3 +++
 .../util/descriptor/web/mbeans-descriptors.xml |  3 +++
 .../apache/tomcat/util/net/mbeans-descriptors.xml  |  3 +++
 .../jdbc/pool/interceptor/mbeans-descriptors.xml   |  6 -
 .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml |  3 +++
 test/webapp/WEB-INF/tags/bug49297.tag  |  2 +-
 test/webapp/bug49nnn/bug49297MultipleImport1.jsp   |  2 +-
 test/webapp/bug49nnn/bug49297MultipleImport2.jsp   |  2 +-
 test/webapp/jsp/pageContext1.jsp   | 30 ++
 webapps/examples/jsp/tagplugin/foreach.jsp |  2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp  |  4 +--
 31 files changed, 96 insertions(+), 29 deletions(-)


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

[tomcat] 05/06: Order matters

[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

commit d2f9341ed16084389e44a6ea104a44801e79cad0
Author: Mark Thomas 
AuthorDate: Thu Apr 23 22:07:26 2020 +0100

Order matters
---
 .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
index 279a3ed..4db1108 100644
--- 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
+++ 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
@@ -26,7 +26,6 @@
 
 
 
-
 
 
   Slow query
@@ -35,5 +34,7 @@
 
   Failed query execution
 
+
+
   
 
\ No newline at end of file


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

[Bug 64373] New: tag-file reference from .tld in /WEB-INF/classes/META-INF cannot be resolved

[bugzilla]

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

Bug ID: 64373
   Summary: tag-file reference from .tld in
/WEB-INF/classes/META-INF cannot be resolved
   Product: Tomcat 9
   Version: 9.0.34
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: k...@xk72.com
  Target Milestone: -

Created attachment 37195
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37195=edit
patch for TagLibraryInfoImpl

When the Jar Scanner is configured with scanAllDirectories, TldScanner will
load tag library descriptors in /WEB-INF/classes/META-INF/ (@see
TldScanner.TldScannerCallback#scanWebInfClasses)

When a .tld references a tag-file, it MUST reference it as
/META-INF/tags/blah.tag (attempting a relative path results in Illegal tag file
path..., I guess that's a spec requirement)

e.g. /WEB-INF/classes/META-INF/tags.tld



http://java.sun.com/xml/ns/j2ee;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
web-jsptaglibrary_2_0.xsd"
version="2.0">
1.0
tags

bug
/META-INF/tags/bug.tag




A .tld living in /WEB-INF/classes referencing a tag-file in /META-INF/tags
intends it to be loaded from /WEB-INF/classes/META-INF/tags in the same way
that a .tag living in a jar is loaded from /META-INF inside the jar.

HOWEVER the tag-file is instead loaded from /META-INF/tags at the root of the
webapp, which of course can't be found.

I think this should be resolved, as Tomcat appears to support .tlds in
/WEB-INF/classes/META-INF. I also _think_ the solution is quite simple (hey
sometimes it is!)...

TagLibraryInfoImpl#createTagFileInfo knows the path and whether it's in a jar
or not, so it can "correct" the path to have /WEB-INF/classes in front. I've
attached a patch for this change.

All the best,
Karl

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

[CONF] Apache Tomcat > ReleaseProcess

[Konstantin Kolinko (Confluence)]

Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
ReleaseProcess 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Konstantin Kolinko edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Konstantin Kolinko edited at 06:44 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Add link to Bugzilla  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... 
 

 
 
 
 No Format 
 
 
 
 
  svn mv https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.XX https://dist.apache.org/repos/dist/release/tomcat/tomcat-7/v7.0.XX  
 
 
 

 
 
 
 No Format 
 
 
 
 
  svn checkout --depth immediates https://dist.apache.org/repos/dist/release/tomcat/tomcat-7/   
 
 
 and update the KEYS file there to be the same as the one used for release. (The download page has links pointing to this file).  
Release the Maven artifacts (https://github.com/apache/tomcat/blob/7.0.x/res/maven/README.txt step 4) 
Wait for the mirrors to sync (upto 24 hours depending on what percentage of the mirrors you want to sync) 
Update the website (e.g. http://svn.apache.org/viewvc?view=revision=1500109)Note: the index and oldnews pages are sorted by date. Thus the new announcement pops up to the top of the page. 
Update the docs (see http://svn.apache.org/repos/asf/tomcat/site/trunk/README.txt) 
Announce the release (e.g. http://markmail.org/message/xyantb3ozzmucdjt) to users@t.a.o, cc dev@t.a.o, announce@t.a.o, announce@a.o 
Update the release date in the changelog to the date the files were copied to the the release area in -mm-dd format.E.g. "released 2013-05-03" (for stable versions), "beta, 2007-02-08" (for betas). 
Add the version number in Bugzilla (https://bz.apache.org/bugzilla/ → Administration → Products / versions)  
Drop the artifacts for the previous release from https://dist.apache.org/repos/dist/release/tomcat/tomcat-7/  
Add release data (version and date) to reporter.apache.org - https://reporter.apache.org/addrelease.html?tomcat  
 ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 7.1.2  
 
 
  
 
 
 
 
 
 
 
 
 

[tomcat] branch 7.0.x updated: Remove implicit unboxing

[markt]

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

markt 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 a006140  Remove implicit unboxing
a006140 is described below

commit a0061404c2cea4fec4f3dc8bc6ff662abd26cabe
Author: Lars Grefer 
AuthorDate: Thu Apr 23 18:44:58 2020 +0200

Remove implicit unboxing
---
 test/webapp/jsp/pageContext1.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index 0d0062f..d4bb322 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -16,7 +16,7 @@
 --%>
 <%@ page import="java.io.IOException" contentType="text/plain"%>
 <%
-boolean flush = Boolean.valueOf(request.getParameter("flush"));
+boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
 if (pageContext != null) {
 try {
 if (flush) {


-
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: Remove implicit unboxing

[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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new b5ba5a1  Remove implicit unboxing
b5ba5a1 is described below

commit b5ba5a174722acf8bb8ac2f01421e34fe45190ca
Author: Lars Grefer 
AuthorDate: Thu Apr 23 18:44:58 2020 +0200

Remove implicit unboxing
---
 test/webapp/jsp/pageContext1.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index 0d0062f..d4bb322 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -16,7 +16,7 @@
 --%>
 <%@ page import="java.io.IOException" contentType="text/plain"%>
 <%
-boolean flush = Boolean.valueOf(request.getParameter("flush"));
+boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
 if (pageContext != null) {
 try {
 if (flush) {


-
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: Remove implicit unboxing

[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 9091fa0  Remove implicit unboxing
9091fa0 is described below

commit 9091fa08850cbc595b714cd87a1c0700809e291c
Author: Lars Grefer 
AuthorDate: Thu Apr 23 18:44:58 2020 +0200

Remove implicit unboxing
---
 test/webapp/jsp/pageContext1.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index 0d0062f..d4bb322 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -16,7 +16,7 @@
 --%>
 <%@ page import="java.io.IOException" contentType="text/plain"%>
 <%
-boolean flush = Boolean.valueOf(request.getParameter("flush"));
+boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
 if (pageContext != null) {
 try {
 if (flush) {


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

[tomcat] branch master updated: Remove implicit unboxing

[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 110e084  Remove implicit unboxing
110e084 is described below

commit 110e084a34ac61d36202abb60bffd384e2217e38
Author: Lars Grefer 
AuthorDate: Thu Apr 23 18:44:58 2020 +0200

Remove implicit unboxing
---
 test/webapp/jsp/pageContext1.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index 0d0062f..d4bb322 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -16,7 +16,7 @@
 --%>
 <%@ page import="java.io.IOException" contentType="text/plain"%>
 <%
-boolean flush = Boolean.valueOf(request.getParameter("flush"));
+boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
 if (pageContext != null) {
 try {
 if (flush) {


-
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 pull request #283: Remove implicit unboxing

[GitBox]

markt-asf commented on pull request #283:
URL: https://github.com/apache/tomcat/pull/283#issuecomment-618583682


   Thank you. That prompted me to figure out why I got the warning in the text 
editor but not in the problems tab. I now have ~1,500 errors and warnings to 
look at. But I'll merge this first. At least it will be one less ;)



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

[CONF] Apache Tomcat > Design and Development Issues

[Konstantin Kolinko (Confluence)]

Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Design and Development Issues 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Konstantin Kolinko edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Konstantin Kolinko edited at 06:39 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Move "Release Process" page (migrated from MoinMoin wiki) to the "Development" area and add a link to it here  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... 
 
 Building the Tomcat Native Connector binaries for Windows  
 Building the isapi_redirector.dll (mod_jk) for Windows  
 Managing translations  
 Release process for Apache Tomcat  
 Design Issues In progress 
 
 Removing unpackWARs  
 http workshop 2019  
 Jakarta EE Release Numbering  
 ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 7.1.2  
 
 
  
 
 
 
 
 
 
 
 
 

svn commit: r39070 - in /release/tomcat/tomcat-10/v10.0.0-M4/bin: apache-tomcat-10.0.0-M4.tar.gz.asc apache-tomcat-10.0.0-M4.zip.asc

[kkolinko]

Author: kkolinko
Date: Thu Apr 23 18:23:13 2020
New Revision: 39070

Log:
Add missing signature files for Tomcat 10.0.0-M4 release, as was reported on 
the users@ list

I found these files in my copy of a Maven staging repository that I downloaded 
at the release voting time

Added:
release/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.tar.gz.asc
release/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.zip.asc

Added: 
release/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.tar.gz.asc
==
--- release/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.tar.gz.asc 
(added)
+++ release/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.tar.gz.asc 
Thu Apr 23 18:23:13 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl6HLHoACgkQEMAcWi9g
+WefrCA/+NlD3Tn0rQekx5x3b46le7AWcGYu6VdZ5A7tyxjWl+Z7nx+WkhPhoeev+
+fGd7HHtXedaSTvDoxZE/1tV3zPZTqr+cpuanPpew1i0EqtxtL/60cSt5aWqe2drz
+ojW0tzwjS/PU3oy8r7knOI5FIGl1PGKQJ7D2UAOte+eN1r4R/WzgUcDDedEi23N2
+QGh0Gaj9Tsk2G+rtlEYuNhH2W/fVjnYUcn3Rd13JV3QRwrCt8WybSGX4024LaCoJ
+YW8xV+AqDs7A2MUR5DiFwWifkLPmnTAXAIkZlTAPAicKOYDoSnuCIkmeXQ45RxRt
+VJI1O1aIp02DEgRf6OXLeoT36n7HZXVHJo1ELCWQYDNZltX8uLZeFNCklhrl+4UZ
+Knz/0wA3e995kjjTEAwpIRaMmxEgOjnxZDvQ4vyHvNhjTOoZrx8ZoIxpYolKfSn2
+t3flBB/DywWr68pu9XnW3SSu8+Bsze9nrI8Zwc4DMnkavKoXvCb2QJ0NyT4Wkqsc
+O7z+Ht/hFRjUXRhjqIk+GTM6G61Ndoi594VCAJTMROd3DweAGSNGVNmIj8goOY9U
+4qU59Cr0HHuY9P7z0MzM1MncMTpC9KvHSFUt+yjt8FFVU8f+psqmGIgnXjEzf2Cl
+LXNUWZ+v7OtUKCljfaT7tqKLWxmyxuyf64dhBnC/AFrFUJRYuts=
+=BpM3
+-END PGP SIGNATURE-

Added: release/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.zip.asc
==
--- release/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.zip.asc 
(added)
+++ release/tomcat/tomcat-10/v10.0.0-M4/bin/apache-tomcat-10.0.0-M4.zip.asc Thu 
Apr 23 18:23:13 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl6HLHkACgkQEMAcWi9g
+WecgSA/+JQdnUtpwNcWccqfozUyLaQE3ACIfH2ZJlscg1v3M2EH6h1oGbOIb0LEH
+9bV+Ttj46L+BWsRnkgh22+MciwI/as8xv60IS8DwhPWZg4rO5I1DDqAMadS7dXE1
+Iy5r7XEc77IEuQOpEMvsrcEUyR6ozgYFrATa+yOCHAfO1qw4AfZe7DFbEiFqNfx3
+/IU/3xSQXfJpAVJxUjDzLpVanMvx0sq+gFqGd9zyIB/JGYhoQoHbCjxmMCB21gCL
+csBBzdUoBrWv4cM1pRe5TygGsCwJa4O9hl4vdZHopLsSYDXAGNZQj1Yz+AhxSa0V
+1sjUG1pEZRYTxloyNVi2Spyt5/L4Pnzt+5A1O+LytJlCkQBtjTq/BRyftgeYaqnI
+dPMjcSwnmbv4ezleADQrnM/REMrGjcjg3qZCw73M3x4jTqUX5KTCkyFBUir/ZK8d
+5RXW0RWU2IFF+e0Ij+MmEwxxyXFj8ZoDk9XgYIvLnVCvjMSTjKx98cO8DF/MvgRF
+hAM5fO59WhO8EvYgCRW5KAo8MnWDhQ43n2YA9qqvBjs3Z0x4IygOwuX/jdp8gR8h
+kuGqM0zfjSe6G5sSKl4eTVH/ekR4rpXKDR85gAQ+A+0qCn/wb+192J7aruR/cRAB
+5PUeHjl16faHuOlEjMut1czIUbYI9GyGwcJNrwemQDGMuZsPgEc=
+=aoNI
+-END PGP SIGNATURE-



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

[GitHub] [tomcat] larsgrefer commented on a change in pull request #273: Use enhanced for loops where possible

[GitBox]

larsgrefer commented on a change in pull request #273:
URL: https://github.com/apache/tomcat/pull/273#discussion_r413983378



##
File path: java/jakarta/el/Util.java
##
@@ -380,11 +380,12 @@ static Method findMethod(Class clazz, Object base, 
String methodName,
 private static final String paramString(Class[] types) {
 if (types != null) {
 StringBuilder sb = new StringBuilder();
-for (int i = 0; i < types.length; i++) {
-if (types[i] == null) {
+for (Class type : types) {
+if (type == null) {
 sb.append("null, ");
-} else {
-sb.append(types[i].getName()).append(", ");
+}
+else {

Review comment:
   The if-else formatting should be fixed now





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: [tomcat-native] branch master updated: Tweak wording. Fix typo.

[Michael Osipov]

Am 2020-04-23 um 18:48 schrieb ma...@apache.org:

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-native.git


The following commit(s) were added to refs/heads/master by this push:
  new 3cc27fa  Tweak wording. Fix typo.
3cc27fa is described below

commit 3cc27faf7da0990c143cad8a68bda884d8c524db
Author: Mark Thomas 
AuthorDate: Thu Apr 23 17:48:12 2020 +0100

 Tweak wording. Fix typo.
---
  native/srclib/VERSIONS | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index 52ef8fa..f6b09de 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -3,5 +3,5 @@ The following version of the libraries are recommended:
  - APR 1.7.0 or later, http://apr.apache.org
  - OpenSSL 1.1.1g or later, http://www.openssl.org
  
-Older versions may also work but are not as throughly tested by the Tomcat

+Older versions should also work but are not as thoroughly tested by the Tomcat


I am happy with that.

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

[GitHub] [tomcat] michael-o edited a comment on issue #282: Improve IDE support for IntelliJ IDEA

[GitBox]

michael-o edited a comment on issue #282:
URL: https://github.com/apache/tomcat/pull/282#issuecomment-618526886


   @larsgrefer I'd like to quote @markt-asf on point 2 and 3 when we met in 
person: "I can type `ant ide-...` and I am done.". If you whink that `ant 
ide-...` is not present enough, let's change this. You might be spoiled just 
like my importing a Maven project and it simply works.



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] michael-o commented on issue #282: Improve IDE support for IntelliJ IDEA

[GitBox]

michael-o commented on issue #282:
URL: https://github.com/apache/tomcat/pull/282#issuecomment-618526886


   @larsgrefer I'd like to quote @markt-asf on point 2 and 3 while we met in 
person: "I can type `ant ide-...` and I am done.". If you whink that `ant 
ide-...` is not present enough, let's change this. You might be spoiled just 
like my importing a Maven project and it simply works.



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 #282: Improve IDE support for IntelliJ IDEA

[GitBox]

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


   Some community members (really) dislike having the clutter in the root of 
the repository. Some IDEs are worse than others for this (IDEA seems to be one 
of the better ones). There was a shortish debate on this about 10 years ago and 
we decided that the res-ide-support approach was the compromise we could all 
live with.
   I dislike the clutter but I agree your views on the disadvantages. That is 
why I have never used them. I view them as reasonable starting points for 
relatively new Java developers who new to the Tomcat project.



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] larsgrefer commented on issue #282: Improve IDE support for IntelliJ IDEA

[GitBox]

larsgrefer commented on issue #282:
URL: https://github.com/apache/tomcat/pull/282#issuecomment-618515960


   @michael-o You already have them for IntelliJ IDEA, Eclipse and NetBeans
   
   My idea was not to hide them in `res/ide-support/idea` but to directly put 
them where they belong.
   
   Putting them in `res/ide-support/idea` has the following disadvantages in my 
opinion:
   1. After adjusting IDE settings (thus changing the files in .idea) one has 
to remember to update the copies in `res/ide-support/idea`
   2. Ever new contributor must know that the ant target `ide-intellij` exists 
and execute it.
   3. Every existing contributor must remember to reexecute the ant target 
after checking out a revision where the files in `res/ide-support/idea` are 
different from his(her) local .idea folder



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-native] branch master updated: Tweak wording. Fix typo.

[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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new 3cc27fa  Tweak wording. Fix typo.
3cc27fa is described below

commit 3cc27faf7da0990c143cad8a68bda884d8c524db
Author: Mark Thomas 
AuthorDate: Thu Apr 23 17:48:12 2020 +0100

Tweak wording. Fix typo.
---
 native/srclib/VERSIONS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index 52ef8fa..f6b09de 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -3,5 +3,5 @@ The following version of the libraries are recommended:
 - APR 1.7.0 or later, http://apr.apache.org
 - OpenSSL 1.1.1g or later, http://www.openssl.org
 
-Older versions may also work but are not as throughly tested by the Tomcat
+Older versions should also work but are not as thoroughly tested by the Tomcat
 Native team
\ No newline at end of file


-
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 #282: Improve IDE support for IntelliJ IDEA

[GitBox]

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


   These need to be placed in `res/ide-support/idea` and you probably want to 
check that the `ide-intellij` Ant target will do the right thing with them and 
if not, adjust 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] larsgrefer opened a new pull request #283: Remove implicit unboxing

[GitBox]

larsgrefer opened a new pull request #283:
URL: https://github.com/apache/tomcat/pull/283


   



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: [tomcat-native] 02/03: Update version recommendations

[Mark Thomas]

On 23/04/2020 17:29, Michael Osipov wrote:
> Am 2020-04-23 um 17:43 schrieb ma...@apache.org:
>> 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-native.git
>>
>> commit 04497fe553ac4a5497eeb7c011275c8e14eb6fec
>> Author: Mark Thomas 
>> AuthorDate: Thu Apr 23 16:25:10 2020 +0100
>>
>>  Update version recommendations
>> ---
>>   native/srclib/VERSIONS | 9 ++---
>>   1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
>> index a5feb4c..52ef8fa 100644
>> --- a/native/srclib/VERSIONS
>> +++ b/native/srclib/VERSIONS
>> @@ -1,4 +1,7 @@
>> -Use the following version of the libraries
>> +The following version of the libraries are recommended:
>>   -- APR 1.6.5 or later, http://apr.apache.org
>> -- OpenSSL 1.0.2r or later, http://www.openssl.org
>> +- APR 1.7.0 or later, http://apr.apache.org
>> +- OpenSSL 1.1.1g or later, http://www.openssl.org
>> +
>> +Older versions may also work but are not as throughly tested by the
>> Tomcat
>> +Native team
> 
> This looks wrong to me in a patch version. This should have happened in
> December with a proper announcement and with a 1.3 release of
> libtcnative. Also consider that there are no effective changes in 1.7.0
> [1] for us which require/recommend using 1.7.x at all.
> 
> Please revert, release 1.2.24, announce recommendation for 1.3, bump
> master to 1.3.

No.

Recommended != Required.

We always recommend using the latest versions.

If you look at the history of the file you will see similar transitions
during the Tomcat 1.2.x lifetime.

Mark

-
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 issue #282: Improve IDE support for IntelliJ IDEA

[GitBox]

michael-o commented on issue #282:
URL: https://github.com/apache/tomcat/pull/282#issuecomment-618507565


   I am against IDE-specific config files, those should be automatically 
generated. Next one will request, VS Code, Eclipse, NetBeans, YouNameIt.



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] larsgrefer opened a new pull request #282: Improve IDE support for IntelliJ IDEA

[GitBox]

larsgrefer opened a new pull request #282:
URL: https://github.com/apache/tomcat/pull/282


   This change makes IntelliJ IDEA and other IDE's aware of some of the coding 
standards of the Tomcat project.
   
   The .editorconfig file (and the rules therein) will be automatically used by 
the Editors listed here: https://editorconfig.org/#download
   
   The files in the .idea folder are for IntellIJ IDEA only. I deliberately put 
them directly there (and not in `res/ide-support/idea`) so no manual setup is 
neccessary for them to take effect.



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] michael-o commented on issue #277: Refuse adding invalid HTTP 2.0 headers

[GitBox]

michael-o commented on issue #277:
URL: https://github.com/apache/tomcat/pull/277#issuecomment-618504729


   Please note that there may be client components which may explicitly close 
connections with `Connection: close`. E.g., in `SpnegoAuthenticator`.



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: [tomcat-native] 02/03: Update version recommendations

[Michael Osipov]

Am 2020-04-23 um 17:43 schrieb ma...@apache.org:

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-native.git

commit 04497fe553ac4a5497eeb7c011275c8e14eb6fec
Author: Mark Thomas 
AuthorDate: Thu Apr 23 16:25:10 2020 +0100

 Update version recommendations
---
  native/srclib/VERSIONS | 9 ++---
  1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index a5feb4c..52ef8fa 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -1,4 +1,7 @@
-Use the following version of the libraries
+The following version of the libraries are recommended:
  
-- APR 1.6.5 or later, http://apr.apache.org

-- OpenSSL 1.0.2r or later, http://www.openssl.org
+- APR 1.7.0 or later, http://apr.apache.org
+- OpenSSL 1.1.1g or later, http://www.openssl.org
+
+Older versions may also work but are not as throughly tested by the Tomcat
+Native team


This looks wrong to me in a patch version. This should have happened in 
December with a proper announcement and with a 1.3 release of 
libtcnative. Also consider that there are no effective changes in 1.7.0 
[1] for us which require/recommend using 1.7.x at all.


Please revert, release 1.2.24, announce recommendation for 1.3, bump 
master to 1.3.


Michael

[1] https://downloads.apache.org/apr/CHANGES-APR-1.7

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

[tomcat-native] branch master updated: Update patch for APR 1.7.x

[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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new ba42a1e  Update patch for APR 1.7.x
ba42a1e is described below

commit ba42a1ed4306d8c360a359737bae5b7e0cce4788
Author: Mark Thomas 
AuthorDate: Thu Apr 23 17:00:53 2020 +0100

Update patch for APR 1.7.x
---
 native/srclib/apr/apr-enable-ipv6.patch | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/native/srclib/apr/apr-enable-ipv6.patch 
b/native/srclib/apr/apr-enable-ipv6.patch
index 5c98a12..26257ed 100644
--- a/native/srclib/apr/apr-enable-ipv6.patch
+++ b/native/srclib/apr/apr-enable-ipv6.patch
@@ -1,15 +1,6 @@
 --- include/apr.hw
 +++ include/apr.hw
-@@ -276,7 +276,7 @@
- #define APR_HAVE_IN_ADDR1
- #define APR_HAVE_INET_ADDR  1
- #define APR_HAVE_INET_NETWORK   0
--#define APR_HAVE_IPV6   0
-+#define APR_HAVE_IPV6   1
- #define APR_HAVE_MEMMOVE1
- #define APR_HAVE_SETRLIMIT  0
- #define APR_HAVE_SIGACTION  0
-@@ -340,7 +340,7 @@
+@@ -367,7 +367,7 @@
  /* If we have a TCP implementation that can be "corked", what flag
   * do we use?
   */


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

[tomcat-native] 03/03: Estimate 1.2.24 release date as 2020-04-29. Update news pages.

[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-native.git

commit cdee1db5349ae139d8244a21754b2ac5aad524e8
Author: Mark Thomas 
AuthorDate: Thu Apr 23 16:43:09 2020 +0100

Estimate 1.2.24 release date as 2020-04-29. Update news pages.

Add new page for 2020. Fix copy/paste issues for 2019. Add links for
2019 and 2020. (and 2017 & 2018 for the changelog)
---
 xdocs/miscellaneous/project.xml   |  3 +++
 xdocs/news/2019.xml   |  4 ++--
 xdocs/news/{2019.xml => 2020.xml} | 15 +--
 xdocs/project.xml |  2 ++
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml
index 2d413f6..c73abc8 100644
--- a/xdocs/miscellaneous/project.xml
+++ b/xdocs/miscellaneous/project.xml
@@ -34,6 +34,9 @@
 
 
 
+
+
+
 
 
 
diff --git a/xdocs/news/2019.xml b/xdocs/news/2019.xml
index 8521eec..7c8fa58 100644
--- a/xdocs/news/2019.xml
+++ b/xdocs/news/2019.xml
@@ -18,12 +18,12 @@
 
 ]>
-
+
 
   
 
   
-2018 News and Status
+2019 News and Status
   
 
 
diff --git a/xdocs/news/2019.xml b/xdocs/news/2020.xml
similarity index 69%
copy from xdocs/news/2019.xml
copy to xdocs/news/2020.xml
index 8521eec..74ac3b0 100644
--- a/xdocs/news/2019.xml
+++ b/xdocs/news/2020.xml
@@ -18,25 +18,20 @@
 
 ]>
-
+
 
   
 
   
-2018 News and Status
+2020 News and Status
   
 
 
 
-
- 
+
+ 
   The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.23. This is a bugfix release.
-  
- 
- 
-  The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.21. This is a bugfix release.
+  Tomcat Native 1.2.24. This is a bugfix release.
   
  
 
diff --git a/xdocs/project.xml b/xdocs/project.xml
index 976dba4..2eb025c 100644
--- a/xdocs/project.xml
+++ b/xdocs/project.xml
@@ -34,6 +34,8 @@
 
 
 
+  
+  
   
   
   


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

[tomcat-native] branch master updated (db11788 -> cdee1db)

[markt]

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

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


from db11788  Add changelog entry for BZ 63701
 new c49be39  Remove OpenSSL 1.0.2 patch file as that version is no longer 
supported
 new 04497fe  Update version recommendations
 new cdee1db  Estimate 1.2.24 release date as 2020-04-29. Update news pages.

The 3 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:
 native/srclib/VERSIONS |  9 ---
 native/srclib/openssl/openssl-msvcrt.patch | 41 --
 xdocs/miscellaneous/project.xml|  3 +++
 xdocs/news/2019.xml|  4 +--
 xdocs/news/{2019.xml => 2020.xml}  | 15 ---
 xdocs/project.xml  |  2 ++
 6 files changed, 18 insertions(+), 56 deletions(-)
 delete mode 100644 native/srclib/openssl/openssl-msvcrt.patch
 copy xdocs/news/{2019.xml => 2020.xml} (69%)


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

[tomcat-native] 02/03: Update version recommendations

[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-native.git

commit 04497fe553ac4a5497eeb7c011275c8e14eb6fec
Author: Mark Thomas 
AuthorDate: Thu Apr 23 16:25:10 2020 +0100

Update version recommendations
---
 native/srclib/VERSIONS | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index a5feb4c..52ef8fa 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -1,4 +1,7 @@
-Use the following version of the libraries
+The following version of the libraries are recommended:
 
-- APR 1.6.5 or later, http://apr.apache.org
-- OpenSSL 1.0.2r or later, http://www.openssl.org
+- APR 1.7.0 or later, http://apr.apache.org
+- OpenSSL 1.1.1g or later, http://www.openssl.org
+
+Older versions may also work but are not as throughly tested by the Tomcat
+Native team
\ No newline at end of file


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

[tomcat-native] 01/03: Remove OpenSSL 1.0.2 patch file as that version is no longer supported

[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-native.git

commit c49be394cc945c0c1c4656d68eb5c69846791e7e
Author: Mark Thomas 
AuthorDate: Thu Apr 23 16:21:13 2020 +0100

Remove OpenSSL 1.0.2 patch file as that version is no longer supported
---
 native/srclib/openssl/openssl-msvcrt.patch | 41 --
 1 file changed, 41 deletions(-)

diff --git a/native/srclib/openssl/openssl-msvcrt.patch 
b/native/srclib/openssl/openssl-msvcrt.patch
deleted file mode 100644
index d494e89..000
--- a/native/srclib/openssl/openssl-msvcrt.patch
+++ /dev/null
@@ -1,41 +0,0 @@
 crypto/o_time.c
-+++ crypto/o_time.c
-@@ -109,10 +109,6 @@
- if (gmtime_r(timer, result) == NULL)
- return NULL;
- ts = result;
--#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
--if (gmtime_s(result, timer))
--return NULL;
--ts = result;
- #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
- ts = gmtime(timer);
- if (ts == NULL)
 util/pl/VC-32.pl
-+++ util/pl/VC-32.pl
-@@ -45,7 +45,7 @@
- # considered safe to ignore.
- # 
- $base_cflags= " $mf_cflag";
--my $f = $shlib || $fips ?' /MD':' /MT';
-+my $f = ' /MD';
- $opt_cflags=$f.' /Ox';
- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
- $lflags="/nologo /subsystem:console /opt:ref";
-@@ -130,7 +130,7 @@
- else  # Win32
- {
- $base_cflags= " $mf_cflag";
--my $f = $shlib || $fips ?' /MD':' /MT';
-+my $f = ' /MD';
- $ff = "/fixed";
- $opt_cflags=$f.' /Ox /O2 /Ob2';
- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -194,6 +194,7 @@
-   {
-   $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
-   $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` 
=~ /14\.00\.4[0-9]{4}\./);
-+  $ex_libs.=' $(EXTRA_LIBS)';
-   # WIN32 UNICODE build gets linked with unicows.lib for
-   # backward compatibility with Win9x.
-   $ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ 
/\-DUNICODE/);


-
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

[GitBox]

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


   Yes, it is accurate if there's a "connection: foobar" header, then there 
could be a "foobar" header and in that case it's tied to the connection header.
   
   Note about my earlier "proposal" for HTTP/1.1, the connection header is used 
by the websocket.server.UpgradeUtil helper class to allow upgrade through the 
API. So it's not possible to filter it and be done, this would have to be fixed 
as well [not sure how]. Servlet apps can upgrade through the proper API and 
would not be affected.



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] rmaucher commented on issue #281: Change FilterChain holder from array to list

[GitBox]

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


   When I look at https://github.com/apache/tomcat/pull/271 in comparison, it 
has an extensive "why" demonstrating why it is actually better and it is not 
simply cosmetics.



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: Refuse adding invalid HTTP 2.0 headers

[GitBox]

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


   I've been reading the HTTP/2 RFC and there is more to this than simply 
blocking the `connection` header.
   1. What the HTTP/2 and HTTP/1.1 specs suggest we should be doing in parsing 
an attempt to set the `connection` header and then blocking that header *and* 
and connection level headers it specifies whether set previously or not.
   1. There is the general question of whether we should be targeting just 
HTTP/2 or whether we should be preventing applications doing this regardless of 
protocol.
   
   We need to figure out what we actually want to do first.
   
   I'm currently leaning towards introducing logging of attempts to set 
connection level headers with a warning that a future version will block the 
attempt. Probably with `UserDataHelper` to keep log volumes down even though 
this isn't really user data.



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 #281: Change FilterChain holder from array to list

[GitBox]

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


   The question is "At what cost?" I have two concerns.
   1. Regressions. The changes should be obvious and easy to check but there 
are plenty of examples in the history of Tomcat of seemingly simple clean-up 
triggering unintended regressions. That isn't a reason not to do it but there 
needs to be a clear benefit - such as reduced lines of code - of making the 
change.
   2. Performance. I have in the past seen very significant performance drops 
changing from a simple array to an object (byte[] to ByteBuffer is the case I 
am thinking of). We need to be very careful of changes that are on the critical 
path (get executed for all/most requests). In those cases I would want to see 
repeatable performance numbers that demonstrated the performance cost/benefit 
of making the change including the impact on garbage generation. 
`ApplicationFilterChain` falls into this category.



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] martin-g commented on issue #276: Add s390x Travis support

[GitBox]

martin-g commented on issue #276:
URL: https://github.com/apache/tomcat/pull/276#issuecomment-618443203


   Thank you, @prankkelkar !



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 master updated (5c76750 -> cbe6edb)

[mgrigorov]

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

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


from 5c76750  Fix changelog tags
 new a3ddb06  s390x travis
 new ba95d82  Revert changes as per review comments
 new cbe6edb  Merge pull request #276 from linux-on-ibm-z/s390x-travis

The 22105 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:
 .travis.yml | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)


-
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 #281: Change FilterChain holder from array to list

[GitBox]

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


   There are so many places in the codebase where we can replace array with 
List could reduce good amount of code. 



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 edited a comment on issue #281: Change FilterChain holder from array to list

[GitBox]

govi20 edited a comment on issue #281:
URL: https://github.com/apache/tomcat/pull/281#issuecomment-61843


   There are so many places in the codebase where we can replace array with 
List and we could reduce good amount of code. 



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: [tomcat] branch master updated: Fix changelog tags

[Mark Thomas]

On 23/04/2020 13:46, r...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> remm 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 5c76750  Fix changelog tags

Thanks.

Mark

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

[GitHub] [tomcat] ChristopherSchultz commented on issue #281: Change FilterChain holder from array to list

[GitBox]

ChristopherSchultz commented on issue #281:
URL: https://github.com/apache/tomcat/pull/281#issuecomment-618426909


   There *is* some code-reduction, and therefore a reduction in the possibility 
of bugs. Obviously, this code is well-tested and does indeed work.
   
   Another possible advantage is that the List can become unmodifiable at some 
point, which may possibly improve security and/or code-safety.



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] martin-g commented on issue #276: Add s390x Travis support

[GitBox]

martin-g commented on issue #276:
URL: https://github.com/apache/tomcat/pull/276#issuecomment-618421407


   Thanks for the explanation, Rainer!
   I've restarted the job at Travis. Let's see!



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] rainerjung commented on issue #276: Add s390x Travis support

[GitBox]

rainerjung commented on issue #276:
URL: https://github.com/apache/tomcat/pull/276#issuecomment-618408120


   Hi Martin,
   
   the build.xml line numbers
   
   /home/travis/build/apache/tomcat/build.xml:2789: The following error 
   occurred while executing this line:
   
   /home/travis/build/apache/tomcat/build.xml:3124: The following error 
   occurred while executing this line:
   
   /home/travis/build/apache/tomcat/build.xml:3240: 
   javax.net.ssl.SSLHandshakeException: PKIX path validation failed:
   
   point at the commons-daemon download via an Apache mirror. So I guess 
   one of the mirrors uses an outdated certificate? If so, the error will 
   be intermittent, depending on which mirror is chosen.
   
   Regards,
   
   Rainer
   
   Am 23.04.2020 um 15:44 schrieb Martin Grigorov:
   > The build for s390x fails at Travis: 
   > https://travis-ci.org/github/apache/tomcat/jobs/678503882
   > 
   > |Caused by: java.security.cert.CertificateExpiredException: NotAfter: 
   > Sat Dec 21 13:45:49 UTC 2019 at 
   > 
java.base/sun.security.x509.CertificateValidity.valid(CertificateValidity.java:274)
 
   > at 
   > 
java.base/sun.security.x509.X509CertImpl.checkValidity(X509CertImpl.java:675) 
   > at 
   > 
java.base/sun.security.provider.certpath.BasicChecker.verifyValidity(BasicChecker.java:190)
 
   > at 
   > 
java.base/sun.security.provider.certpath.BasicChecker.check(BasicChecker.java:144)
 
   > at 
   > 
java.base/sun.security.provider.certpath.PKIXMasterCertPathValidator.validate(PKIXMasterCertPathValidator.java:125)
 
   > ... 28 more |
   > 
   > I have no idea what is going on.
   > 
   > —
   > You are receiving this because you are subscribed to this thread.
   > Reply to this email directly, view it on GitHub 
   > , or 
   > unsubscribe 
   > 
.
   > 
   



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] martin-g commented on issue #276: Add s390x Travis support

[GitBox]

martin-g commented on issue #276:
URL: https://github.com/apache/tomcat/pull/276#issuecomment-618402125


   The build for s390x fails at Travis: 
https://travis-ci.org/github/apache/tomcat/jobs/678503882
   
   ```
   Caused by: java.security.cert.CertificateExpiredException: NotAfter: Sat Dec 
21 13:45:49 UTC 2019
at 
java.base/sun.security.x509.CertificateValidity.valid(CertificateValidity.java:274)
at 
java.base/sun.security.x509.X509CertImpl.checkValidity(X509CertImpl.java:675)
at 
java.base/sun.security.provider.certpath.BasicChecker.verifyValidity(BasicChecker.java:190)
at 
java.base/sun.security.provider.certpath.BasicChecker.check(BasicChecker.java:144)
at 
java.base/sun.security.provider.certpath.PKIXMasterCertPathValidator.validate(PKIXMasterCertPathValidator.java:125)
... 28 more
   ```
   
   I have no idea what is going on.



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] rmaucher commented on issue #281: Change FilterChain holder from array to list

[GitBox]

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


   This commit seems functionally useless but is solely motivated by personal 
preferences. At the very least, they should be accompanied by quick perf 
numbers that show equivalence or 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

[tomcat] branch 8.5.x updated: Fix changelog tags

[remm]

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

remm 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 79ce608  Fix changelog tags
79ce608 is described below

commit 79ce608ac8274f98bb80583f96527972f4eea76c
Author: remm 
AuthorDate: Thu Apr 23 14:46:39 2020 +0200

Fix changelog tags
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4362c85..1e86283 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,14 +116,14 @@
   
 
   
-  
+  
 
   
 Fix the saving of a Context configuration file via the scripting
 interface of the Manager web application. (markt)
   
 
-  
+  
   
 
   


-
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: Fix changelog tags

[remm]

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

remm 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 2c81c41  Fix changelog tags
2c81c41 is described below

commit 2c81c41d8b61f33a8837b243ae648bca30183919
Author: remm 
AuthorDate: Thu Apr 23 14:46:39 2020 +0200

Fix changelog tags
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b657b4b..b6d1574 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,14 +114,14 @@
   
 
   
-  
+  
 
   
 Fix the saving of a Context configuration file via the scripting
 interface of the Manager web application. (markt)
   
 
-  
+  
   
 
   


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

[tomcat] branch master updated: Fix changelog tags

[remm]

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

remm 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 5c76750  Fix changelog tags
5c76750 is described below

commit 5c767509a4f12816f38fe58bb4c14dea2eab435e
Author: remm 
AuthorDate: Thu Apr 23 14:46:39 2020 +0200

Fix changelog tags
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3688633..9f868fa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,14 +129,14 @@
   
 
   
-  
+  
 
   
 Fix the saving of a Context configuration file via the scripting
 interface of the Manager web application. (markt)
   
 
-  
+  
   
 
   


-
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 #281: Change FilterChain holder from array to list

[GitBox]

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


   Instead of resizing array manually, we can leverage `List` to hold 
filter-chain



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 success in on tomcat-9-trunk

[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/194

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] 8c4afe44381eac40a6c7a6e62b094ef42ef72762
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

[Bug 59203] Try to call Thread.interrupt before calling Thread.stop in WebappClassLoaderBase#clearReferencesThreads

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #5 from Mark Thomas  ---
Thanks for the PR.

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
- 7.0.x for 7.0.104 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 7.0.x updated: Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()

[markt]

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

markt 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 c8ef0bd  Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()
c8ef0bd is described below

commit c8ef0bd6ac1da711dc253d1e2306528741c01639
Author: Mark Thomas 
AuthorDate: Thu Apr 23 12:29:18 2020 +0100

Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()

https://bz.apache.org/bugzilla/show_bug.cgi?id=59203
---
 .../catalina/loader/WebappClassLoaderBase.java | 36 +++---
 webapps/docs/changelog.xml |  7 +
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 91f2a83..968c215 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -2517,7 +2517,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 @SuppressWarnings("deprecation") // thread.stop()
 private void clearReferencesThreads() {
 Thread[] threads = getThreads();
-List executorThreadsToStop = new ArrayList();
+List threadsToStop = new ArrayList();
 
 // Iterate over the set of threads
 for (Thread thread : threads) {
@@ -2626,29 +2626,29 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 thread.getName(), contextName), e);
 }
 
-if (usingExecutor) {
-// Executor may take a short time to stop all the
-// threads. Make a note of threads that should be
-// stopped and check them at the end of the method.
-executorThreadsToStop.add(thread);
-} else {
-// This method is deprecated and for good reason. This
-// is very risky code but is the only option at this
-// point. A *very* good reason for apps to do this
-// clean-up themselves.
-thread.stop();
+// Stopping an executor automatically interrupts the
+// associated threads. For non-executor threads, interrupt
+// them here.
+if (!usingExecutor && !thread.isInterrupted()) {
+thread.interrupt();
 }
+
+// Threads are expected to take a short time to stop after
+// being interrupted. Make a note of all threads that are
+// expected to stop to enable them to be checked at the end
+// of this method.
+threadsToStop.add(thread);
 }
 }
 }
 
-// If thread stopping is enabled, executor threads should have been
-// stopped above when the executor was shut down but that depends on 
the
-// thread correctly handling the interrupt. Give all the executor
-// threads a few seconds shutdown and if they are still running
-// Give threads up to 2 seconds to shutdown
+// If thread stopping is enabled, threads should have been stopped 
above
+// when the executor was shut down or the thread was interrupted but
+// that depends on the thread correctly handling the interrupt. Check
+// each thread and if any are still running give all threads up to a
+// total of 2 seconds to shutdown.
 int count = 0;
-for (Thread t : executorThreadsToStop) {
+for (Thread t : threadsToStop) {
 while (t.isAlive() && count < 100) {
 try {
 Thread.sleep(20);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c49e4ab..a06c14b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -67,6 +67,13 @@
 perform MIME type mapping based on file extension in a case insensitive
 manner. (markt)
   
+  
+59203: Before calling Thread.stop() (if
+configured to do so) on a web application created thread that is not
+stopped by the web application when the web application is stopped, try
+interrupting the thread first. Based on a pull request by Govinda
+Sakhare. (markt)
+  
   
 64226: Reset timezone after parsing a date since the date
 format is reused. Test case submitted by Gary Thomas. (remm)


-
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: Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()

[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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new acd2f7c  Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()
acd2f7c is described below

commit acd2f7c0f16147894f18525d7ed304e1e3654ebd
Author: Mark Thomas 
AuthorDate: Thu Apr 23 12:29:18 2020 +0100

Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()

https://bz.apache.org/bugzilla/show_bug.cgi?id=59203
---
 .../catalina/loader/WebappClassLoaderBase.java | 36 +++---
 webapps/docs/changelog.xml |  7 +
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 943de9d..5d8506e 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1689,7 +1689,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 @SuppressWarnings("deprecation") // thread.stop()
 private void clearReferencesThreads() {
 Thread[] threads = getThreads();
-List executorThreadsToStop = new ArrayList<>();
+List threadsToStop = new ArrayList<>();
 
 // Iterate over the set of threads
 for (Thread thread : threads) {
@@ -1785,29 +1785,29 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 thread.getName(), getContextName()), e);
 }
 
-if (usingExecutor) {
-// Executor may take a short time to stop all the
-// threads. Make a note of threads that should be
-// stopped and check them at the end of the method.
-executorThreadsToStop.add(thread);
-} else {
-// This method is deprecated and for good reason. This
-// is very risky code but is the only option at this
-// point. A *very* good reason for apps to do this
-// clean-up themselves.
-thread.stop();
+// Stopping an executor automatically interrupts the
+// associated threads. For non-executor threads, interrupt
+// them here.
+if (!usingExecutor && !thread.isInterrupted()) {
+thread.interrupt();
 }
+
+// Threads are expected to take a short time to stop after
+// being interrupted. Make a note of all threads that are
+// expected to stop to enable them to be checked at the end
+// of this method.
+threadsToStop.add(thread);
 }
 }
 }
 
-// If thread stopping is enabled, executor threads should have been
-// stopped above when the executor was shut down but that depends on 
the
-// thread correctly handling the interrupt. Give all the executor
-// threads a few seconds shutdown and if they are still running
-// Give threads up to 2 seconds to shutdown
+// If thread stopping is enabled, threads should have been stopped 
above
+// when the executor was shut down or the thread was interrupted but
+// that depends on the thread correctly handling the interrupt. Check
+// each thread and if any are still running give all threads up to a
+// total of 2 seconds to shutdown.
 int count = 0;
-for (Thread t : executorThreadsToStop) {
+for (Thread t : threadsToStop) {
 while (t.isAlive() && count < 100) {
 try {
 Thread.sleep(20);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cfb9a92..4362c85 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -73,6 +73,13 @@
 Add more descriptive error message in DefaultServlet for SC_NOT_FOUND.
 (michaelo)
   
+  
+59203: Before calling Thread.stop() (if
+configured to do so) on a web application created thread that is not
+stopped by the web application when the web application is stopped, try
+interrupting the thread first. Based on a pull request by Govinda
+Sakhare. (markt)
+  
   
 64309; Improve the regular expression used to search for
 class loader repositories when bootstrapping Tomcat. Pull request


-
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: Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()

[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 8c4afe4  Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()
8c4afe4 is described below

commit 8c4afe44381eac40a6c7a6e62b094ef42ef72762
Author: Mark Thomas 
AuthorDate: Thu Apr 23 12:29:18 2020 +0100

Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()

https://bz.apache.org/bugzilla/show_bug.cgi?id=59203
---
 .../catalina/loader/WebappClassLoaderBase.java | 36 +++---
 webapps/docs/changelog.xml |  7 +
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 23ccad0..d22263b 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1713,7 +1713,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 @SuppressWarnings("deprecation") // thread.stop()
 private void clearReferencesThreads() {
 Thread[] threads = getThreads();
-List executorThreadsToStop = new ArrayList<>();
+List threadsToStop = new ArrayList<>();
 
 // Iterate over the set of threads
 for (Thread thread : threads) {
@@ -1809,29 +1809,29 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 thread.getName(), getContextName()), e);
 }
 
-if (usingExecutor) {
-// Executor may take a short time to stop all the
-// threads. Make a note of threads that should be
-// stopped and check them at the end of the method.
-executorThreadsToStop.add(thread);
-} else {
-// This method is deprecated and for good reason. This
-// is very risky code but is the only option at this
-// point. A *very* good reason for apps to do this
-// clean-up themselves.
-thread.stop();
+// Stopping an executor automatically interrupts the
+// associated threads. For non-executor threads, interrupt
+// them here.
+if (!usingExecutor && !thread.isInterrupted()) {
+thread.interrupt();
 }
+
+// Threads are expected to take a short time to stop after
+// being interrupted. Make a note of all threads that are
+// expected to stop to enable them to be checked at the end
+// of this method.
+threadsToStop.add(thread);
 }
 }
 }
 
-// If thread stopping is enabled, executor threads should have been
-// stopped above when the executor was shut down but that depends on 
the
-// thread correctly handling the interrupt. Give all the executor
-// threads a few seconds shutdown and if they are still running
-// Give threads up to 2 seconds to shutdown
+// If thread stopping is enabled, threads should have been stopped 
above
+// when the executor was shut down or the thread was interrupted but
+// that depends on the thread correctly handling the interrupt. Check
+// each thread and if any are still running give all threads up to a
+// total of 2 seconds to shutdown.
 int count = 0;
-for (Thread t : executorThreadsToStop) {
+for (Thread t : threadsToStop) {
 while (t.isAlive() && count < 100) {
 try {
 Thread.sleep(20);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a7de3b8..b657b4b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -71,6 +71,13 @@
 Add more descriptive error message in DefaultServlet for SC_NOT_FOUND.
 (michaelo)
   
+  
+59203: Before calling Thread.stop() (if
+configured to do so) on a web application created thread that is not
+stopped by the web application when the web application is stopped, try
+interrupting the thread first. Based on a pull request by Govinda
+Sakhare. (markt)
+  
   
 64309; Improve the regular expression used to search for
 class loader repositories when bootstrapping Tomcat. Pull request


-
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 #275: BZ 59203 - interrupt tomcat threads instead of stopping

[GitBox]

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


   Thanks. I used a variation of your PR to fix this.



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 master updated: Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()

[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 2e52596  Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()
2e52596 is described below

commit 2e525965521d8c6288b5745113ee5dc906c3be62
Author: Mark Thomas 
AuthorDate: Thu Apr 23 12:29:18 2020 +0100

Fix BZ 59203 - Try Thread.interrupt() before Thread.stop()

https://bz.apache.org/bugzilla/show_bug.cgi?id=59203
---
 .../catalina/loader/WebappClassLoaderBase.java | 36 +++---
 webapps/docs/changelog.xml |  7 +
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index b9439a2..4d83153 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1712,7 +1712,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 @SuppressWarnings("deprecation") // thread.stop()
 private void clearReferencesThreads() {
 Thread[] threads = getThreads();
-List executorThreadsToStop = new ArrayList<>();
+List threadsToStop = new ArrayList<>();
 
 // Iterate over the set of threads
 for (Thread thread : threads) {
@@ -1808,29 +1808,29 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 thread.getName(), getContextName()), e);
 }
 
-if (usingExecutor) {
-// Executor may take a short time to stop all the
-// threads. Make a note of threads that should be
-// stopped and check them at the end of the method.
-executorThreadsToStop.add(thread);
-} else {
-// This method is deprecated and for good reason. This
-// is very risky code but is the only option at this
-// point. A *very* good reason for apps to do this
-// clean-up themselves.
-thread.stop();
+// Stopping an executor automatically interrupts the
+// associated threads. For non-executor threads, interrupt
+// them here.
+if (!usingExecutor && !thread.isInterrupted()) {
+thread.interrupt();
 }
+
+// Threads are expected to take a short time to stop after
+// being interrupted. Make a note of all threads that are
+// expected to stop to enable them to be checked at the end
+// of this method.
+threadsToStop.add(thread);
 }
 }
 }
 
-// If thread stopping is enabled, executor threads should have been
-// stopped above when the executor was shut down but that depends on 
the
-// thread correctly handling the interrupt. Give all the executor
-// threads a few seconds shutdown and if they are still running
-// Give threads up to 2 seconds to shutdown
+// If thread stopping is enabled, threads should have been stopped 
above
+// when the executor was shut down or the thread was interrupted but
+// that depends on the thread correctly handling the interrupt. Check
+// each thread and if any are still running give all threads up to a
+// total of 2 seconds to shutdown.
 int count = 0;
-for (Thread t : executorThreadsToStop) {
+for (Thread t : threadsToStop) {
 while (t.isAlive() && count < 100) {
 try {
 Thread.sleep(20);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 94faf81..3688633 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -52,6 +52,13 @@
 AprLifecycleListener so that the only way to use the APR
 connectors is to set the full class name. (remm)
   
+  
+59203: Before calling Thread.stop() (if
+configured to do so) on a web application created thread that is not
+stopped by the web application when the web application is stopped, try
+interrupting the thread first. Based on a pull request by Govinda
+Sakhare. (markt)
+  
   
 62912: Don't mutate an application provided content header 
if
 it does not contain a charset. Also remove the outdated workaround for


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

Re: buildbot failure in on tomcat-9-trunk

[Rémy Maucherat]

On Thu, Apr 23, 2020 at 12:02 PM Mark Thomas  wrote:

> On 22/04/2020 22:53, build...@apache.org wrote:
> > 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/193
>
> This is bizarre.
>
> There are two failures but the really interesting one is this one:
>
>
> https://ci.apache.org/projects/tomcat/tomcat9/logs/193/TEST-org.apache.coyote.http2.TestAsyncTimeout.NIO.txt
>
> The unprintable characters in the output are all 0x00.
>
> The buffer is 8192 bytes in size.
>
> This write starts at position 8032 rather than 0.
>
> The stack trace indicates buffer overflow. But...
>
> Line 819 of OutputBuffer explicitly checks for the remaining space and
> so should avoid this issue.
>
> There is a single test in this class and Ant is configured to use a new
> JVM for evert test class so this is the first and only request to be
> processed by this JVM. Therefore:
> - a failure in clean-up after re-use cannot be the root cause as there
>   are no prior requests;
> - I don't see a code path where the position can be anything other than
>   zero when the writes start.
>
> If arrayOffset was not zero that might explain the behaviour but
> CharBuffer.allocate(size) is documented to return a CharBuffer with
> arrayOffset of zero.
>
> I'm running out of explanations that don't involve rare JVM bugs, faulty
> hardware, etc.
>
> Anyone got any ideas?
>

I think it's good to check failures (I do it often), but it's hard to come
up with something here. Usually problems don't occur in the Catalina
connector, which has been stable for a long while. Odd.
So the only possible explanation besides "rare JVM bugs, faulty hardware"
is a concurrent write, which is not protected against [that is normal,
since it usually won't work even if you take out IO corruption]. But I
don't really see a way to get into a concurrent write here.

Rémy


>
> Mark
>
> -
> 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 a change in pull request #273: Use enhanced for loops where possible

[GitBox]

markt-asf commented on a change in pull request #273:
URL: https://github.com/apache/tomcat/pull/273#discussion_r413715418



##
File path: java/jakarta/el/Util.java
##
@@ -380,11 +380,12 @@ static Method findMethod(Class clazz, Object base, 
String methodName,
 private static final String paramString(Class[] types) {
 if (types != null) {
 StringBuilder sb = new StringBuilder();
-for (int i = 0; i < types.length; i++) {
-if (types[i] == null) {
+for (Class type : types) {
+if (type == null) {
 sb.append("null, ");
-} else {
-sb.append(types[i].getName()).append(", ");
+}
+else {

Review comment:
   These formatting changes need to be removed from this PR. Tomcat coding 
convention is to use `} else {` on a single line.





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 success in on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 5a1b217d1294da58281214d2dac0cb253f554973
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] markt-asf commented on issue #280: Remove unnecessary boxing and unboxing

[GitBox]

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


   These are all deliberate to keep the IDE (Eclipse) clear of warnings. We 
could disable that warning but that then runs the risk of us missing one of the 
more subtle autoboxing/unboxing related bugs. Given that these conversions are 
going to happen anyway, I'd prefer for them to be explicit.



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: Fix back-port of bulk operation - addAll() - refactoring

[markt]

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

markt 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 5a1b217  Fix back-port of bulk operation - addAll() - refactoring
5a1b217 is described below

commit 5a1b217d1294da58281214d2dac0cb253f554973
Author: Mark Thomas 
AuthorDate: Thu Apr 23 11:27:10 2020 +0100

Fix back-port of bulk operation - addAll() - refactoring
---
 java/org/apache/catalina/core/ApplicationHttpRequest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java 
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 0d9ec1e..dcb4ff1 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -852,7 +852,7 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
 if (values1 == null) {
 // Skip - nothing to merge
 } else if (values1 instanceof String[]) {
-results.addAll(Arrays.asList(values1));
+results.addAll(Arrays.asList((String[]) values1));
 } else { // String
 results.add(values1.toString());
 }
@@ -860,7 +860,7 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
 if (values2 == null) {
 // Skip - nothing to merge
 } else if (values2 instanceof String[]) {
-results.addAll(Arrays.asList(values2));
+results.addAll(Arrays.asList((String[]) values2));
 } else { // String
 results.add(values2.toString());
 }


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

Re: buildbot failure in on tomcat-9-trunk

[Mark Thomas]

On 22/04/2020 22:53, build...@apache.org wrote:
> 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/193

This is bizarre.

There are two failures but the really interesting one is this one:

https://ci.apache.org/projects/tomcat/tomcat9/logs/193/TEST-org.apache.coyote.http2.TestAsyncTimeout.NIO.txt

The unprintable characters in the output are all 0x00.

The buffer is 8192 bytes in size.

This write starts at position 8032 rather than 0.

The stack trace indicates buffer overflow. But...

Line 819 of OutputBuffer explicitly checks for the remaining space and
so should avoid this issue.

There is a single test in this class and Ant is configured to use a new
JVM for evert test class so this is the first and only request to be
processed by this JVM. Therefore:
- a failure in clean-up after re-use cannot be the root cause as there
  are no prior requests;
- I don't see a code path where the position can be anything other than
  zero when the writes start.

If arrayOffset was not zero that might explain the behaviour but
CharBuffer.allocate(size) is documented to return a CharBuffer with
arrayOffset of zero.

I'm running out of explanations that don't involve rare JVM bugs, faulty
hardware, etc.

Anyone got any ideas?

Mark

-
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

[bugzilla]

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

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #9 from Remy Maucherat  ---
Please do not reopen this bug report and use the user list if you would like to
investigate further.

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

[bugzilla]

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

Pavana Sai Mahathi Vavilala  changed:

   What|Removed |Added

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

--- Comment #8 from Pavana Sai Mahathi Vavilala  
---
Thanks for re-testing the cluster setup.
As we are able to consistently reproduce the issue with 1-cpu configured nodes,
can you please confirm if you have tested with the same configuration?

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

Re: [tomcat] branch master updated: Improve the handling of requests that use an expectation.

[Rainer Jung]

Thanks for that.

Rainer

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

Re: Time for Tomcat Native 1.2.24?

[Michael Osipov]

Am 2020-04-22 um 12:34 schrieb Mark Thomas:

Hi all,

You have probably seen this:
OpenSSL - CVE-2020-1967
https://openssl.markmail.org/thread/nuamcatocap7rwrw

I have reviewed the Tomcat Native code and confirmed that we do not call
SSL_check_chain() at any point.

I also looked at the OpenSSL code as I was concerned that we might hit
the same problem via an internal code path. It appears I wasn't the only
one with that concern and the OpenSSL team confirmed that the issue only
occurs when calling SSL_check_chain():
https://openssl.markmail.org/thread/okfaim5oqhh2egj6

Therefore, it is not necessary to roll a new Tomcat Native release to
pick up an updated OpenSSL version for the Windows binaries.

That said, there are a few Tomcat Native fixes since 1.2.23 and it has
been 9 months since the last release. We should have enough time to get
a 1.2.24 release out if we want to.

Thoughts?


This sounds good to me. I'd like to add one more thing: remove dep on 
apr_thread_id in ssl_thread_id() because our impl is so elaborate that 
using APR here adds no benefit. With this change we can completely 
isolate the requirement of APR threading support to pre OpenSSL 1.1.0 
usage. But this will be for 1.2.25.


I will work on this little thing this week.

M

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