[GitHub] [tomcat] KangZhiDong opened a new pull request #194: fix typo

2019-08-22 Thread GitBox
KangZhiDong opened a new pull request #194: fix typo
URL: https://github.com/apache/tomcat/pull/194
 
 
   Fix typo , ["An MBean is a managed Java object, similar to a JavaBeans 
component, that follows the design patterns set forth in the JMX specification. 
An MBean can represent a device, an application, or any resource that needs to 
be managed. MBeans expose a management interface that consists of the 
following:"](https://docs.oracle.com/javase/tutorial/jmx/mbeans/index.html )


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] KangZhiDong closed pull request #194: fix typo

2019-08-22 Thread GitBox
KangZhiDong closed pull request #194: fix typo
URL: https://github.com/apache/tomcat/pull/194
 
 
   


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


With regards,
Apache Git Services

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



[Bug 62626] Tomcat 9.0.10 APR/Native crashes

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62626

Conrad T. Pino  changed:

   What|Removed |Added

 Status|NEEDINFO|NEW

--- Comment #30 from Conrad T. Pino  ---
(In reply to Christopher Schultz from comment #27)
> (In reply to Conrad T. Pino from comment #25)
> > Uploading gigabytes is pointless unless a purpose is served so I'll start by
> > asking if uploads are wanted.
> 
> Uploading the crash log is useful. Uploading the memory and/or code dumps is
> not really useful. Feel free to upload the crash logs.

ZIP file with 8 plain text log files attached. Thank you.

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



[Bug 62626] Tomcat 9.0.10 APR/Native crashes

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62626

--- Comment #29 from Conrad T. Pino  ---
Comment on attachment 36730
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36730
ZIP file - contents 8 plain text log files

Directory of hs_err_logs.zip

05/18/2018  15:2038,952 hs_err_pid1964.log
11/07/2018  19:0138,793 hs_err_pid2260.log
12/07/2018  18:2437,242 hs_err_pid2440.log
01/13/2019  19:1337,617 hs_err_pid3040.log
06/29/2018  08:3138,864 hs_err_pid3676.log
02/12/2019  22:5638,322 hs_err_pid4224.log
02/07/2019  11:1837,193 hs_err_pid4776.log
01/17/2019  20:3438,874 hs_err_pid6772.log
   8 File(s)305,857 bytes
   0 Dir(s)  34,551,578,624 bytes free

-- 
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 62626] Tomcat 9.0.10 APR/Native crashes

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62626

--- Comment #28 from Conrad T. Pino  ---
Created attachment 36730
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36730=edit
ZIP file - contents 8 plain text log files

Directory of hs_err_logs.zip

05/18/2018  15:2038,952 hs_err_pid1964.log
11/07/2018  19:0138,793 hs_err_pid2260.log
12/07/2018  18:2437,242 hs_err_pid2440.log
01/13/2019  19:1337,617 hs_err_pid3040.log
06/29/2018  08:3138,864 hs_err_pid3676.log
02/12/2019  22:5638,322 hs_err_pid4224.log
02/07/2019  11:1837,193 hs_err_pid4776.log
01/17/2019  20:3438,874 hs_err_pid6772.log
   8 File(s)305,857 bytes
   0 Dir(s)  34,551,578,624 bytes free

-- 
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 62626] Tomcat 9.0.10 APR/Native crashes

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62626

--- Comment #27 from Christopher Schultz  ---
(In reply to Conrad T. Pino from comment #25)
> Uploading gigabytes is pointless unless a purpose is served so I'll start by
> asking if uploads are wanted.

Uploading the crash log is useful. Uploading the memory and/or code dumps is
not really useful. Feel free to upload the crash logs.

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



[GitHub] [tomcat] michael-o opened a new pull request #195: BZ 63684: Wrapper never passed to RealmBase#hasRole() for given secur…

2019-08-22 Thread GitBox
michael-o opened a new pull request #195: BZ 63684: Wrapper never passed to 
RealmBase#hasRole() for given secur…
URL: https://github.com/apache/tomcat/pull/195
 
 
   …ity constraints
   
   It turned out that BZ 63636 was not complete. The realm needs the wrapper to 
do its magic.
   
   All tests for 8.5.x pass locally. As soon as this PR is approved, I will 
port to 9.0.x and 7.0.x


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


With regards,
Apache Git Services

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



[tomcat] 01/01: BZ 63684: Wrapper never passed to RealmBase#hasRole() for given security constraints

2019-08-22 Thread michaelo
This is an automated email from the ASF dual-hosted git repository.

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

commit 8a54c7f00de0caef5d0c18feaab3cd20e7a0826f
Author: Michael Osipov 
AuthorDate: Thu Aug 22 14:34:31 2019 +0200

BZ 63684: Wrapper never passed to RealmBase#hasRole() for given security 
constraints
---
 java/org/apache/catalina/realm/RealmBase.java  |  2 +-
 .../apache/catalina/realm/UserDatabaseRealm.java   |  2 ++
 .../apache/catalina/core/TestStandardWrapper.java  | 31 +-
 webapps/docs/changelog.xml |  9 +++
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index dd1761c..d321c56 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -858,7 +858,7 @@ public abstract class RealmBase extends LifecycleMBeanBase 
implements Realm {
 log.debug("  No user authenticated, cannot grant access");
 } else {
 for (int j = 0; j < roles.length; j++) {
-if (hasRole(null, principal, roles[j])) {
+if (hasRole(request.getWrapper(), principal, roles[j])) {
 status = true;
 if( log.isDebugEnabled() )
 log.debug( "Role found:  " + roles[j]);
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java 
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index 38f8822..bd2a7aa 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -117,6 +117,8 @@ public class UserDatabaseRealm extends RealmBase {
 }
 if (!(principal instanceof User)) {
 // Play nice with SSO and mixed Realms
+// No need to pass the wrapper here because role mapping has been
+// performed already a few lines above
 return super.hasRole(null, principal, role);
 }
 if ("*".equals(role)) {
diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java 
b/test/org/apache/catalina/core/TestStandardWrapper.java
index 9358345..a169b77 100644
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -259,14 +259,14 @@ public class TestStandardWrapper extends TomcatBaseTest {
 
 // No file system docBase required
 Context ctx = tomcat.addContext("", null);
-ctx.addRoleMapping("testRole2", "very-complex-role-name");
-/* We won't map "testRole3" to "another-very-complex-role-name" to make
- * it fail intentionally.
- */
+ctx.addRoleMapping("testRole", "very-complex-role-name");
 
-Wrapper wrapper = Tomcat.addServlet(ctx, "servlet", 
TestServlet.class.getName());
+Wrapper wrapper = Tomcat.addServlet(ctx, "servlet", 
RoleAllowServlet.class.getName());
 ctx.addServletMappingDecoded("/", "servlet");
 
+ctx.setLoginConfig(new LoginConfig("BASIC", null, null, null));
+ctx.getPipeline().addValve(new BasicAuthenticator());
+
 TesterMapRealm realm = new TesterMapRealm();
 MessageDigestCredentialHandler ch = new 
MessageDigestCredentialHandler();
 ch.setAlgorithm("SHA");
@@ -296,10 +296,27 @@ public class TestStandardWrapper extends TomcatBaseTest {
 
 Assert.assertNotNull(p);
 Assert.assertEquals("testUser", p.getName());
+// This one is mapped
+Assert.assertTrue(realm.hasRole(wrapper, p, "testRole"));
 Assert.assertTrue(realm.hasRole(wrapper, p, "testRole1"));
-Assert.assertTrue(realm.hasRole(wrapper, p, "testRole2"));
+Assert.assertFalse(realm.hasRole(wrapper, p, "testRole2"));
 Assert.assertTrue(realm.hasRole(wrapper, p, "very-complex-role-name"));
-Assert.assertFalse(realm.hasRole(wrapper, p, "testRole3"));
+Assert.assertTrue(realm.hasRole(wrapper, p, 
"another-very-complex-role-name"));
+
+// This now tests RealmBase#hasResourcePermission() because we need a 
wrapper
+// to be passed from an authenticator
+ByteChunk bc = new ByteChunk();
+Map> reqHeaders = new HashMap<>();
+List authHeaders = new ArrayList<>();
+// testUser, testPwd
+authHeaders.add("Basic dGVzdFVzZXI6dGVzdFB3ZA==");
+reqHeaders.put("Authorization", authHeaders);
+
+int rc = getUrl("http://localhost:; + getPort() + "/", bc, reqHeaders,
+null);
+
+Assert.assertEquals("OK", bc.toString());
+Assert.assertEquals(200, rc);
 }
 
 private void doTestSecurityAnnotationsAddServlet(boolean useCreateServlet)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6fed418..c1478e7 100644
--- 

[tomcat] branch BZ-63684/8.5.x created (now 8a54c7f)

2019-08-22 Thread michaelo
This is an automated email from the ASF dual-hosted git repository.

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


  at 8a54c7f  BZ 63684: Wrapper never passed to RealmBase#hasRole() for 
given security constraints

This branch includes the following new commits:

 new 8a54c7f  BZ 63684: Wrapper never passed to RealmBase#hasRole() for 
given security constraints

The 1 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.



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



[Bug 63685] WebappClassLoaderBase and StandardRoot reload classes from jar files on each call of getResource, getResourceAsStream and etc. that hit application startup performance

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63685

Alexandr  changed:

   What|Removed |Added

   Hardware|All |PC

-- 
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 63685] WebappClassLoaderBase and StandardRoot reload classes from jar files on each call of getResource, getResourceAsStream and etc. that hit application startup performance

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63685

Alexandr  changed:

   What|Removed |Added

   Severity|normal  |major

-- 
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 63685] New: WebappClassLoaderBase and StandardRoot reload classes from jar files on each call of getResource, getResourceAsStream and etc. that hit application startup performance

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63685

Bug ID: 63685
   Summary: WebappClassLoaderBase and StandardRoot reload classes
from jar files on each call of getResource,
getResourceAsStream and etc. that hit application
startup performance
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: cheglov.alexa...@gmail.com
  Target Milestone: 

During profiling of the application I found interesting behavior related to
class loading and caching in org.apache.catalina.loader.WebappClassLoaderBase
and org.apache.catalina.webresources.StandardRoot.

Situation.
I have very big Spring application which consists of a bit more than 1500 jar
files.
Startup of this application takes quite a lot of time. After investigation with
logs analysis, profiling and debugging including Tomcat source code it was
found out that one of the reasons is laid in Tomcat classloading behavior.
A lot of methods of Tomcat's org.apache.catalina.loader.WebappClassLoaderBase
calls for org.apache.catalina.WebResourceRoot#getClassLoaderResource(String
path), for example:
- public URL getResource(String name);
- public URL findResource(final String name);
- public InputStream getResourceAsStream(String name).

Every time as one of these methods is invoked for .class files it leads to
invocation of
org.apache.catalina.webresources.StandardRoot#getResourceInternal(String path,
boolean useClassLoaderResources) method, which searches for the class file
across all the jars in application WEB-INF\lib directory. And in my case it's
about 1500 jar files.


In org.apache.catalina.webresources.StandardRoot already there is cache for
WebResources. But currently it's used for static content only.
There is special check with comment in
org.apache.catalina.webresources.Cache.class:

private boolean noCache(String path) {
// Don't cache classes. The class loader handles this.
// Don't cache JARs. The ResourceSet handles this.
if ((path.endsWith(".class") &&
(path.startsWith("/WEB-INF/classes/") ||
path.startsWith("/WEB-INF/lib/")))
||
(path.startsWith("/WEB-INF/lib/") && path.endsWith(".jar"))) {
return true;
}
return false;
}
Comment tells that classes cache is handled by class loader, but in fact
classloader caches only instances of the created classes, but not the content
of the .class files or their URLs.


After modification of the noCache method as below:
private boolean noCache(String path) {
// Don't cache JARs. The ResourceSet handles this.
return (path.startsWith("/WEB-INF/lib/") && path.endsWith(".jar"));
}
and setting cacheMaxSize and cacheTtl parameters, time of application startup
was reduced in average about 5 minutes.
I understand that it's not an issue for a small application, but as we see from
the result in case of a huge application it can give noticeable speedup of
application launch.


In my case I faced with performance problem mainly in case of application
startup but theoretically this behavior can bring negative impact on work of
application in runtime as well. 

Would you be so kind to let me know why classes cache was intentionally skipped
in org.apache.catalina.webresources.Cache.class and if it's possible to enable
it and promote such fix?
Or if it's a bad idea what are the potential drawbacks I can face if I decide
to enable cache of classes in Tomcat for my application?

Thank you!

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



[Bug 63684] Wrapper never passed to RealmBase#hasRole() for given security constraints

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63684

Michael Osipov  changed:

   What|Removed |Added

 CC||micha...@apache.org

-- 
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 63684] New: Wrapper never passed to RealmBase#hasRole() for given security constraints

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63684

Bug ID: 63684
   Summary: Wrapper never passed to RealmBase#hasRole() for given
security constraints
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: All
OS: All
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: micha...@apache.org
  Target Milestone: 

In the advent of BZ 63636 it turned out that role mappings aren't accessible to
a realm via a wrapper because they are never passed in
RealmBase#hasResourcePermission(). Moreover, security references aren't
available either.

A PR is in preparation.

-- 
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 56021] SSL connector using windows-my keystore

2019-08-22 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=56021

--- Comment #4 from Martin Stenderup  ---
(In reply to joakim_ganse from comment #2)

Try by setting keystorePassword="" in your connector configuration (it defaults
to "changeit" if not set).
This worked for me.

I had to step-debug through Tomcats code to figure it out.

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



buildbot failure in on tomcat-7-trunk

2019-08-22 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1431

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] 29fd3a45b909ba2a10792f9641b50ac81c285762
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



svn commit: r35340 - /release/tomcat/tomcat-8/v8.5.43/

2019-08-22 Thread markt
Author: markt
Date: Thu Aug 22 07:33:08 2019
New Revision: 35340

Log:
Drop 8.5.43 from mirrors

Removed:
release/tomcat/tomcat-8/v8.5.43/


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



[ANN] Apache Tomcat 8.5.45 available

2019-08-22 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.5.45.

Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and Java Authentication Service Provider Interface for
Containers technologies.

Apache Tomcat 8.5.x replaces 8.0.x and includes new features pulled
forward from the 9.0.x branch. The notable changes since 8.5.43 include:

- Expand the HTTP/2 excessive overhead protection to cover various forms
  of abusive client behaviour and close the connection if any such
  behaviour is detected.

- Security improvements to the Windows installer including a change in
  the default user from Local System to Local Service.


- Improve handling of invalid requests so that 400 responses are
  returned to the client rather than 500 responses.


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-8.5-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-80.cgi

Migration guides from Apache Tomcat 7.x and 8.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team


-
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: Add 8.5.45 release date

2019-08-22 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 03f8774  Add 8.5.45 release date
03f8774 is described below

commit 03f87745c31ba3d122f7ecd58cd96aa7578971ff
Author: Mark Thomas 
AuthorDate: Thu Aug 22 10:29:53 2019 +0300

Add 8.5.45 release date
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4192ee0..6fed418 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -94,7 +94,7 @@
 
   
 
-
+
   
 
   


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



svn commit: r1865678 - in /tomcat/site/trunk: ./ docs/ xdocs/

2019-08-22 Thread markt
Author: markt
Date: Thu Aug 22 07:28:58 2019
New Revision: 1865678

URL: http://svn.apache.org/viewvc?rev=1865678=rev
Log:
Update site for 8.5.45 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1865678=1865677=1865678=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Thu Aug 22 07:28:58 2019
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # - Tomcat versions -
 tomcat70=7.0.96
-tomcat85=8.5.43
+tomcat85=8.5.45
 tomcat90=9.0.24
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1865678=1865677=1865678=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Aug 22 07:28:58 2019
@@ -67,8 +67,8 @@
 
   
 Latest Stable 8.5.x Release
-2019-07-09
-8.5.43
+2019-08-21
+8.5.45
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1865678=1865677=1865678=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Thu Aug 22 07:28:58 2019
@@ -226,7 +226,7 @@
 Quick Navigation
 
 
-[define v]8.5.43[end]
+[define v]8.5.45[end]
 https://www.apache.org/dist/tomcat/tomcat-8/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1865678=1865677=1865678=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Aug 22 07:28:58 2019
@@ -243,18 +243,19 @@ project logo are trademarks of the Apach
 
 
 
-
-2019-08-17 Tomcat 9.0.24 Released
+
+2019-08-21 Tomcat 8.5.45 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 9.0.24
-of Apache Tomcat. The notable changes compared to 9.0.22 include:
+The Apache Tomcat Project is proud to announce the release of version 8.5.45
+of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features
+pulled forward from Tomcat 9.0.x. The minimum Java version and implemented
+specification versions remain unchanged. The notable changes compared
+to 8.5.43 include:
 
 
 
-Expand Graal native image support to include JNDI, JSPs and JULI
-
 Expand the HTTP/2 excessive overhead protection to cover various forms
 of abusive client behaviour and close the connection if any such
 behaviour is detected.
@@ -262,81 +263,81 @@ of Apache Tomcat. The notable changes co
 Security improvements to the Windows installer including a change in
 the default user from Local System to Local Service.
 
+Improve handling of invalid requests so that 400 responses are
+returned to the client rather than 500 responses.
+
 
 
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 9
+Tomcat 8.5
 changelog.
 
 
 
 
 
-https://tomcat.apache.org/download-90.cgi;>Download
+https://tomcat.apache.org/download-80.cgi;>Download
 
 
 
 
-
-2019-07-29 Tomcat 7.0.96 Released
+
+2019-08-17 Tomcat 9.0.24 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 7.0.96 of
-Apache Tomcat. This release contains a number of bug fixes and improvements
-compared to version 7.0.94.
+The Apache Tomcat Project is proud to announce the release of version 9.0.24
+of Apache Tomcat. The notable changes compared to 9.0.22 include:
+
+
+
+Expand Graal native image support to include JNDI, JSPs and JULI
+
+Expand the HTTP/2 excessive overhead protection to cover various forms
+of abusive client behaviour and close the connection if any such
+behaviour is detected.
+
+Security improvements to the Windows installer including a change in
+the default user from Local System to Local Service.
+
+
 
 
 
 Full details of these changes, and all the other changes, are available in 

svn commit: r1865677 - in /tomcat/site/trunk/docs/tomcat-8.5-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2019-08-22 Thread markt
Author: markt
Date: Thu Aug 22 07:08:33 2019
New Revision: 1865677

URL: http://svn.apache.org/viewvc?rev=1865677=rev
Log:
Update site with 8.5.45 docs


[This commit notification would consist of 69 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



[tomcat] 01/02: Simplify service usage note by substituting in current major version

2019-08-22 Thread 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 0640e5a85be967b6f615a1fbec5fbe75c44cf769
Author: Mark Thomas 
AuthorDate: Sun Aug 18 20:20:50 2019 +0300

Simplify service usage note by substituting in current major version
---
 bin/catalina.bat | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index f92e296..9ba9821 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -28,9 +28,8 @@ rem   script will have no effect at all on Windows Services. 
As such, any
 rem   local customizations made in a CATALINA_BASE/bin/setenv.bat script
 rem   will also have no effect on Tomcat when launched as a Windows Service.
 rem   The configuration that controls Windows Services is stored in the Windows
-rem   Registry, and is most conveniently maintained using the "tomcatXw.exe"
-rem   maintenance utility, where "X" is the major version of Tomcat you are
-rem   running.
+rem   Registry, and is most conveniently maintained using the 
"tomcat@version_ma...@w.exe"
+rem   maintenance utility.
 rem
 rem   CATALINA_HOME   May point at your Catalina "build" directory.
 rem


-
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 (d13c735 -> 29fd3a4)

2019-08-22 Thread 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 d13c735  Use [...] to delimited values inserted into messages
 new 0640e5a  Simplify service usage note by substituting in current major 
version
 new 29fd3a4  Fix BZ 62140 Document catalina.[sh|bat] commands

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


Summary of changes:
 bin/catalina.bat   | 8 +---
 bin/catalina.sh| 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 12 insertions(+), 3 deletions(-)


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



[tomcat] 02/02: Fix BZ 62140 Document catalina.[sh|bat] commands

2019-08-22 Thread 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 29fd3a45b909ba2a10792f9641b50ac81c285762
Author: Mark Thomas 
AuthorDate: Sun Aug 18 20:29:27 2019 +0300

Fix BZ 62140 Document catalina.[sh|bat] commands
---
 bin/catalina.bat   | 3 +++
 bin/catalina.sh| 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 10 insertions(+)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 9ba9821..cd08425 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -17,6 +17,9 @@ rem limitations under the License.
 rem ---
 rem Start/Stop Script for the CATALINA Server
 rem
+rem For supported commands call "catalina.bat help" or see the usage section
+rem towards the end of this file.
+rem
 rem Environment Variable Prerequisites
 rem
 rem   Do not set the variables in this script. Instead put them into a script
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 0d94976..f873a8f 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -18,6 +18,9 @@
 # -
 # Control Script for the CATALINA Server
 #
+# For supported commands call "catalina.sh help" or see the usage section at
+# the end of this file.
+#
 # Environment Variable Prerequisites
 #
 #   Do not set the variables in this script. Instead put them into a script
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 56895d5..b698428 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,10 @@
   
   
 
+  
+62140: Additional usage documentation in comments for
+catalina.[bat|sh]. (markt)
+  
   
 63285: Add an option to service.bat so that 
when
 installing a Windows service, the name of the executables used by the


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



[tomcat] 01/02: Simplify service usage note by substituting in current major version

2019-08-22 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit e8121dc307df1f2e701ae8629d8306722b5f31eb
Author: Mark Thomas 
AuthorDate: Sun Aug 18 20:20:50 2019 +0300

Simplify service usage note by substituting in current major version
---
 bin/catalina.bat | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index b244418..72e16b6 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -28,9 +28,8 @@ rem   script will have no effect at all on Windows Services. 
As such, any
 rem   local customizations made in a CATALINA_BASE/bin/setenv.bat script
 rem   will also have no effect on Tomcat when launched as a Windows Service.
 rem   The configuration that controls Windows Services is stored in the Windows
-rem   Registry, and is most conveniently maintained using the "tomcatXw.exe"
-rem   maintenance utility, where "X" is the major version of Tomcat you are
-rem   running.
+rem   Registry, and is most conveniently maintained using the 
"tomcat@version_ma...@w.exe"
+rem   maintenance utility.
 rem
 rem   CATALINA_HOME   May point at your Catalina "build" directory.
 rem


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



[tomcat] 02/02: Fix BZ 62140 Document catalina.[sh|bat] commands

2019-08-22 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit d8c235477807433b6b39a3e6322a91ede7fd96a3
Author: Mark Thomas 
AuthorDate: Sun Aug 18 20:29:27 2019 +0300

Fix BZ 62140 Document catalina.[sh|bat] commands
---
 bin/catalina.bat   | 3 +++
 bin/catalina.sh| 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 10 insertions(+)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 72e16b6..982b23f 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -17,6 +17,9 @@ rem limitations under the License.
 rem ---
 rem Start/Stop Script for the CATALINA Server
 rem
+rem For supported commands call "catalina.bat help" or see the usage section
+rem towards the end of this file.
+rem
 rem Environment Variable Prerequisites
 rem
 rem   Do not set the variables in this script. Instead put them into a script
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 23bb3b3..5fbdb72 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -18,6 +18,9 @@
 # -
 # Control Script for the CATALINA Server
 #
+# For supported commands call "catalina.sh help" or see the usage section at
+# the end of this file.
+#
 # Environment Variable Prerequisites
 #
 #   Do not set the variables in this script. Instead put them into a script
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 290374d..4192ee0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -87,6 +87,10 @@
 Add Simplifed Chinese translations to the standard Tomcat distribution.
 (markt)
   
+  
+62140: Additional usage documentation in comments for
+catalina.[bat|sh]. (markt)
+  
 
   
 


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



[tomcat] branch 8.5.x updated (7684cc8 -> d8c2354)

2019-08-22 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from 7684cc8  Fix typo
 new e8121dc  Simplify service usage note by substituting in current major 
version
 new d8c2354  Fix BZ 62140 Document catalina.[sh|bat] commands

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


Summary of changes:
 bin/catalina.bat   | 8 +---
 bin/catalina.sh| 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 12 insertions(+), 3 deletions(-)


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



[tomcat] 03/03: Add release date for 9.0.24

2019-08-22 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 4329d123ea635dc9edf22c8a1ce5b8e6e526f6e6
Author: Mark Thomas 
AuthorDate: Thu Aug 22 09:53:17 2019 +0300

Add release date for 9.0.24
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bed01e4..bd0919c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -79,7 +79,7 @@
 
   
 
-
+
   
 
   


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



[tomcat] 02/03: Fix BZ 62140 Document catalina.[sh|bat] commands

2019-08-22 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 328264a92cdec4302dbc68ef7377eebc3ecf0c4e
Author: Mark Thomas 
AuthorDate: Sun Aug 18 20:29:27 2019 +0300

Fix BZ 62140 Document catalina.[sh|bat] commands
---
 bin/catalina.bat   | 3 +++
 bin/catalina.sh| 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 10 insertions(+)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 72e16b6..982b23f 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -17,6 +17,9 @@ rem limitations under the License.
 rem ---
 rem Start/Stop Script for the CATALINA Server
 rem
+rem For supported commands call "catalina.bat help" or see the usage section
+rem towards the end of this file.
+rem
 rem Environment Variable Prerequisites
 rem
 rem   Do not set the variables in this script. Instead put them into a script
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 23bb3b3..5fbdb72 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -18,6 +18,9 @@
 # -
 # Control Script for the CATALINA Server
 #
+# For supported commands call "catalina.sh help" or see the usage section at
+# the end of this file.
+#
 # Environment Variable Prerequisites
 #
 #   Do not set the variables in this script. Instead put them into a script
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 83d093d..bed01e4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,6 +72,10 @@
 provided with Apache Tomcat. Includes contributions by leeyazhou.
 (markt)
   
+  
+62140: Additional usage documentation in comments for
+catalina.[bat|sh]. (markt)
+  
 
   
 


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



[tomcat] branch master updated (af4c20c -> 4329d12)

2019-08-22 Thread 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 af4c20c  Merge pull request #193 from maxime-beck/master
 new 890ca42  Simplify service usage note by substituting in current major 
version
 new 328264a  Fix BZ 62140 Document catalina.[sh|bat] commands
 new 4329d12  Add release date for 9.0.24

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:
 bin/catalina.bat   | 8 +---
 bin/catalina.sh| 3 +++
 webapps/docs/changelog.xml | 6 +-
 3 files changed, 13 insertions(+), 4 deletions(-)


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



[tomcat] 01/03: Simplify service usage note by substituting in current major version

2019-08-22 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 890ca423ef700515a3a64c3b840da9a1c4ffdea0
Author: Mark Thomas 
AuthorDate: Sun Aug 18 20:20:50 2019 +0300

Simplify service usage note by substituting in current major version
---
 bin/catalina.bat | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index b244418..72e16b6 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -28,9 +28,8 @@ rem   script will have no effect at all on Windows Services. 
As such, any
 rem   local customizations made in a CATALINA_BASE/bin/setenv.bat script
 rem   will also have no effect on Tomcat when launched as a Windows Service.
 rem   The configuration that controls Windows Services is stored in the Windows
-rem   Registry, and is most conveniently maintained using the "tomcatXw.exe"
-rem   maintenance utility, where "X" is the major version of Tomcat you are
-rem   running.
+rem   Registry, and is most conveniently maintained using the 
"tomcat@version_ma...@w.exe"
+rem   maintenance utility.
 rem
 rem   CATALINA_HOME   May point at your Catalina "build" directory.
 rem


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