svn commit: r1022389 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: kkolinko
Date: Thu Oct 14 07:06:01 2010
New Revision: 1022389
URL: http://svn.apache.org/viewvc?rev=1022389&view=rev
Log:
Followup to r946230
Do not fine-format integer values in debug output.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1022389&r1=1022388&r2=1022389&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Oct
14 07:06:01 2010
@@ -687,7 +687,7 @@ public class CoyoteAdapter implements Ad
log.debug(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
log.debug(sm.getString("coyoteAdapter.debug", "semicolon",
-Integer.valueOf(semicolon)));
+String.valueOf(semicolon)));
log.debug(sm.getString("coyoteAdapter.debug", "enc", enc));
}
@@ -739,9 +739,9 @@ public class CoyoteAdapter implements Ad
if (log.isDebugEnabled()) {
log.debug(sm.getString("coyoteAdapter.debug", "pathParamStart",
-Integer.valueOf(pathParamStart)));
+String.valueOf(pathParamStart)));
log.debug(sm.getString("coyoteAdapter.debug", "pathParamEnd",
-Integer.valueOf(pathParamEnd)));
+String.valueOf(pathParamEnd)));
log.debug(sm.getString("coyoteAdapter.debug", "pv", pv));
}
@@ -753,7 +753,7 @@ public class CoyoteAdapter implements Ad
request.addPathParameter(name, value);
if (log.isDebugEnabled()) {
log.debug(sm.getString("coyoteAdapter.debug", "equals",
-Integer.valueOf(equals)));
+String.valueOf(equals)));
log.debug(sm.getString("coyoteAdapter.debug", "name",
name));
log.debug(sm.getString("coyoteAdapter.debug", "value",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1022323 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
On 14/10/2010 00:25, kkoli...@apache.org wrote: > Author: kkolinko > Date: Wed Oct 13 23:25:47 2010 > New Revision: 1022323 > > URL: http://svn.apache.org/viewvc?rev=1022323&view=rev > Log: > Followup to r1022303 > I think that releasing the socket should be done before passing it away to a > poller. Thanks for picking that up. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1005192 - /tomcat/tc6.0.x/trunk/STATUS.txt
2010/10/13 Mark Thomas : > On 13/10/2010 16:57, Konstantin Kolinko wrote: >> 2010/10/6 : >>> Author: markt >>> Date: Wed Oct 6 18:03:03 2010 >>> New Revision: 1005192 >>> >>> URL: http://svn.apache.org/viewvc?rev=1005192&view=rev >>> Log: >>> Proposal >>> >>> Modified: >>> tomcat/tc6.0.x/trunk/STATUS.txt >>> >>> + >>> +* Fix path parameter handling. Currently the following URL fails with a >>> 404: >>> + http://localhost:8080/examples/jsp/snp;x=y/snoop.jsp >>> + http://people.apache.org/~markt/patches/2010-10-06-path-param-tc6.patch >>> + +1: markt >>> + -1: >>> >> >> I think this is wrong, because a path parameter is not just a pair of >> (name, value), but a triple of (path, name, value), taking into >> account the path segment where it was applied. >> >> The proposed patch strips information on the parameters from the path. >> How the application is supposed to have access to them? > > The short answer is via getRequestURI(). The longer answer is: > > The Servlet Specification defines the following: > requestURI = contextPath + servletPath + pathInfo > > It also states that: > - path parameters are returned by getRequestURI() and getPathInfo() > - contextPath & path parameters are ignored when mapping requests to > servlets > > The specification does not state: > - if the value returned by getContextPath() include path parameters or > not. The implication is that it should not. > - if the value returned by getServletPath() include path parameters or > not. The implication is that it should not. > > If you add removal of /../ sequences, URI decoding and character > decoding then the picture gets even murkier. > > The Servlet expert group has previously indicated [1] that the > specification would be altered to state that getPathInfo() should not > return path parameters and that clarification would be added to confirm > that getContextPath() and getServletPath() should not return path > parameters either. This clarification was never added to the specification. > > I'm not against switching from a pair to a triple for this but a) I'm > not sure many (any?) folks are using path parameters apart from for > session IDs and b) I think the 404 is a more important issue. > > Finally, I'd add that the behaviour varies considerably between > containers in this area and an app's only hope for portability at the > moment is to use getRequestURI(). > > Mark > > [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=25015 > OK. Looks that the patch is working. The snoop.jsp displays the full original path as "Request URI" (aka request.getRequestURI()). Other things there 1) Add http://svn.apache.org/viewvc?rev=1022389&view=rev 2) protected method CoyoteAdapter.parseSessionId(..) is no more used. Deprecate it? 3) path parameters that have no '=' in them are not added to the map. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Recycling processors in Http11NioProtocol
On 14/10/2010 01:01, Konstantin Kolinko wrote: > Hi! > > Looking at the Http11NioProtocol.Http11ConnectionHandler.release(NioChannel > socket) method in Http11NioProtocol.java, it looks for me that like > that method does in all other places before any call to > "recycledProcessors.offer(result);" there should be > - a call to connections.remove(socket) > - a call to Http11NioProcessor.recycle() > > I see two places where those calls are missing. A patch is inline > below, as well as attached to the message. Any comments? I might miss > something. +1 for applying. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022414 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: timw Date: Thu Oct 14 08:30:41 2010 New Revision: 1022414 URL: http://svn.apache.org/viewvc?rev=1022414&view=rev Log: More backport votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022414&r1=1022413&r2=1022414&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 14 08:30:41 2010 @@ -251,19 +251,19 @@ PATCHES PROPOSED TO BACKPORT: Compile recursive tag file if it depends on a JAR. Patch provided by Sylvain Laurent. https://issues.apache.org/bugzilla/attachment.cgi?id=26149 - +1: markt, kkolinko + +1: markt, kkolinko, timw -1: * Avoid unnecessary cast http://svn.apache.org/viewvc?rev=1022134&view=rev - +1: markt, kkolinko, rjung + +1: markt, kkolinko, rjung, timw -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 Add a work-around for the known namespace issues for some Microsoft WebDAV clients. Based on the patch provided by Panagiotis Astithas. http://svn.apache.org/viewvc?rev=1022120&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, timw -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022415 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Author: kkolinko
Date: Thu Oct 14 08:32:59 2010
New Revision: 1022415
URL: http://svn.apache.org/viewvc?rev=1022415&view=rev
Log:
Improve recycling of processors in Http11NioProtocol
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1022415&r1=1022414&r2=1022415&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu Oct
14 08:32:59 2010
@@ -330,8 +330,7 @@ public class Http11NioProtocol extends A
state = processor.asyncPostProcess();
}
if (state != SocketState.LONG && state !=
SocketState.ASYNC_END) {
-connections.remove(socket);
-recycledProcessors.offer(processor);
+release(socket);
if (state == SocketState.OPEN) {
socket.getPoller().add(socket);
}
@@ -422,6 +421,8 @@ public class Http11NioProtocol extends A
// less-than-verbose logs.
log.error(sm.getString("http11protocol.proto.error"), e);
}
+connections.remove(socket);
+processor.recycle();
recycledProcessors.offer(processor);
return SocketState.CLOSED;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022418 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: timw Date: Thu Oct 14 08:38:37 2010 New Revision: 1022418 URL: http://svn.apache.org/viewvc?rev=1022418&view=rev Log: More backport votes. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1022418&r1=1022417&r2=1022418&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Oct 14 08:38:37 2010 @@ -58,7 +58,7 @@ PATCHES PROPOSED TO BACKPORT: for channelSocket.maxPort +1: kkolinko, markt -1: - -0: rjung, jim + -0: rjung, jim, timw rjung: Should we really change default behaviour for a mature version? kkolinko: (I think that hardly anyone uses that feature, and if it is needed, one can reenable it now by setting the maxPort attribute. @@ -66,15 +66,18 @@ PATCHES PROPOSED TO BACKPORT: -- see attachment 25657 in BZ 49521, but I do not think that it is worth it.) jim: Also not comfortable with such a change this late in the game regarding default behavior of a stable branch. + timw: This caused major pain embedding 5.5 (so I'm sorely tempted to +1) +, but moving to 6.0 is a decent soln. +Probably not worth changing this late in the evolution of 5.5. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49935 Handle compilation of recursive tag files. Port fix from tc6. http://people.apache.org/~markt/patches/2010-09-27-bug49935-tc5.patch - +1: markt, kkolinko + +1: markt, kkolinko, timw -1: * Avoid unnecessary cast http://svn.apache.org/viewvc?rev=1022134&view=rev - +1: markt, kkolinko, rjung + +1: markt, kkolinko, rjung, timw -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022419 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Oct 14 08:38:52 2010 New Revision: 1022419 URL: http://svn.apache.org/viewvc?rev=1022419&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022419&r1=1022418&r2=1022419&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 14 08:38:52 2010 @@ -277,3 +277,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1022323&view=rev +1: kkolinko -1: + + Additional patch: + * Improve recycling of processors in Http11NioProtocol + http://svn.apache.org/viewvc?rev=1022415&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Recycling processors in Http11NioProtocol
2010/10/14 Mark Thomas : > On 14/10/2010 01:01, Konstantin Kolinko wrote: >> Hi! >> >> Looking at the Http11NioProtocol.Http11ConnectionHandler.release(NioChannel >> socket) method in Http11NioProtocol.java, it looks for me that like >> that method does in all other places before any call to >> "recycledProcessors.offer(result);" there should be >> - a call to connections.remove(socket) >> - a call to Http11NioProcessor.recycle() >> >> I see two places where those calls are missing. A patch is inline >> below, as well as attached to the message. Any comments? I might miss >> something. > > +1 for applying. > > Mark Thank you for review. Applied in r1022415, proposed for 6.0. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 50078] Concurrent access to WeakHashMap in ConcurrentCache causes infinite loop, 100% CPU usage
I can have a look at this. Is there a preferred way of making this configurable? Given the caches are static, it's either going to be system property, or changing to using an instance cache retained somewhere appropriate (at the moment the builders appear to be instantiated in a lot of places). Just out of interest, does anyone have any data/experience on the behaviour of the eden/pull to eden/weak overflow style of caching vs a conventional LRU cache? (not one I've seen used a lot before). cheers tim On Wed, Oct 13, 2010 at 4:46 AM, wrote: > https://issues.apache.org/bugzilla/show_bug.cgi?id=50078 > > --- Comment #1 from Remy Maucherat 2010-10-12 11:46:18 EDT > --- > Ooops, this needs to be fixed ASAP. > > The map sizes need to be made configurable I think (with the sync, 5000 might > be too low for big setups and would result in a lot of syncs). > > -- > Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email > --- 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 > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022428 - in /tomcat/site/trunk: docs/migration.html xdocs/migration.xml
Author: markt Date: Thu Oct 14 09:02:01 2010 New Revision: 1022428 URL: http://svn.apache.org/viewvc?rev=1022428&view=rev Log: Add some CSRF info to migration docs Modified: tomcat/site/trunk/docs/migration.html tomcat/site/trunk/xdocs/migration.xml Modified: tomcat/site/trunk/docs/migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1022428&r1=1022427&r2=1022428&view=diff == --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Thu Oct 14 09:02:01 2010 @@ -599,6 +599,17 @@ compatibility problems. manager-status - allows access to the status pages only +The HTML interface is protected against CSRF but the text and JMX +interfaces are not. To maintain the CSRF protection: + + + users with the manager-gui role should not be granted + either the manager-script or manager-jmx roles. + if the text or jmx interfaces are accessed through a browser (e.g. for + testing since these interfaces are intended for tools not humans) then + the browser must be closed afterwards to terminate the session. + + @@ -644,13 +655,24 @@ compatibility problems. -admin - allows access to the HTML GUI and the status +admin-gui - allows access to the HTML GUI and the status pages admin-script - allows access to the text interface and the status pages +The HTML interface is protected against CSRF but the text interface is +not. To maintain the CSRF protection: + + + users with the admin-gui role should not be granted the + admin-script role. + if the text interface is accessed through a browser (e.g. for testing + since this inteface is intended for tools not humans) then the browser + must be closed afterwards to terminate the session. + + Modified: tomcat/site/trunk/xdocs/migration.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1022428&r1=1022427&r2=1022428&view=diff == --- tomcat/site/trunk/xdocs/migration.xml (original) +++ tomcat/site/trunk/xdocs/migration.xml Thu Oct 14 09:02:01 2010 @@ -141,6 +141,17 @@ compatibility problems. manager-status - allows access to the status pages only +The HTML interface is protected against CSRF but the text and JMX +interfaces are not. To maintain the CSRF protection: + + + users with the manager-gui role should not be granted + either the manager-script or manager-jmx roles. + if the text or jmx interfaces are accessed through a browser (e.g. for + testing since these interfaces are intended for tools not humans) then + the browser must be closed afterwards to terminate the session. + + @@ -162,12 +173,23 @@ compatibility problems. assign the role(s) required for the functionality you wish to access. - admin - allows access to the HTML GUI and the status + admin-gui - allows access to the HTML GUI and the status pages admin-script - allows access to the text interface and the status pages +The HTML interface is protected against CSRF but the text interface is +not. To maintain the CSRF protection: + + + users with the admin-gui role should not be granted the + admin-script role. + if the text interface is accessed through a browser (e.g. for testing + since this inteface is intended for tools not humans) then the browser + must be closed afterwards to terminate the session. + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022435 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Oct 14 09:11:44 2010 New Revision: 1022435 URL: http://svn.apache.org/viewvc?rev=1022435&view=rev Log: vote, update comment Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022435&r1=1022434&r2=1022435&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 14 09:11:44 2010 @@ -141,10 +141,14 @@ PATCHES PROPOSED TO BACKPORT: * Make sure Contexts defined in server.xml pick up any configClass setting from the parent Host. http://people.apache.org/~markt/patches/2010-09-11-configClass.patch - +1: markt + +1: markt, kkolinko -1: - kkolinko: A bit hard to understand. The proposal is about a rule that processes -, but LifecycleListenerRule is used for and as well. + kkolinko: Though 1) I do not see any documentation on configClass attribute in +the docs at all. Though it is in JavaDoc for StandardHost. +2) It looks, formally, the patch does more than is announced. It applies to any +LifecycleListenerRule. Actually, though, for Engine's engineConfigClass attribute +and Host's hostConfigClass attribute it does not change their behaviour, +because their containers do not have those attributes. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49497 Stop accepting new requests (inc keep-alive) once the BIO connector is paused - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022441 - in /tomcat/trunk/webapps: docs/manager-howto.xml host-manager/401.jsp host-manager/403.jsp manager/401.jsp manager/403.jsp
Author: markt Date: Thu Oct 14 09:22:54 2010 New Revision: 1022441 URL: http://svn.apache.org/viewvc?rev=1022441&view=rev Log: Add some more info on CSRF protection for the manager and host manager applications Modified: tomcat/trunk/webapps/docs/manager-howto.xml tomcat/trunk/webapps/host-manager/401.jsp tomcat/trunk/webapps/host-manager/403.jsp tomcat/trunk/webapps/manager/401.jsp tomcat/trunk/webapps/manager/403.jsp Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1022441&r1=1022440&r2=1022441&view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Thu Oct 14 09:22:54 2010 @@ -169,6 +169,18 @@ an example of restricting access to the allow="127\.0\.0\.1"/> + +The HTML interface is protected against CSRF but the text and JMX interfaces +are not. To maintain the CSRF protection: + + + users with the manager-gui role should not be granted either the + manager-script or manager-jmx roles. + if the text or jmx interfaces are accessed through a browser (e.g. for + testing since these interfaces are intended for tools not humans) then the + browser must be closed afterwards to terminate the session. + + Modified: tomcat/trunk/webapps/host-manager/401.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/401.jsp?rev=1022441&r1=1022440&r2=1022441&view=diff == --- tomcat/trunk/webapps/host-manager/401.jsp (original) +++ tomcat/trunk/webapps/host-manager/401.jsp Thu Oct 14 09:22:54 2010 @@ -54,9 +54,20 @@ the functionality you wish to access. - admin - allows access to the HTML GUI + admin-gui - allows access to the HTML GUI admin-script - allows access to the text interface + +The HTML interface is protected against CSRF but the text interface is not. +To maintain the CSRF protection: + + +users with the admin-gui role should not be granted the + manager-script role. +if the text interface is accessed through a browser (e.g. for testing +since this interfaces is intended for tools not humans) then the browser +must be closed afterwards to terminate the session. + Modified: tomcat/trunk/webapps/host-manager/403.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/403.jsp?rev=1022441&r1=1022440&r2=1022441&view=diff == --- tomcat/trunk/webapps/host-manager/403.jsp (original) +++ tomcat/trunk/webapps/host-manager/403.jsp Thu Oct 14 09:22:54 2010 @@ -71,6 +71,17 @@ admin-gui - allows access to the HTML GUI admin-script - allows access to the text interface + +The HTML interface is protected against CSRF but the text interface is not. +To maintain the CSRF protection: + + +users with the admin-gui role should not be granted the + manager-script role. +if the text interface is accessed through a browser (e.g. for testing +since this interfaces is intended for tools not humans) then the browser +must be closed afterwards to terminate the session. + Modified: tomcat/trunk/webapps/manager/401.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/401.jsp?rev=1022441&r1=1022440&r2=1022441&view=diff == --- tomcat/trunk/webapps/manager/401.jsp (original) +++ tomcat/trunk/webapps/manager/401.jsp Thu Oct 14 09:22:54 2010 @@ -63,6 +63,17 @@ manager-status - allows access to the status pages only +The HTML interface is protected against CSRF but the text and JMX interfaces +are not. To maintain the CSRF protection: + + +users with the manager-gui role should not be granted either +the manager-script or manager-jmx roles. +if the text or jmx interfaces are accessed through a browser (e.g. for + testing since these interfaces are intended for tools not humans) then + the browser must be closed afterwards to terminate the session. + + For more information - please see the Manager App HOW-TO. Modified: tomcat/trunk/webapps/manager/403.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/403.jsp?rev=1022441&r1=1022440&r2=1022441&view=diff == --- tomcat/trunk/webapps/manager/403.jsp (original) +++ tomcat/trunk/webapps/manager/403.jsp Thu Oct 14 09:22:54 2010 @@ -78,6 +78,17 @@ manager-status - allows access to the status pages only +The HTML interface is protected against CSRF but the
Re: svn commit: r1005192 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 14/10/2010 09:02, Konstantin Kolinko wrote: > OK. Looks that the patch is working. The snoop.jsp displays the full > original path as "Request URI" (aka request.getRequestURI()). > > Other things there > 1) Add http://svn.apache.org/viewvc?rev=1022389&view=rev +1 > 2) protected method CoyoteAdapter.parseSessionId(..) is no more used. > Deprecate it? +1 > 3) path parameters that have no '=' in them are not added to the map. Could you find a definitive reference on how path parameters are defined for HTTP (i.e. use ';' as the separator, value required/optional, defining multiple values for one parameter, path segment is/isn't significant etc.)? I looked but couldn't find anything. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 50078] Concurrent access to WeakHashMap in ConcurrentCache causes infinite loop, 100% CPU usage
On 14/10/2010 09:44, Tim Whittington wrote: > I can have a look at this. > Is there a preferred way of making this configurable? > Given the caches are static, it's either going to be system property, > or changing to using an instance cache retained somewhere appropriate > (at the moment the builders appear to be instantiated in a lot of > places). I'd been thinking system property (maybe two since there are two caches but I wanted to look into that more) > Just out of interest, does anyone have any data/experience on the > behaviour of the eden/pull to eden/weak overflow style of caching vs a > conventional LRU cache? (not one I've seen used a lot before). Not here. The current impl looks reasonable though. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022462 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Oct 14 10:46:47 2010 New Revision: 1022462 URL: http://svn.apache.org/viewvc?rev=1022462&view=rev Log: Typo Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022462&r1=1022461&r2=1022462&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 14 10:46:47 2010 @@ -83,7 +83,7 @@ 49978: Correctly handle the case when a directory expected to be created during web application start is already present. Rather -than throwing an exception and failing to start, allow thw web +than throwing an exception and failing to start, allow the web application to start normally. (mark) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 50078] Concurrent access to WeakHashMap in ConcurrentCache causes infinite loop, 100% CPU usage
On Thu, 2010-10-14 at 21:44 +1300, Tim Whittington wrote: > I can have a look at this. > Is there a preferred way of making this configurable? > Given the caches are static, it's either going to be system property, > or changing to using an instance cache retained somewhere appropriate > (at the moment the builders appear to be instantiated in a lot of > places). > > Just out of interest, does anyone have any data/experience on the > behaviour of the eden/pull to eden/weak overflow style of caching vs a > conventional LRU cache? (not one I've seen used a lot before). No idea what cache scheme would have top efficiency. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022478 - /tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Author: markt
Date: Thu Oct 14 12:11:51 2010
New Revision: 1022478
URL: http://svn.apache.org/viewvc?rev=1022478&view=rev
Log:
Avoid NPE triggered when running TCK tests
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1022478&r1=1022477&r2=1022478&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu
Oct 14 12:11:51 2010
@@ -144,8 +144,10 @@ public class InternalNioOutputBuffer ext
@Override
public void recycle() {
super.recycle();
-socket.getBufHandler().getWriteBuffer().clear();
-socket = null;
+if (socket != null) {
+socket.getBufHandler().getWriteBuffer().clear();
+socket = null;
+}
lastWrite.set(1);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
JmxRemoteLifecycleListener and com.sun.security.auth.module.LdapLoginModule JMX authentification
Hi to all, I'm using JmxRemoteLifecycleListener since some of my servers are behind a firewall. It works great with auth/password files I tried to use JMX LDAP authentication, http://blogs.sun.com/alanb/entry/one_password_to_rule_them, but then it didn't works anymore. We take a look in sources, http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?view=markup and see access and password are hardcode in source (line 160). Should I open a BZ for this one ? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022550 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Oct 14 14:41:50 2010 New Revision: 1022550 URL: http://svn.apache.org/viewvc?rev=1022550&view=rev Log: Votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022550&r1=1022549&r2=1022550&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 14 14:41:50 2010 @@ -211,7 +211,7 @@ PATCHES PROPOSED TO BACKPORT: Additional patch: http://svn.apache.org/viewvc?rev=1004868&view=rev http://svn.apache.org/viewvc?rev=1004869&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Fix path parameter handling. Currently the following URL fails with a 404: @@ -279,7 +279,7 @@ PATCHES PROPOSED TO BACKPORT: Additional patch: http://svn.apache.org/viewvc?rev=1022323&view=rev - +1: kkolinko + +1: kkolinko, markt -1: Additional patch: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatAtApacheConNA2010" by Ch ristopherSchultz
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatAtApacheConNA2010" page has been changed by ChristopherSchultz. http://wiki.apache.org/tomcat/TomcatAtApacheConNA2010?action=diff&rev1=3&rev2=4 -- There is a full day track of sessions on Friday, and two days of Tomcat training classes available on Monday & Tuesday = BOF / MeetUp - Thursday 4th = - There will be a Tomcat !MeetUp on Thursday 4th night at 8PM. '''This event is open to anyone who wants to come, even if you are not registered for the conference.''' + There will be a Tomcat !MeetUp on Thursday 4th night at 8PM [location to-be-announced]. '''This event is open to anyone who wants to come, even if you are not registered for the conference.''' (Draft) Plan for the meetup: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022557 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/TagFileProcessor.java webapps/docs/changelog.xml
Author: markt
Date: Thu Oct 14 14:47:31 2010
New Revision: 1022557
URL: http://svn.apache.org/viewvc?rev=1022557&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50066
Compile recursive tag file if it depends on a JAR.
Patch provided by Sylvain Laurent.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022557&r1=1022556&r2=1022557&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 14 14:47:31 2010
@@ -251,13 +251,6 @@ PATCHES PROPOSED TO BACKPORT:
- Do not remove "// Make sure no session ID is returned" comment.
- Documentation update will be needed.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50066
- Compile recursive tag file if it depends on a JAR. Patch provided by Sylvain
- Laurent.
- https://issues.apache.org/bugzilla/attachment.cgi?id=26149
- +1: markt, kkolinko, timw
- -1:
-
* Avoid unnecessary cast
http://svn.apache.org/viewvc?rev=1022134&view=rev
+1: markt, kkolinko, rjung, timw
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1022557&r1=1022556&r2=1022557&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
Thu Oct 14 14:47:31 2010
@@ -618,6 +618,10 @@ class TagFileProcessor {
.getServletContext(), ctxt.getOptions(),
tagFilePath, tagInfo, ctxt.getRuntimeContext(),
ctxt.getTagFileJarUrl(tagFilePath));
+// Use same classloader and classpath for compiling tag
files
+tempWrapper.getJspEngineContext().setClassLoader(
+(URLClassLoader) ctxt.getClassLoader());
+
tempWrapper.getJspEngineContext().setClassPath(ctxt.getClassPath());
tagClazz = tempWrapper.loadTagFilePrototype();
tempVector.add(tempWrapper.getJspEngineContext()
.getCompiler());
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1022557&r1=1022556&r2=1022557&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 14 14:47:31 2010
@@ -163,6 +163,10 @@
49998: Make jsp:root detection work with single quoted
attributes as well. (timw)
+
+50066: Compile a recursive tag file if it depends on a JAR.
+Patch provided by Sylvain Laurent. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50066] Cannot compile recursive tag with ant if it uses a class from the webapp
https://issues.apache.org/bugzilla/show_bug.cgi?id=50066 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2010-10-14 10:48:16 EDT --- Fixed in 6.0.x and will be in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1022560 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: markt Date: Thu Oct 14 14:53:34 2010 New Revision: 1022560 URL: http://svn.apache.org/viewvc?rev=1022560&view=rev Log: Code clean-up. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 14:53:34 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178,966292,966692,981815,991837,993042,1001955,1002185,1002263,1002349,1002359,1002362,1002481,1002514,1003481,1003488,1003556,1003572,1003581,1003861,1005452,1005467,1005647 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,78376
svn commit: r1022570 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/servlets/WebdavServlet.java webapps/docs/changelog.xml
Author: markt Date: Thu Oct 14 15:06:48 2010 New Revision: 1022570 URL: http://svn.apache.org/viewvc?rev=1022570&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 Add a work-around for the known namespace issues for some Microsoft WebDAV clients. Based on the patch provided by Panagiotis Astithas. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 15:06:48 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178,966292,966692,981815,991837,993042,1001955,1002185,1002263,1002349,1002359,1002362,1002481,1002514,1003481,1003488,1003556,1003572,1003581,1003861,1005452,1005467,1005647,1022134 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,7649
DO NOT REPLY [Bug 49428] Fix WebDAV mounts from Windows Mini-Redirector clients
https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #12 from Mark Thomas 2010-10-14 11:07:35 EDT --- Alternative patch applied to 6.0.x and will be in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: DO NOT REPLY [Bug 50078] Concurrent access to WeakHashMap in ConcurrentCache causes infinite loop, 100% CPU usage
On 14/10/2010 09:44, Tim Whittington wrote: > I can have a look at this. Tim, Any progress on this? I'd like to get something into Tomcat 7 before I tag 7.0.4 later today. I'm happy to look at it if that doesn't fit your schedule. Mark > Is there a preferred way of making this configurable? > Given the caches are static, it's either going to be system property, > or changing to using an instance cache retained somewhere appropriate > (at the moment the builders appear to be instantiated in a lot of > places). > > Just out of interest, does anyone have any data/experience on the > behaviour of the eden/pull to eden/weak overflow style of caching vs a > conventional LRU cache? (not one I've seen used a lot before). > > cheers > tim > > On Wed, Oct 13, 2010 at 4:46 AM, wrote: >> https://issues.apache.org/bugzilla/show_bug.cgi?id=50078 >> >> --- Comment #1 from Remy Maucherat 2010-10-12 11:46:18 EDT >> --- >> Ooops, this needs to be fixed ASAP. >> >> The map sizes need to be made configurable I think (with the sync, 5000 might >> be too low for big setups and would result in a lot of syncs). >> >> -- >> Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email >> --- 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 >> >> > > - > 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
svn commit: r1022593 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Thu Oct 14 16:05:55 2010
New Revision: 1022593
URL: http://svn.apache.org/viewvc?rev=1022593&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50087
Catch ClassFormatErrors when scanning for annotations.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1022593&r1=1022592&r2=1022593&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Oct 14
16:05:55 2010
@@ -1958,6 +1958,10 @@ public class ContextConfig
log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
className), e);
return;
+} catch (ClassFormatError e) {
+log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
+className), e);
+return;
}
if (clazz.isAnnotation()) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022593&r1=1022592&r2=1022593&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 14 16:05:55 2010
@@ -121,6 +121,10 @@
causes applications marked as meta-data complete to return 404s for all
requests. Patch provided by heyoulin. (markt)
+
+50087: Catch ClassFormatErrors when scanning for
annotations.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50087] When metadata-complete="false" throw illegal JVM_CONSTANT_Class name
https://issues.apache.org/bugzilla/show_bug.cgi?id=50087 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-10-14 12:07:11 EDT --- Fixed in trunk and will be in 7.0.4 onwards. You'll still see the stack trace (since that Groovy class has an invalid name) but context deployment will continue rather than failing. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1022606 - in /tomcat/trunk/java: javax/el/BeanELResolver.java org/apache/el/lang/ExpressionBuilder.java org/apache/el/util/ConcurrentCache.java
Author: markt
Date: Thu Oct 14 16:36:20 2010
New Revision: 1022606
URL: http://svn.apache.org/viewvc?rev=1022606&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50078
Thread safety in EL caches. Patch provided by Takayoshi Kimura
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1022606&r1=1022605&r2=1022606&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Thu Oct 14 16:36:20 2010
@@ -334,7 +334,9 @@ public class BeanELResolver extends ELRe
public V get(K key) {
V value = this.eden.get(key);
if (value == null) {
-value = this.longterm.get(key);
+synchronized (longterm) {
+value = this.longterm.get(key);
+}
if (value != null) {
this.eden.put(key, value);
}
@@ -344,7 +346,9 @@ public class BeanELResolver extends ELRe
public void put(K key, V value) {
if (this.eden.size() >= this.size) {
-this.longterm.putAll(this.eden);
+synchronized (longterm) {
+this.longterm.putAll(this.eden);
+}
this.eden.clear();
}
this.eden.put(key, value);
Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=1022606&r1=1022605&r2=1022606&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Thu Oct 14
16:36:20 2010
@@ -49,7 +49,8 @@ import org.apache.el.util.MessageFactory
*/
public final class ExpressionBuilder implements NodeVisitor {
-private static final ConcurrentCache cache = new
ConcurrentCache(5000);
+private static final ConcurrentCache cache =
+new ConcurrentCache(5000);
private FunctionMapper fnMapper;
Modified: tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java?rev=1022606&r1=1022605&r2=1022606&view=diff
==
--- tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java Thu Oct 14
16:36:20 2010
@@ -37,7 +37,9 @@ public final class ConcurrentCache
public V get(K k) {
V v = this.eden.get(k);
if (v == null) {
-v = this.longterm.get(k);
+synchronized (longterm) {
+v = this.longterm.get(k);
+}
if (v != null) {
this.eden.put(k, v);
}
@@ -47,7 +49,9 @@ public final class ConcurrentCache
public void put(K k, V v) {
if (this.eden.size() >= size) {
-this.longterm.putAll(this.eden);
+synchronized (longterm) {
+this.longterm.putAll(this.eden);
+}
this.eden.clear();
}
this.eden.put(k, v);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 50078] Concurrent access to WeakHashMap in ConcurrentCache causes infinite loop, 100% CPU usage
On 14/10/2010 16:08, Mark Thomas wrote: > On 14/10/2010 09:44, Tim Whittington wrote: >> I can have a look at this. > > Tim, > > Any progress on this? I'd like to get something into Tomcat 7 before I > tag 7.0.4 later today. I'm happy to look at it if that doesn't fit your > schedule. As will soon be apparent from the commit logs, I went ahead and took a look at this so I could tag 7.0.4. Sorry if I stepped on your toes in the process. Mark > > Mark > > > >> Is there a preferred way of making this configurable? >> Given the caches are static, it's either going to be system property, >> or changing to using an instance cache retained somewhere appropriate >> (at the moment the builders appear to be instantiated in a lot of >> places). >> >> Just out of interest, does anyone have any data/experience on the >> behaviour of the eden/pull to eden/weak overflow style of caching vs a >> conventional LRU cache? (not one I've seen used a lot before). >> >> cheers >> tim >> >> On Wed, Oct 13, 2010 at 4:46 AM, wrote: >>> https://issues.apache.org/bugzilla/show_bug.cgi?id=50078 >>> >>> --- Comment #1 from Remy Maucherat 2010-10-12 11:46:18 >>> EDT --- >>> Ooops, this needs to be fixed ASAP. >>> >>> The map sizes need to be made configurable I think (with the sync, 5000 >>> might >>> be too low for big setups and would result in a lot of syncs). >>> >>> -- >>> Configure bugmail: >>> https://issues.apache.org/bugzilla/userprefs.cgi?tab=email >>> --- 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 >>> >>> >> >> - >> 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 > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022623 - in /tomcat/trunk: java/javax/el/BeanELResolver.java java/org/apache/el/lang/ExpressionBuilder.java webapps/docs/config/systemprops.xml
Author: markt
Date: Thu Oct 14 17:37:20 2010
New Revision: 1022623
URL: http://svn.apache.org/viewvc?rev=1022623&view=rev
Log:
Enhance fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50078
Make cache sizes configurable
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1022623&r1=1022622&r2=1022623&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Thu Oct 14 17:37:20 2010
@@ -26,6 +26,8 @@ import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
@@ -35,10 +37,31 @@ import java.util.concurrent.ConcurrentHa
public class BeanELResolver extends ELResolver {
+private static final int CACHE_SIZE;
+private static final String CACHE_SIZE_PROP =
+"org.apache.el.BeanELResolver.CACHE_SIZE";
+
+static {
+if (System.getSecurityManager() == null) {
+CACHE_SIZE = Integer.parseInt(
+System.getProperty(CACHE_SIZE_PROP, "1000"));
+} else {
+CACHE_SIZE = AccessController.doPrivileged(
+new PrivilegedAction() {
+
+@Override
+public Integer run() {
+return Integer.valueOf(
+System.getProperty(CACHE_SIZE_PROP, "1000"));
+}
+}).intValue();
+}
+}
+
private final boolean readOnly;
private final ConcurrentCache cache =
-new ConcurrentCache(1000);
+new ConcurrentCache(CACHE_SIZE);
public BeanELResolver() {
this.readOnly = false;
Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=1022623&r1=1022622&r2=1022623&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Thu Oct 14
17:37:20 2010
@@ -19,6 +19,8 @@ package org.apache.el.lang;
import java.io.StringReader;
import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import javax.el.ELContext;
import javax.el.ELException;
@@ -49,8 +51,29 @@ import org.apache.el.util.MessageFactory
*/
public final class ExpressionBuilder implements NodeVisitor {
+private static final int CACHE_SIZE;
+private static final String CACHE_SIZE_PROP =
+"org.apache.el.ExpressionBuilder.CACHE_SIZE";
+
+static {
+if (System.getSecurityManager() == null) {
+CACHE_SIZE = Integer.parseInt(
+System.getProperty(CACHE_SIZE_PROP, "5000"));
+} else {
+CACHE_SIZE = AccessController.doPrivileged(
+new PrivilegedAction() {
+
+@Override
+public Integer run() {
+return Integer.valueOf(
+System.getProperty(CACHE_SIZE_PROP, "5000"));
+}
+}).intValue();
+}
+}
+
private static final ConcurrentCache cache =
-new ConcurrentCache(5000);
+new ConcurrentCache(CACHE_SIZE);
private FunctionMapper fnMapper;
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1022623&r1=1022622&r2=1022623&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu Oct 14 17:37:20 2010
@@ -80,6 +80,18 @@
false will be used.
+
+ The number of javax.el.BeanELResolver.BeanProperties objects that will
+ be cached by the EL Parser. If not specified, the default of
+ 1000 will be used.
+
+
+
+ The number of parsed EL expressions that will be cached by the EL
+ Parser. If not specified, the default of 5000 will be used.
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022624 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Oct 14 17:38:54 2010 New Revision: 1022624 URL: http://svn.apache.org/viewvc?rev=1022624&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022624&r1=1022623&r2=1022624&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 14 17:38:54 2010 @@ -268,3 +268,12 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1022415&view=rev +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50078 + Fix threading issues in EL caches and make cache sizes configurable + Threading patch provided by Takayoshi Kimura + http://svn.apache.org/viewvc?rev=1022606&view=rev (threading) + http://svn.apache.org/viewvc?rev=1022623&view=rev (cache sizes) + +1: markt + -1: + \ 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
DO NOT REPLY [Bug 50078] Concurrent access to WeakHashMap in ConcurrentCache causes infinite loop, 100% CPU usage
https://issues.apache.org/bugzilla/show_bug.cgi?id=50078 --- Comment #2 from Mark Thomas 2010-10-14 13:40:24 EDT --- Thanks for the patch. I have fixed in this in trunk and that fix will be in 7.0.4 onwards. I added the ability to control the cache sizes. The patches have also been proposed for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1022626 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Oct 14 17:41:26 2010 New Revision: 1022626 URL: http://svn.apache.org/viewvc?rev=1022626&view=rev Log: Update Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022626&r1=1022625&r2=1022626&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 14 17:41:26 2010 @@ -178,6 +178,13 @@ 50066: Fix building of recursive tag files when the file depends on a JAR file. Patch provided by Sylvain Laurent. (markt) + +50078: Fix threading problem in EL caches. Patch provided by +Takayoshi Kimura. (markt) + + +Make EL cache sizes configurable. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022637 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_4: ./ build.properties.default modules/
Author: markt Date: Thu Oct 14 18:19:25 2010 New Revision: 1022637 URL: http://svn.apache.org/viewvc?rev=1022637&view=rev Log: Tag 7.0.4 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_4/ (props changed) - copied from r1022634, tomcat/trunk/ Removed: tomcat/tc7.0.x/tags/TOMCAT_7_0_4/modules/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_4/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_4/ -- --- svn:ignore (added) +++ svn:ignore Thu Oct 14 18:19:25 2010 @@ -0,0 +1,6 @@ +.settings +.classpath +.project +output +build.properties +.checkstyle Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_4/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk:742915 Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_4/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/tags/TOMCAT_7_0_4/build.properties.default?rev=1022637&r1=1022634&r2=1022637&view=diff == --- tomcat/tc7.0.x/tags/TOMCAT_7_0_4/build.properties.default (original) +++ tomcat/tc7.0.x/tags/TOMCAT_7_0_4/build.properties.default Thu Oct 14 18:19:25 2010 @@ -29,7 +29,7 @@ version.major=7 version.minor=0 version.build=4 version.patch=0 -version.suffix=-dev +version.suffix= # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022694 - /tomcat/trunk/build.properties.default
Author: markt Date: Thu Oct 14 20:28:50 2010 New Revision: 1022694 URL: http://svn.apache.org/viewvc?rev=1022694&view=rev Log: Bump version Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1022694&r1=1022693&r2=1022694&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Thu Oct 14 20:28:50 2010 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=4 +version.build=5 version.patch=0 version.suffix=-dev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022695 - in /tomcat/trunk: java/org/apache/catalina/Context.java java/org/apache/catalina/core/StandardContext.java java/org/apache/coyote/ActionCode.java webapps/docs/changelog.xml
Author: markt
Date: Thu Oct 14 20:33:14 2010
New Revision: 1022695
URL: http://svn.apache.org/viewvc?rev=1022695&view=rev
Log:
Fix Javadoc warnings
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1022695&r1=1022694&r2=1022695&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Oct 14 20:33:14 2010
@@ -1227,7 +1227,7 @@ public interface Context extends Contain
/**
* Notification that servlet security has been dynamically set in a
- * {...@link ServletRegistration.Dynamic}
+ * {...@link ServletRegistration.Dynamic}
* @param registration servlet security was modified for
* @param servletSecurityElement new security constraints for this servlet
* @return urls currently mapped to this registration that are already
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1022695&r1=1022694&r2=1022695&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Oct 14
20:33:14 2010
@@ -4061,7 +4061,7 @@ public class StandardContext extends Con
/**
* hook to register that we need to scan for security annotations.
- * @param registration
+ * @param wrapper The wrapper for the Servlet that was added
*/
public ServletRegistration.Dynamic dynamicServletAdded(Wrapper wrapper) {
return new ApplicationServletRegistration(wrapper, this);
Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1022695&r1=1022694&r2=1022695&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Thu Oct 14 20:33:14 2010
@@ -145,7 +145,7 @@ public enum ActionCode {
/**
* Callback for an async call to
- * {...@link javax.servlet.AsyncContext#start()}
+ * {...@link javax.servlet.AsyncContext#start(Runnable)}
*/
ASYNC_RUN,
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022695&r1=1022694&r2=1022695&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 14 20:33:14 2010
@@ -36,6 +36,15 @@
+
+
+
+
+Correct a handful of Javadoc warnings. (markt)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Meetup during ApacheConNA2010
Hi, We will have a meetup during the ApacheConNA2010 on Thursday 4th at 20h00. Meetups are free to attend and a opportunity to have short presentation and discussion about the new Tomcat 7 and the latest improvement done in the code. See http://wiki.apache.org/tomcat/TomcatAtApacheConNA2010 and register if you are around Atlanta and want to join us. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JmxRemoteLifecycleListener and com.sun.security.auth.module.LdapLoginModule JMX authentification
2010/10/14 Henri Gomez : > We take a look in sources, > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?view=markup > and see access and password are hardcode in source (line 160). > I see System.getProperty( ) there, so it is not hardcoded. It is just a default value. Also the JavaDoc for the class says * Only the ports are configured via * the listener. The remainder of the configuration is via the standard system * properties for configuring JMX. Moreover the field is a protected one, so a derived class may change it. > Should I open a BZ for this one ? I do not see a problem here, but if you are to propose some patch/enhancement then you are welcome, as always. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 50078] Concurrent access to WeakHashMap in ConcurrentCache causes infinite loop, 100% CPU usage
No worries, I got to take a tour of the EL implementation anyway :) I was in the middle of replying to you when my loaner laptop died, so I called it a night. New laptop arrived today (after a 3 week 'incident at sea' hiatus) so should be back to full speed soon. cheers tim On Fri, Oct 15, 2010 at 6:36 AM, Mark Thomas wrote: > On 14/10/2010 16:08, Mark Thomas wrote: >> On 14/10/2010 09:44, Tim Whittington wrote: >>> I can have a look at this. >> >> Tim, >> >> Any progress on this? I'd like to get something into Tomcat 7 before I >> tag 7.0.4 later today. I'm happy to look at it if that doesn't fit your >> schedule. > > As will soon be apparent from the commit logs, I went ahead and took a > look at this so I could tag 7.0.4. > > Sorry if I stepped on your toes in the process. > > Mark > >> >> Mark >> >> >> >>> Is there a preferred way of making this configurable? >>> Given the caches are static, it's either going to be system property, >>> or changing to using an instance cache retained somewhere appropriate >>> (at the moment the builders appear to be instantiated in a lot of >>> places). >>> >>> Just out of interest, does anyone have any data/experience on the >>> behaviour of the eden/pull to eden/weak overflow style of caching vs a >>> conventional LRU cache? (not one I've seen used a lot before). >>> >>> cheers >>> tim >>> >>> On Wed, Oct 13, 2010 at 4:46 AM, wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=50078 --- Comment #1 from Remy Maucherat 2010-10-12 11:46:18 EDT --- Ooops, this needs to be fixed ASAP. The map sizes need to be made configurable I think (with the sync, 5000 might be too low for big setups and would result in a lot of syncs). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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 >>> >>> - >>> 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 >> > > > - > 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: JmxRemoteLifecycleListener and com.sun.security.auth.module.LdapLoginModule JMX authentification
> I see System.getProperty( ) there, so it is not hardcoded. It is just
> a default value.
passwordFile = System.getProperty(
"com.sun.management.jmxremote.password.file",
"jmxremote.password");
accessFile = System.getProperty(
"com.sun.management.jmxremote.access.file",
"jmxremote.access");
// Configure authentication
if (authenticate) {
env.put("jmx.remote.x.password.file", passwordFile);
env.put("jmx.remote.x.access.file", accessFile);
}
To me, we're injecting login/password and access in context.
In LDAP approach, login/password validation operations are done by
com.sun.security.auth.module.LdapLoginModule
> Also the JavaDoc for the class says
> * Only the ports are configured via
> * the listener. The remainder of the configuration is via the standard system
> * properties for configuring JMX.
>
> Moreover the field is a protected one, so a derived class may change it.
>
>> Should I open a BZ for this one ?
>
> I do not see a problem here, but if you are to propose some
> patch/enhancement then you are welcome, as always.
Ok, I'll try to see what to do and propose a patch ;)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
