Re: [VOTE] Release Apache Tomcat Native 1.2.17

2018-06-08 Thread Rainer Jung

Some early observations, at least the broken signature needs fixing:

- previously sources where in a download folder named "source", now they 
are in "sources" (plural form).


- sha1 and sha512 checksums not there, only md5. 1.2.16 had all three

- file sources/tomcat-native-1.2.17-win32-src.zip.asc has a bad pgp 
signature:


gpg: assuming signed data in `tomcat-native-1.2.17-win32-src.zip'
gpg: Signature made June  7, 2018  1:36:05 PM CEST
gpg:using RSA key ED3873F5D3262722
gpg: BAD signature from "Jean-Frederic Clere (Apache signing key) 
"


Other signatures are OK, so please check integrity of the file 
tomcat-native-1.2.17-win32-src.zip and fix either this file or the asc file.


- when I extract the zip sources on Unix, I get all dirs and files with 
group write permission. That sounds unsafe. It wasn't like that for 1.2.16.


- OpenSSL used according to VERSIONS file is 1.0.2m, shouldn't it be 1.0.2o?

Regards,

Rainer

Am 07.06.2018 um 17:50 schrieb jean-frederic clere:

Version 1.2.17 includes the following changes compared to 1.2.16:

- Windows binaries built with OpenSSL 1.0.2o and APR 1.6.3

Various other fixes and improvements. See the changelog for details.

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.17 is
  [ ] Stable, go ahead and release
  [ ] Broken because of ...

Thanks,

Jean-Frederic


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.17/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_17


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



svn commit: r1833161 - /tomcat/trunk/build.xml

2018-06-08 Thread markt
Author: markt
Date: Fri Jun  8 10:41:00 2018
New Revision: 1833161

URL: http://svn.apache.org/viewvc?rev=1833161&view=rev
Log:
Fix bnd failures on Windows

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1833161&r1=1833160&r2=1833161&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun  8 10:41:00 2018
@@ -3034,10 +3034,11 @@ Read the Building page on the Apache Tom
 
   
 
-
+
   
 
-
+
+
   
 
   



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



[Bug 52489] Enhancement request for code signing of war files

2018-06-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=52489

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
After some further testing, I can confirm that this is already implemented in
8.0.x onwards. I am therefore resolving this as fixed.

Note that it will only work if the web application is run from an unpacked WAR.

Signing a WAR file raises all sorts of questions I haven't been able to find
answers to. This might be something to raise with the Servlet EG if someone
wishes to do so. Those questions include:
- How to handle a class, packages in an unsigned JAR, packaged in a signed WAR?
- Under what circumstances, if any, should resources outside of WEB-INF/classes
be validated and what validation should occur?

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



svn commit: r27326 - /dev/tomcat/tomcat-connectors/native/1.2.17/sources/tomcat-native-1.2.17-win32-src.zip.asc

2018-06-08 Thread jfclere
Author: jfclere
Date: Fri Jun  8 14:07:13 2018
New Revision: 27326

Log:
fix the signature file.

Modified:

dev/tomcat/tomcat-connectors/native/1.2.17/sources/tomcat-native-1.2.17-win32-src.zip.asc

Modified: 
dev/tomcat/tomcat-connectors/native/1.2.17/sources/tomcat-native-1.2.17-win32-src.zip.asc
==
Binary files - no diff available.



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



[Bug 52952] Improve ExtensionValidator handling for embedded scenarios

2018-06-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=52952

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|NEW |RESOLVED

--- Comment #8 from Mark Thomas  ---
The proposed patch looks to be heading along the right lines.

However, there hasn't been much interest in this enhancement either from users
requiring or committers to perform a more detailed review and commit it.

In the meantime, Java has moved on. The extension mechanism has been removed
from Java 9 onwards. It is very likely that the next Tomcat release will
require at least Java 9 (more likely Java 11) and the ExtensionValidator code
will be removed.

Given all of the above, I am resolving this as WONTFIX.

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



svn commit: r1833172 - /tomcat/trunk/TOMCAT-NEXT.txt

2018-06-08 Thread markt
Author: markt
Date: Fri Jun  8 14:10:40 2018
New Revision: 1833172

URL: http://svn.apache.org/viewvc?rev=1833172&view=rev
Log:
Remove the entries that were implemented for 9.0.x and add a few of the ideas 
that have been discussed for 10.0.x.

Modified:
tomcat/trunk/TOMCAT-NEXT.txt

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1833172&r1=1833171&r2=1833172&view=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Fri Jun  8 14:10:40 2018
@@ -15,45 +15,26 @@
   limitations under the License.
 

 
-Notes of things to consider for the next major Tomcat release (9.0.x)
+Notes of things to consider for the next major Tomcat release (10.0.x)
 
- 1. DONE.
-Fix Java 8 Javadoc warnings.
+Items carried over from the 9.0.x list:
 
- 2. DONE.
-Remove BIO AJP and HTTP connector.
-
- 3. DONE.
-Remove Comet support.
-
- 4. DONE.
-Refactor the connectors to minimise code duplication.
-- All implementation specific per connector code -> Endpoint
-- All implementation specific per connection code -> SocketWrapper
-
- 5. DONE
-SNI support for JSSE.
-
- 6. See what Java 8 language features we want to use.
+1.  Remove the use of system properties to control configuration wherever
+possible.
 
- 7. Connector refactoring required for HTTP/2 APIs that might be exposed in
-the Servlet API.
+2.  Reduce instances of setters and getters for the same property existing on 
an
+object and its parent. This may require new objects to be exposed via JMX.
 
- 8. Keep an eye on the other Java EE 8 EGs (no sign of any movement apart
-from the Servlet EG so far).
+3.  Consider wrapping the SocketWrapper with a facade to detect / prevent
+components retaining references longer than they should.
 
- 9. DONE
-Refactor WebSocket I/O to go directly to Tomcat's internals rather than via
-the Servlet API.
 
-10. Remove the use of system properties to control configuration wherever
-possible.
+New items for 10.0.x onwards:
 
-11. Reduce instances of setters and getters for the same property existing on 
an
-object and its parent. This may require new objects to be exposed via JMX.
+1.  Remove APR connector.
 
-12. Consider wrapping the SocketWrapper with a facade to detect / prevent
-components retaining references longer than they should.
+2.  Remove org.apache.tomcat.jni and replace with the minimum necessary to
+interface with OpenSSL and clones.
 
-13. Asynchronous NIO2 styled alternate HTTP/2 implementation. Frame parsing 
logic
-would be in completion handlers.
+3.  Remove the ExtensionValidator and associated classes (assuming that the
+minimum Java version is Java 9 or later).



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



svn commit: r27327 - in /dev/tomcat/tomcat-connectors/native/1.2.17: source/ sources/

2018-06-08 Thread jfclere
Author: jfclere
Date: Fri Jun  8 14:12:16 2018
New Revision: 27327

Log:
move sources to source.

Added:
dev/tomcat/tomcat-connectors/native/1.2.17/source/
  - copied from r27326, dev/tomcat/tomcat-connectors/native/1.2.17/sources/
Removed:
dev/tomcat/tomcat-connectors/native/1.2.17/sources/


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



svn commit: r27328 - in /dev/tomcat/tomcat-connectors/native/1.2.17: binaries/ source/

2018-06-08 Thread jfclere
Author: jfclere
Date: Fri Jun  8 14:30:29 2018
New Revision: 27328

Log:
Add sha1 and sha512

Added:

dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-ocsp-win32-bin.zip.sha1

dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-ocsp-win32-bin.zip.sha512

dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-win32-bin.zip.sha1

dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-win32-bin.zip.sha512

dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz.sha1

dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz.sha512

dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-win32-src.zip.sha1

dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-win32-src.zip.sha512

Added: 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-ocsp-win32-bin.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-ocsp-win32-bin.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-ocsp-win32-bin.zip.sha1
 Fri Jun  8 14:30:29 2018
@@ -0,0 +1 @@
+3c7cfeef8ddc4adf7ba6e9ebbfbb2112f6f8ec2f 
*tomcat-native-1.2.17-ocsp-win32-bin.zip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-ocsp-win32-bin.zip.sha512
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-ocsp-win32-bin.zip.sha512
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-ocsp-win32-bin.zip.sha512
 Fri Jun  8 14:30:29 2018
@@ -0,0 +1 @@
+550398aadb50eb5a400f0cf9bbf667da0f54b45862940f292ccff637ad869e3feb3715c5c6b69e275d8ad9150b2db3ba81d67c9e6fa833ee402cc32f580d69a2
 *tomcat-native-1.2.17-ocsp-win32-bin.zip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-win32-bin.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-win32-bin.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-win32-bin.zip.sha1
 Fri Jun  8 14:30:29 2018
@@ -0,0 +1 @@
+f4eae5242c8b7c1b0571ef697158e5fff2ea31e8 *tomcat-native-1.2.17-win32-bin.zip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-win32-bin.zip.sha512
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-win32-bin.zip.sha512
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.17/binaries/tomcat-native-1.2.17-win32-bin.zip.sha512
 Fri Jun  8 14:30:29 2018
@@ -0,0 +1 @@
+2955209b39707949b080f13c09edcad08a13faf5545f7890e2ac493ccbc66d09e152a39b4fa6ac40fe3de6b209b305608db3db8dcf24dda94567b417f55a5f49
 *tomcat-native-1.2.17-win32-bin.zip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz.sha1
 Fri Jun  8 14:30:29 2018
@@ -0,0 +1 @@
+d6b6c513982adcf91da8fbc2a87338eb5140f884 *tomcat-native-1.2.17-src.tar.gz

Added: 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz.sha512
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz.sha512
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz.sha512
 Fri Jun  8 14:30:29 2018
@@ -0,0 +1 @@
+8fa946855fd14525ec0abe7b09975bbd34d6127352e90730a8afb77e16cd91715417e812a40017fee65939a9ce95faf39a9193222f441cda0ad2eb7f690e77b9
 *tomcat-native-1.2.17-src.tar.gz

Added: 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-win32-src.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-win32-src.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-win32-src.zip.sha1
 Fri Jun  8 14:30:29 2018
@@ -0,0 +1 @@
+cd3b5e5f16946dbbf3a3ddd8595e12a94a72a42d *tomcat-native-1.2.17-win32-src.zip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-win32-src.zip.sha512
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-win32-src.zip.sha512
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/

Re: svn commit: r1833172 - /tomcat/trunk/TOMCAT-NEXT.txt

2018-06-08 Thread Rémy Maucherat
On Fri, Jun 8, 2018 at 4:10 PM  wrote:

> +1.  Remove the use of system properties to control configuration wherever
> +possible.
>

Ok. My bad, I'm a recovering addict ... ;)


>
> +2.  Reduce instances of setters and getters for the same property
> existing on an
> +object and its parent. This may require new objects to be exposed via
> JMX.
>

Ok. I'm not sure where though, just like that.

>
> +3.  Consider wrapping the SocketWrapper with a facade to detect / prevent
> +components retaining references longer than they should.
>

On the plus side, the components are privileged, so if something goes wrong
it's the component's fault and not a security issue. It depends on how much
use this gets ultimately. I suppose quite a bit moving forward, so there
should be an option there. It's obviously going to be cheap too.


>
> +New items for 10.0.x onwards:
>
> +1.  Remove APR connector.
>
> +2.  Remove org.apache.tomcat.jni and replace with the minimum necessary to
> +interface with OpenSSL and clones.
>

Yes, but I still have no answer for the assertion that APR is still the
fastest connector. So this performance drop has to be accepted. On the plus
side, I would say APR users are not a majority, so this could go well.
Functionally, APR is now more a problem than a solution in Tomcat
("sendfile" done differently works well now).

Ideas:
- Someone mentioned a new compiler API could be used in Jasper
- An embedded 2 API ?
- Whatever from the early work of the EE EG (reactive shiny thingies ?)

Rémy


Re: [VOTE] Release Apache Tomcat Native 1.2.17

2018-06-08 Thread jean-frederic clere
On 08/06/18 10:45, Rainer Jung wrote:
> Some early observations, at least the broken signature needs fixing:
> 
> - previously sources where in a download folder named "source", now they
> are in "sources" (plural form).

fixed.

> 
> - sha1 and sha512 checksums not there, only md5. 1.2.16 had all three

fixed.

> 
> - file sources/tomcat-native-1.2.17-win32-src.zip.asc has a bad pgp
> signature:
> 
> gpg: assuming signed data in `tomcat-native-1.2.17-win32-src.zip'
> gpg: Signature made June  7, 2018  1:36:05 PM CEST
> gpg:    using RSA key ED3873F5D3262722
> gpg: BAD signature from "Jean-Frederic Clere (Apache signing key)
> "
> 
> Other signatures are OK, so please check integrity of the file
> tomcat-native-1.2.17-win32-src.zip and fix either this file or the asc
> file.

Fixed:
+++
[jfclere@dhcp-144-173 1.2.17]$ gpg --verify
source/tomcat-native-1.2.17-win32-src.zip.asc
gpg: assuming signed data in `source/tomcat-native-1.2.17-win32-src.zip'
gpg: Signature made Fri 08 Jun 2018 16:03:14 CEST using RSA key ID D3262722
gpg: Good signature from "Jean-Frederic Clere (Apache signing key)
"
+++

> 
> - when I extract the zip sources on Unix, I get all dirs and files with
> group write permission. That sounds unsafe. It wasn't like that for 1.2.16.

umask 0022 hm no idea why the umask on my fedora27, minor, correct?

> 
> - OpenSSL used according to VERSIONS file is 1.0.2m, shouldn't it be
> 1.0.2o?

I wasn't sure to update it, does that block your vote?
https://www.openssl.org/news/vulnerabilities.html

Cheers

Jean-Frederic

> 
> Regards,
> 
> Rainer
> 
> Am 07.06.2018 um 17:50 schrieb jean-frederic clere:
>> Version 1.2.17 includes the following changes compared to 1.2.16:
>>
>> - Windows binaries built with OpenSSL 1.0.2o and APR 1.6.3
>>
>> Various other fixes and improvements. See the changelog for details.
>>
>> The proposed release artefacts can be found at [1],
>> and the build was done using tag [2].
>>
>> The Apache Tomcat Native 1.2.17 is
>>   [ ] Stable, go ahead and release
>>   [ ] Broken because of ...
>>
>> Thanks,
>>
>> Jean-Frederic
>>
>>
>> [1]
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.17/
>>
>> [2]
>> https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_17
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 


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



Re: svn commit: r1833172 - /tomcat/trunk/TOMCAT-NEXT.txt

2018-06-08 Thread Mark Thomas
On 08/06/18 15:40, Rémy Maucherat wrote:
> On Fri, Jun 8, 2018 at 4:10 PM  wrote:
> 
>> +1.  Remove the use of system properties to control configuration wherever
>> +possible.
>>
> 
> Ok. My bad, I'm a recovering addict ... ;)

Grin.

>> +2.  Reduce instances of setters and getters for the same property
>> existing on an
>> +object and its parent. This may require new objects to be exposed via
>> JMX.
>>
> 
> Ok. I'm not sure where though, just like that.

I think a lot of this will go away when the deprecated Connector code is
removed. Beyond that there are bits an pieces of duplication. I think of
this entry more as something to look at if there is some spare time at a
point where we can still change the API.

>> +3.  Consider wrapping the SocketWrapper with a facade to detect / prevent
>> +components retaining references longer than they should.
> 
> On the plus side, the components are privileged, so if something goes wrong
> it's the component's fault and not a security issue. It depends on how much
> use this gets ultimately. I suppose quite a bit moving forward, so there
> should be an option there. It's obviously going to be cheap too.

Agreed. This is more of a protect the apps from themselves feature.

>> +New items for 10.0.x onwards:
>>
>> +1.  Remove APR connector.
>>
>> +2.  Remove org.apache.tomcat.jni and replace with the minimum necessary to
>> +interface with OpenSSL and clones.
>>
> 
> Yes, but I still have no answer for the assertion that APR is still the
> fastest connector. So this performance drop has to be accepted. On the plus
> side, I would say APR users are not a majority, so this could go well.
> Functionally, APR is now more a problem than a solution in Tomcat
> ("sendfile" done differently works well now).

I thought the most recent round of testing showed that the difference
was marginal for "NIO HTTP" vs "APR HTTP" and "NIO+OpenSSL" vs "NIO APR
HTTPS".

If that isn't the case then there is much less of a case for removing APR.

> Ideas:
> - Someone mentioned a new compiler API could be used in Jasper
> - An embedded 2 API ?
> - Whatever from the early work of the EE EG (reactive shiny thingies ?)

All sound good.

Mark

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



svn commit: r1833194 - in /tomcat/trunk/java/org/apache/catalina/core: ApplicationFilterConfig.java AsyncContextImpl.java

2018-06-08 Thread markt
Author: markt
Date: Fri Jun  8 16:05:35 2018
New Revision: 1833194

URL: http://svn.apache.org/viewvc?rev=1833194&view=rev
Log:
Reviewing BZ 53085
Remove unnecessary code now Context.getInstanceManager() has been added.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1833194&r1=1833193&r2=1833194&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Fri 
Jun  8 16:05:35 2018
@@ -22,7 +22,6 @@ import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -38,7 +37,6 @@ import org.apache.catalina.Globals;
 import org.apache.catalina.security.SecurityUtil;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.log.SystemLogHandler;
@@ -104,7 +102,7 @@ public final class ApplicationFilterConf
 getFilter();
 } else {
 this.filter = filterDef.getFilter();
-getInstanceManager().newInstance(filter);
+context.getInstanceManager().newInstance(filter);
 initFilter();
 }
 }
@@ -131,11 +129,6 @@ public final class ApplicationFilterConf
 private final FilterDef filterDef;
 
 /**
- * the InstanceManager used to create and destroy filter instances.
- */
-private transient InstanceManager instanceManager;
-
-/**
  * JMX registration name
  */
 private ObjectName oname;
@@ -253,7 +246,7 @@ public final class ApplicationFilterConf
 
 // Identify the class loader we will be using
 String filterClass = filterDef.getFilterClass();
-this.filter = (Filter) getInstanceManager().newInstance(filterClass);
+this.filter = (Filter) 
context.getInstanceManager().newInstance(filterClass);
 
 initFilter();
 
@@ -334,20 +327,6 @@ public final class ApplicationFilterConf
 
 //  Private Methods
 
-private InstanceManager getInstanceManager() {
-if (instanceManager == null) {
-if (context instanceof StandardContext) {
-instanceManager = context.getInstanceManager();
-} else {
-instanceManager = new DefaultInstanceManager(null,
-new HashMap>(),
-context,
-getClass().getClassLoader());
-}
-}
-return instanceManager;
-}
-
 private void registerJMX() {
 String parentName = context.getName();
 if (!parentName.startsWith("/")) {

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1833194&r1=1833193&r2=1833194&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Fri Jun  8 
16:05:35 2018
@@ -19,9 +19,7 @@ package org.apache.catalina.core;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.naming.NamingException;
@@ -47,7 +45,6 @@ import org.apache.coyote.AsyncContextCal
 import org.apache.coyote.RequestInfo;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.UDecoder;
 import org.apache.tomcat.util.res.StringManager;
@@ -78,7 +75,6 @@ public class AsyncContextImpl implements
 private long timeout = -1;
 private AsyncEvent event = null;
 private volatile Request request;
-private volatile InstanceManager instanceManager;
 
 public AsyncContextImpl(Request request) {
 if (log.isDebugEnabled()) {
@@ -268,8 +264,8 @@ public class AsyncContextImpl implements
 check();
 T listener = null;
 try {
- listener = (T) getInstanceManager().newInstance(clazz.getName(),
- clazz.getClassLoader());
+ 

[Bug 53085] [perf] [concurrency] DefaultInstanceManager.annotationCache is not optimal for more threads

2018-06-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=53085

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #8 from Mark Thomas  ---
This was fixed back in January 2017.

The fix is available in:
- 9.0.0.M18 onwards
- 8.5.12 onwards
- 8.0.42 onwards
- 7.0.76 onwards

See the change log entry: 
Reduce the contention in the default InstanceManager implementation when
multiple threads are managing objects and need to reference the annotation
cache.

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



svn commit: r1833207 - /tomcat/trunk/CONTRIBUTING.md

2018-06-08 Thread isapir
Author: isapir
Date: Fri Jun  8 20:33:09 2018
New Revision: 1833207

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

Modified:
tomcat/trunk/CONTRIBUTING.md

Modified: tomcat/trunk/CONTRIBUTING.md
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/CONTRIBUTING.md?rev=1833207&r1=1833206&r2=1833207&view=diff
==
--- tomcat/trunk/CONTRIBUTING.md (original)
+++ tomcat/trunk/CONTRIBUTING.md Fri Jun  8 20:33:09 2018
@@ -53,7 +53,7 @@ Tomcat Connectors products in Bugzilla.
 Excited yet? This section will guide you through providing a patch to the
 committers of the project for review and acceptance.
 
-# Chose Your Method of Submission
+# Choose Your Method of Submission
 
 You can provide a patch in one of the following ways (in order of preference):
 



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



svn commit: r1833215 - /tomcat/trunk/CONTRIBUTING.md

2018-06-08 Thread isapir
Author: isapir
Date: Fri Jun  8 20:42:00 2018
New Revision: 1833215

URL: http://svn.apache.org/viewvc?rev=1833215&view=rev
Log:
Updated SVN URLs to https

Modified:
tomcat/trunk/CONTRIBUTING.md

Modified: tomcat/trunk/CONTRIBUTING.md
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/CONTRIBUTING.md?rev=1833215&r1=1833214&r2=1833215&view=diff
==
--- tomcat/trunk/CONTRIBUTING.md (original)
+++ tomcat/trunk/CONTRIBUTING.md Fri Jun  8 20:42:00 2018
@@ -87,13 +87,13 @@ committers to learn how to do this are f
 [here](http://www.apache.org/dev/contributors.html#svnbasics). However, in the
 interest of a fast ramp up, the short version is below. Note that the root of
 the SVN repository is
-[tomcat/trunk](http://svn.apache.org/repos/asf/tomcat/trunk),
+[tomcat/trunk](https://svn.apache.org/repos/asf/tomcat/trunk),
 but you can clone specific versions too, such as
-[tc8.5.x](http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/) or even tags (
-[TOMCAT_8_5_15](http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_15/)).
+[tc8.5.x](https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/) or even tags 
(
+[TOMCAT_8_5_15](https://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_15/)).
 
 ```
-$ svn co http://svn.apache.org/repos/asf/tomcat/trunk/
+$ svn co https://svn.apache.org/repos/asf/tomcat/trunk/
 ```
 
 # Github



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