svn commit: r784384 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jun 13 12:49:20 2009 New Revision: 784384 URL: http://svn.apache.org/viewvc?rev=784384&view=rev Log: 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=784384&r1=784383&r2=784384&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 12:49:20 2009 @@ -99,6 +99,43 @@ http://svn.apache.org/viewvc?rev=778523&view=rev http://svn.apache.org/viewvc?rev=778524&view=rev +1: markt,funkman + +1: kkolinko: ( + good, I tested it and it fixes the issue, + but I have the following comments: + + 1. It works only if StandardSession.ACTIVITY_CHECK is true. + And that occurs only if one of the following properties is "true": + + org.apache.catalina.session.StandardSession.ACTIVITY_CHECK + org.apache.catalina.STRICT_SERVLET_COMPLIANCE + + Both are "false" by default, and that results in NullPointerException + because StandardSession.accessCount is null in that case. + + That is expected, and just needs to be documented. + Though some IllegalStateException might be better than NPE. + + Also maybe direct access to session.accessCount (a protected field of + a class in the same package) is not a good style. + + 2. In PersistentManagerBase.processMaxIdleSwaps(): + there is already the following line: + "StandardSession session = (StandardSession) sessions[i];" + + Thus, there is no need for "if (sessions[i] instanceof StandardSession)" check + in your patch, and you can access "session" instead of "session[i]". + + I think that "instanceof StandardSession" is a requirement, like + ACTIVITY_CHECK one above, and thus it is no need for "instanceof" + check. Just do a cast. + + 3. PersistentValve class has "session.access()" call that I do not see + how is balanced with "endAccess()". A reference to that session is just lost + and not stored in a Request (that would release it in its recycle() method), + so I think that additional "endAccess()" call is needed there. I have no + experience with that class, though. + + ) -1: * Remove unneeded unescaping from JspUtil.getExprInXml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784386 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/manager/util/SessionUtils.java
Author: kkolinko
Date: Sat Jun 13 12:57:48 2009
New Revision: 784386
URL: http://svn.apache.org/viewvc?rev=784386&view=rev
Log:
Add explicit cast, to remove two
"non-varargs call of varargs method with inexact argument type for last
parameter"
warnings during the build.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=784386&r1=784385&r2=784386&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 12:57:48 2009
@@ -183,13 +183,6 @@
+1: markt, fhanik
-1:
-* Add explicit cast, to remove two
- "non-varargs call of varargs method with inexact argument type for last
parameter"
- warnings during the build.
-
http://people.apache.org/~kkolinko/patches/2009-06-11_manager_SessionUtils_varargs.patch
- +1: kkolinko, fhanik, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47343
Regression in fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/util/SessionUtils.java?rev=784386&r1=784385&r2=784386&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
Sat Jun 13 12:57:48 2009
@@ -118,10 +118,10 @@
Object probableEngine = tapestryArray.get(0);
if (null != probableEngine) {
try {
- Method readMethod =
probableEngine.getClass().getMethod("getLocale", null);//$NON-NLS-1$
+ Method readMethod =
probableEngine.getClass().getMethod("getLocale", (Class[])null);//$NON-NLS-1$
if (null != readMethod) {
// Call the property getter and return the
value
- Object possibleLocale =
readMethod.invoke(probableEngine, null);
+ Object possibleLocale =
readMethod.invoke(probableEngine, (Object[])null);
if (null != possibleLocale &&
possibleLocale instanceof Locale) {
locale = (Locale) possibleLocale;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784387 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/JspUtil.java
Author: kkolinko Date: Sat Jun 13 13:10:33 2009 New Revision: 784387 URL: http://svn.apache.org/viewvc?rev=784387&view=rev Log: Remove unneeded unescaping from JspUtil.getExprInXml (It is a part of the rev.696061 of trunk that was forgotten when applying it to tc6.0 in rev.708165) Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=784387&r1=784386&r2=784387&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 13:10:33 2009 @@ -138,16 +138,6 @@ ) -1: -* Remove unneeded unescaping from JspUtil.getExprInXml - http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?r1=696061&r2=696060&pathrev=696061 - (It is a part of the following revision of trunk - http://svn.apache.org/viewvc?view=rev&revision=696061 - that was forgotten when applying it to tc6.0 in - http://svn.apache.org/viewvc?view=rev&revision=708165 - ) - +1: kkolinko, markt, fhanik - -1: - * Add Executor JMX stats http://svn.apache.org/viewvc?rev=783474&view=rev +1: fhanik, markt Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=784387&r1=784386&r2=784387&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java Sat Jun 13 13:10:33 2009 @@ -193,7 +193,7 @@ returnString = expression; } -return escapeXml(returnString.replace(Constants.ESC, '$')); +return escapeXml(returnString); } /** - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784392 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jun 13 13:53:34 2009 New Revision: 784392 URL: http://svn.apache.org/viewvc?rev=784392&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=784392&r1=784391&r2=784392&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 13:53:34 2009 @@ -141,6 +141,10 @@ * Add Executor JMX stats http://svn.apache.org/viewvc?rev=783474&view=rev +1: fhanik, markt + +1: kkolinko ( + in activeCount description: s/current/currently/ + in completedTaskCount desc.: s/Nr/Number/ or /Count/. Was there a reason for shortening? + ) -1: * Dont try to report thread counts when using an executor from outside @@ -170,7 +174,7 @@ * Log context deployment consistently for war/dir/xml http://svn.apache.org/viewvc?rev=783756&view=rev - +1: markt, fhanik + +1: markt, fhanik, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47343 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784401 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jun 13 14:41:28 2009 New Revision: 784401 URL: http://svn.apache.org/viewvc?rev=784401&view=rev Log: 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=784401&r1=784400&r2=784401&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 14:41:28 2009 @@ -183,6 +183,10 @@ Editing context.xml should not delete resources +1: markt, fhanik -1: + 0: kkolinko: (No patch mentioned. Probably it is + http://svn.apache.org/viewvc?view=rev&revision=783766 + I am reviewing it now. + ) * Document emptySessionPath behavior Behavior is too old to change the way bug specifier requested, and obsolete in TC 7 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
HostConfig.checkResources()
In o.a.c.startup.HostConfig.checkResources() method of tc6.0.x and of trunk, there are two code paths that perform undeploy of an application -- look for the comment "// Undeploy application". The first one is called when a redeployResources resource is updated. The second one - when it is deleted (unless its lastModified time was 0L). There is a difference: the second one has "// Delete reload resources as well (to remove any remaining .xml descriptor)" loop over app.reloadResources deleting them as well. May someone explain the difference? It would be nice to refactor those blocks of code in some common method. I am reviewing the proposed patch for https://issues.apache.org/bugzilla/show_bug.cgi?id=47343 The issue was caused by the wrong ordering of resources that were added to HostConfig$DeployedApplication#redeployResources Thus I am trying to understand the code. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784436 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Sat Jun 13 17:07:30 2009
New Revision: 784436
URL: http://svn.apache.org/viewvc?rev=784436&view=rev
Log:
Withdraw pool 1.5 update - there is a nasty regression. 1.5.1 should follow
shortly...
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=784436&r1=784435&r2=784436&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 17:07:30 2009
@@ -152,15 +152,6 @@
+1: fhanik, markt
-1:
-* Update commons-pool to 1.5.
- http://svn.apache.org/viewvc?rev=783697&view=rev
- +1: markt, fhanik, kkolinko
- -1:
- kkolinko: 'and download' won't download the file and will stop with a build
- error, unless you manually delete the ${tomcat-dbcp.jar} file, or run
- clean-depend target, or otherwise start with a clean environment. The
- rev.783762 proposed below fixes this issue.
-
* Fix download task dependency for commons-pool and commons-dbcp.
http://svn.apache.org/viewvc?rev=783762&view=rev
+1: kkolinko, markt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784443 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/
Author: markt Date: Sat Jun 13 18:11:04 2009 New Revision: 784443 URL: http://svn.apache.org/viewvc?rev=784443&view=rev Log: Front page trademark wording tweak and footer addition recommended by the prc. Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-41.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=784443&r1=784442&r2=784443&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Sat Jun 13 18:11:04 2009 @@ -530,6 +530,10 @@ Copyright © 1999-2009, The Apache Software Foundation + +"Apache", the Apache feather, and the Apache Tomcat logo are +trademarks of the Apache Software Foundation for our open source +software. Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=784443&r1=784442&r2=784443&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Sat Jun 13 18:11:04 2009 @@ -293,6 +293,10 @@ Copyright © 1999-2009, The Apache Software Foundation + +"Apache", the Apache feather, and the Apache Tomcat logo are +trademarks of the Apache Software Foundation for our open source +software. Modified: tomcat/site/trunk/docs/download-41.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-41.html?rev=784443&r1=784442&r2=784443&view=diff == --- tomcat/site/trunk/docs/download-41.html (original) +++ tomcat/site/trunk/docs/download-41.html Sat Jun 13 18:11:04 2009 @@ -483,6 +483,10 @@ Copyright © 1999-2009, The Apache Software Foundation + +"Apache", the Apache feather, and the Apache Tomcat logo are +trademarks of the Apache Software Foundation for our open source +software. Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=784443&r1=784442&r2=784443&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Sat Jun 13 18:11:04 2009 @@ -508,6 +508,10 @@ Copyright © 1999-2009, The Apache Software Foundation + +"Apache", the Apache feather, and the Apache Tomcat logo are +trademarks of the Apache Software Foundation for our open source +software. Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=784443&r1=784442&r2=784443&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Sat Jun 13 18:11:04 2009 @@ -3,17 +3,17 @@ Apache Tomcat - Apache Tomcat 6 Downloads - - + + - - + + http://tomcat.apache.org/";> - + @@ -24,28 +24,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; /> +http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> -http://www.google.com/search";> - - - +http://www.google.com/search"; method="get"> + + + - + - + - + Apache Tomcat @@ -174,11 +174,11 @@ - - + + - + Tomcat 6 Downloads @@ -199,14 +199,14 @@ - + - + - + Quick Navigation @@ -227,14 +227,14 @@ - + - + -
svn commit: r784453 - in /tomcat/trunk: java/org/apache/catalina/session/PersistentManagerBase.java webapps/docs/config/manager.xml
Author: markt
Date: Sat Jun 13 19:05:56 2009
New Revision: 784453
URL: http://svn.apache.org/viewvc?rev=784453&view=rev
Log:
Enhancements to fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=43343 based on kkolinko's
review
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/webapps/docs/config/manager.xml
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=784453&r1=784452&r2=784453&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Sat Jun 13 19:05:56 2009
@@ -1054,12 +1054,11 @@
int timeIdle = // Truncate, do not round up
(int) ((timeNow - session.getThisAccessedTime()) /
1000L);
if (timeIdle > maxIdleSwap && timeIdle > minIdleSwap) {
-if (sessions[i] instanceof StandardSession) {
-if (((StandardSession)
sessions[i]).accessCount.get() > 0) {
-// Session is currently being accessed - skip
it
-continue;
-}
-}
+if (session.accessCount != null &&
+session.accessCount.get() > 0) {
+// Session is currently being accessed - skip it
+continue;
+}
if (log.isDebugEnabled())
log.debug(sm.getString
("persistentManager.swapMaxIdle",
@@ -1100,22 +1099,22 @@
long timeNow = System.currentTimeMillis();
for (int i = 0; i < sessions.length && toswap > 0; i++) {
-synchronized (sessions[i]) {
+StandardSession session = (StandardSession) sessions[i];
+synchronized (session) {
int timeIdle = // Truncate, do not round up
-(int) ((timeNow - sessions[i].getThisAccessedTime()) /
1000L);
+(int) ((timeNow - session.getThisAccessedTime()) / 1000L);
if (timeIdle > minIdleSwap) {
-if (sessions[i] instanceof StandardSession) {
-if (((StandardSession) sessions[i]).accessCount.get()
> 0) {
-// Session is currently being accessed - skip it
-continue;
-}
+if (session.accessCount != null &&
+session.accessCount.get() > 0) {
+// Session is currently being accessed - skip it
+continue;
}
if(log.isDebugEnabled())
log.debug(sm.getString
("persistentManager.swapTooManyActive",
- sessions[i].getIdInternal(), new
Integer(timeIdle)));
+ session.getIdInternal(), new Integer(timeIdle)));
try {
-swapOut(sessions[i]);
+swapOut(session);
} catch (IOException e) {
// This is logged in writeSession()
}
Modified: tomcat/trunk/webapps/docs/config/manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=784453&r1=784452&r2=784453&view=diff
==
--- tomcat/trunk/webapps/docs/config/manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/manager.xml Sat Jun 13 19:05:56 2009
@@ -165,6 +165,12 @@
has not been thoroughly tested, and should be considered experimental!
+NOTE: You must set either the
+org.apache.catalina.session.StandardSession.ACTIVITY_CHECK or
+org.apache.catalina.STRICT_SERVLET_COMPLIANCE
+system properties to true for
+the persistent manager to work correctly.
+
The persistent implementation of Manager is
org.apache.catalina.session.PersistentManager. In
addition to the usual operations of creating and deleting sessions, a
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784454 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Jun 13 19:14:37 2009 New Revision: 784454 URL: http://svn.apache.org/viewvc?rev=784454&view=rev Log: Act on review comments 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=784454&r1=784453&r2=784454&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 19:14:37 2009 @@ -137,6 +137,12 @@ ) -1: +* Additional patch based on review comments above: + http://svn.apache.org/viewvc?rev=784453&view=rev + +1: mark + -1: + + * Add Executor JMX stats http://svn.apache.org/viewvc?rev=783474&view=rev @@ -171,13 +177,10 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47343 Regression in fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=42747 + http://svn.apache.org/viewvc?view=rev&revision=783766 Editing context.xml should not delete resources +1: markt, fhanik -1: - 0: kkolinko: (No patch mentioned. Probably it is - http://svn.apache.org/viewvc?view=rev&revision=783766 - I am reviewing it now. - ) * Document emptySessionPath behavior Behavior is too old to change the way bug specifier requested, and obsolete in TC 7 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784455 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/naming/resources/ java/org/apache/tomcat/util/buf/ webapps/docs/config/
Author: markt
Date: Sat Jun 13 19:19:18 2009
New Revision: 784455
URL: http://svn.apache.org/viewvc?rev=784455&view=rev
Log:
Remove case insensitivity option. It was a workaround for a change in Tomcat 3
and has security implications if used on case insensitive file systems.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/webapps/docs/config/context.xml
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=784455&r1=784454&r2=784455&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sat Jun 13
19:19:18 2009
@@ -640,12 +640,6 @@
/**
- * Case sensitivity.
- */
-protected boolean caseSensitive = true;
-
-
-/**
* Allow linking.
*/
protected boolean allowLinking = false;
@@ -774,22 +768,6 @@
/**
- * Set case sensitivity.
- */
-public void setCaseSensitive(boolean caseSensitive) {
-this.caseSensitive = caseSensitive;
-}
-
-
-/**
- * Is case sensitive ?
- */
-public boolean isCaseSensitive() {
-return caseSensitive;
-}
-
-
-/**
* Set allow linking.
*/
public void setAllowLinking(boolean allowLinking) {
@@ -1937,7 +1915,6 @@
}
if (resources instanceof FileDirContext) {
filesystemBased = true;
-((FileDirContext) resources).setCaseSensitive(isCaseSensitive());
((FileDirContext) resources).setAllowLinking(isAllowLinking());
}
this.webappResources = resources;
@@ -4108,8 +4085,6 @@
new ProxyDirContext(env, webappResources);
if (webappResources instanceof FileDirContext) {
filesystemBased = true;
-((FileDirContext) webappResources).setCaseSensitive
-(isCaseSensitive());
((FileDirContext) webappResources).setAllowLinking
(isAllowLinking());
}
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=784455&r1=784454&r2=784455&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Sat Jun
13 19:19:18 2009
@@ -74,11 +74,6 @@
is="true"
type="boolean"/>
-
-
Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=784455&r1=784454&r2=784455&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Sat Jun
13 19:19:18 2009
@@ -101,12 +101,6 @@
/**
- * Case sensitivity.
- */
-protected boolean caseSensitive = true;
-
-
-/**
* Allow linking.
*/
protected boolean allowLinking = false;
@@ -151,22 +145,6 @@
/**
- * Set case sensitivity.
- */
-public void setCaseSensitive(boolean caseSensitive) {
-this.caseSensitive = caseSensitive;
-}
-
-
-/**
- * Is case sensitive ?
- */
-public boolean isCaseSensitive() {
-return caseSensitive;
-}
-
-
-/**
* Set allow linking.
*/
public void setAllowLinking(boolean allowLinking) {
@@ -227,7 +205,6 @@
FileDirContext tempContext = new FileDirContext(env);
tempContext.setDocBase(file.getPath());
tempContext.setAllowLinking(getAllowLinking());
-tempContext.setCaseSensitive(isCaseSensitive());
result = tempContext;
} else {
result = new FileResource(file);
@@ -824,26 +801,24 @@
return null;
}
-// Case sensitivity check
-if (caseSensitive) {
-String fileAbsPath = file.getAbsolutePath();
-if (fileAbsPath.endsWith("."))
-fileAbsPath = fileAbsPath + "/";
-String absPath = normalize(fileAbsPath);
-canPath = normalize(canPath);
-if ((absoluteBase.length() < absPath.length())
-&& (absol
svn commit: r784456 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml config/context.xml
Author: markt Date: Sat Jun 13 19:23:40 2009 New Revision: 784456 URL: http://svn.apache.org/viewvc?rev=784456&view=rev Log: Add caseSensitive deprecation warning. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml 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=784456&r1=784455&r2=784456&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jun 13 19:23:40 2009 @@ -91,6 +91,11 @@ 44943: Use the same engine name in server.xml comments to reduce copy and pastes issues. (markt, kkolinko) + +Deprecate the caseSensitive option on the +StandardContext which will be removed in Tomcat 7 onwards. +(markt) + Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=784456&r1=784455&r2=784456&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Sat Jun 13 19:23:40 2009 @@ -319,6 +319,8 @@ +Deprecated. This option will be removed in Tomcat 7 onwards where the +default of true will always be used. If the value of this flag is false, all case sensitivity checks will be disabled. If not specified, the default value of the flag is true. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: HostConfig.checkResources()
Konstantin Kolinko wrote: > In o.a.c.startup.HostConfig.checkResources() method of tc6.0.x and of trunk, > there are two code paths that perform undeploy of an application -- > look for the comment > "// Undeploy application". > > The first one is called when a redeployResources resource is updated. > The second one > - when it is deleted (unless its lastModified time was 0L). > > There is a difference: the second one has > "// Delete reload resources as well (to remove any remaining .xml descriptor)" > loop over app.reloadResources deleting them as well. > > May someone explain the difference? The first is removing the expanded directory if the WAR has been updated. (ie an update) The second is removing all apps resources if one of them has been deleted. (ie a 'real' undeploy) > It would be nice to refactor those blocks of code in some common method. Anything that makes the code easier to follow would be good. I completely missed some aspects of this the first time I patched this issue and I still missed things after Remy explained my first set of oversights. Obviously, any changes made here need to be done carefully. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784459 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: markt
Date: Sat Jun 13 19:40:11 2009
New Revision: 784459
URL: http://svn.apache.org/viewvc?rev=784459&view=rev
Log:
Log context deployment consistently for war/dir/xml
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 13 19:40:11 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,753039,757335,757774,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,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,781528,781779,782145,782791,783316,783696
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,753039,757335,757774,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,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,781528,781779,782145,782791,783316,783696,783756
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=784459&r1=784458&r2=784459&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 19:40:11 2009
@@ -169,11 +169,6 @@
+1: fhanik - StringBuffer never hurts
-1:
-* Log context deployment consistently for war/dir/xml
- http://svn.apache.org/viewvc?rev=783756&view=rev
- +1: markt, fhanik, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47343
Regression in fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=784459&r1=784458&r2=784459&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Sat
Jun 13 19:40:11 2009
@@ -575,8 +575,8 @@
DeployedApplication deployedApp = new DeployedApplication(contextPath);
// Assume this is a configuration descriptor and deploy it
-if(log.isDebugEnabled()) {
-log.debug(sm.getString("hostConfig.deployDescriptor", file));
+if(log.isInfoEnabled()) {
+log.info(sm.getString("hostConfig.deployDescriptor", file));
}
Context context = null;
@@ -927,8 +927,8 @@
return;
// Deploy the application in this directory
-if( log.isDebugEnabled() )
-log.debug(sm.getString("hostConfig.deployDir", file));
+if( log.isInfoEnabled() )
+log.info(sm.getString("hostConfig.deployDir", file));
try {
Context context = null;
File xml = new File(dir, Constants.ApplicationContextXml);
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=784459&r1=784458&r2=784459&view=diff
=
svn commit: r784463 - in /tomcat: connectors/trunk/util/java/org/apache/tomcat/util/http/ container/tc5.5.x/catalina/src/share/org/apache/catalina/ container/tc5.5.x/catalina/src/share/org/apache/cata
Author: markt
Date: Sat Jun 13 20:26:43 2009
New Revision: 784463
URL: http://svn.apache.org/viewvc?rev=784463&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44382
Port httpOnly support from 6.0.x
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Context.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/config/context.xml
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java?rev=784463&r1=784462&r2=784463&view=diff
==
---
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
(original)
+++
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
Sat Jun 13 20:26:43 2009
@@ -284,7 +284,8 @@
String domain,
String comment,
int maxAge,
- boolean isSecure )
+ boolean isSecure,
+ boolean isHttpOnly)
{
StringBuffer buf = new StringBuffer();
// Servlet implementation checks name
@@ -350,6 +351,10 @@
buf.append ("; Secure");
}
+// HttpOnly
+if (isHttpOnly) {
+buf.append("; HttpOnly");
+}
headerBuf.append(buf);
}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Context.java?rev=784463&r1=784462&r2=784463&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Context.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Context.java
Sat Jun 13 20:26:43 2009
@@ -181,8 +181,24 @@
*/
public void setCookies(boolean cookies);
+/**
+ * Gets the value of the use HttpOnly cookies for session cookies flag.
+ *
+ * @return true if the HttpOnly flag should be set on session
+ * cookies
+ */
+public boolean getUseHttpOnly();
+
/**
+ * Sets the use HttpOnly cookies for session cookies flag.
+ *
+ * @param useHttpOnly Set to true to use HttpOnly cookies
+ * for session cookies
+ */
+public void setUseHttpOnly(boolean useHttpOnly);
+
+/**
* Return the "allow crossing servlet contexts" flag.
*/
public boolean getCrossContext();
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java?rev=784463&r1=784462&r2=784463&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
Sat Jun 13 20:26:43 2009
@@ -2237,7 +2237,7 @@
Cookie cookie = new Cookie(Globals.SESSION_COOKIE_NAME,
session.getIdInternal());
configureSessionCookie(cookie);
-response.addCookie(cookie);
+response.addCookieInternal(cookie, context.getUseHttpOnly());
}
if (session != null) {
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java?rev=784463&r1=784462&r2=784463&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
Sat Jun 13 20:26:43 2009
@@ -932,6 +932,17 @@
* @param cookie Cookie to be added
*/
public void addCookie(final Cookie cookie) {
+addCookieInternal(cookie, false);
+}
+
+/**
+ * Add the specified Cookie to those that will be included with
+
DO NOT REPLY [Bug 44382] Need to add support for HTTPOnly session cookie parameter
https://issues.apache.org/bugzilla/show_bug.cgi?id=44382 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #22 from Mark Thomas 2009-06-13 13:27:39 PST --- This has been applied to 5.5.x and will be included in 5.5.28 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: r784465 - in /tomcat: connectors/trunk/http11/src/java/org/apache/coyote/http11/ container/tc5.5.x/webapps/docs/
Author: markt
Date: Sat Jun 13 20:31:13 2009
New Revision: 784465
URL: http://svn.apache.org/viewvc?rev=784465&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46552
Return a 400 rather than a 200 if headers are too large
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java?rev=784465&r1=784464&r2=784465&view=diff
==
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Sat Jun 13 20:31:13 2009
@@ -842,10 +842,6 @@
log.debug(sm.getString("http11processor.header.parse"), t);
}
// 400 - Bad Request
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("http11processor.request.prepare")+
- " host header missing");
-}
response.setStatus(400);
error = true;
}
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=784465&r1=784464&r2=784465&view=diff
==
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Sat Jun 13 20:31:13 2009
@@ -825,7 +825,7 @@
if (parsingHeader) {
if (lastValid == buf.length) {
-throw new IOException
+throw new IllegalArgumentException
(sm.getString("iib.requestheadertoolarge.error"));
}
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=784465&r1=784464&r2=784465&view=diff
==
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
Sat Jun 13 20:31:13 2009
@@ -765,7 +765,7 @@
if (parsingHeader) {
if (lastValid == buf.length) {
-throw new IOException
+throw new IllegalArgumentException
(sm.getString("iib.requestheadertoolarge.error"));
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=784465&r1=784464&r2=784465&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Jun 13 20:31:13 2009
@@ -115,6 +115,10 @@
46408: Correct possible invalid case in SecurityUtil.
(markt)
+46552: Return a 400 response rather than a 200 response if
+the request headers are too large. (markt)
+
+
46597: Port all cookie handling changes from Tomcat 6.0.x.
(markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46552] Could there be a logging for requests exceeding maxHttpHeaderSize
https://issues.apache.org/bugzilla/show_bug.cgi?id=46552 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2009-06-13 13:31:44 PST --- This has been fixed in 5.5.x and will be included in 5.5.28 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: r784467 - in /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector: Connector.java MapperListener.java
Author: markt
Date: Sat Jun 13 20:38:46 2009
New Revision: 784467
URL: http://svn.apache.org/viewvc?rev=784467&view=rev
Log:
Fix regression in fix for bug 42707
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java?rev=784467&r1=784466&r2=784467&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Connector.java
Sat Jun 13 20:38:46 2009
@@ -256,7 +256,7 @@
/**
* Mapper listener.
*/
- protected MapperListener mapperListener = new MapperListener(mapper);
+ protected MapperListener mapperListener = new MapperListener(mapper,
this);
/**
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java?rev=784467&r1=784466&r2=784467&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/MapperListener.java
Sat Jun 13 20:38:46 2009
@@ -29,7 +29,6 @@
import org.apache.catalina.ContainerEvent;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Host;
-import org.apache.catalina.ServerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -59,6 +58,11 @@
* Associated mapper.
*/
protected Mapper mapper = null;
+
+/**
+ * Associated connector.
+ */
+protected Connector connector = null;
/**
* MBean server.
@@ -82,8 +86,9 @@
/**
* Create mapper listener.
*/
-public MapperListener(Mapper mapper) {
+public MapperListener(Mapper mapper, Connector connector) {
this.mapper = mapper;
+this.connector = connector;
}
@@ -326,9 +331,9 @@
String name=objectName.getKeyProperty("host");
if( name != null ) {
-Host host = (Host) ServerFactory.getServer().findService(
-domain).getContainer().findChild(name);
-
+Host host =
+(Host) connector.getService().getContainer().findChild(name);
+
String[] aliases = host.findAliases();
mapper.addHost(name, aliases, objectName);
host.addContainerListener(this);
@@ -346,8 +351,8 @@
throws Exception {
String name=objectName.getKeyProperty("host");
if( name != null ) {
-Host host = (Host) ServerFactory.getServer().findService(
-domain).getContainer().findChild(name);
+Host host =
+(Host) connector.getService().getContainer().findChild(name);
mapper.removeHost(name);
host.removeContainerListener(this);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47316] In config file, Service and engine names must match
https://issues.apache.org/bugzilla/show_bug.cgi?id=47316 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2009-06-13 13:38:58 PST --- Fix in 5.5.x and will be in 5.5.28 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: r784468 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/core/StandardHost.java webapps/docs/changelog.xml webapps/docs/config/host.xml
Author: markt Date: Sat Jun 13 20:43:04 2009 New Revision: 784468 URL: http://svn.apache.org/viewvc?rev=784468&view=rev Log: Better default for appbase. Patch by Ian Darwin Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/config/host.xml Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java?rev=784468&r1=784467&r2=784468&view=diff == --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java Sat Jun 13 20:43:04 2009 @@ -77,7 +77,7 @@ /** * The application root for this Host. */ -private String appBase = "."; +private String appBase = "webapps"; /** Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=784468&r1=784467&r2=784468&view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Jun 13 20:43:04 2009 @@ -147,6 +147,9 @@ Fix various WebDAV compliance issues identified by the Litmus test suite. (markt) + +Use a better default (webapps) for a Host's appBase. (idarwin/markt) + Modified: tomcat/container/tc5.5.x/webapps/docs/config/host.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/host.xml?rev=784468&r1=784467&r2=784468&view=diff == --- tomcat/container/tc5.5.x/webapps/docs/config/host.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/host.xml Sat Jun 13 20:43:04 2009 @@ -85,7 +85,8 @@ to the $CATALINA_BASE directory. See Automatic Application Deployment for more information on automatic recognition and -deployment of web applications to be deployed automatically. +deployment of web applications to be deployed automatically.If not +specified, the default of webapps will be used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784469 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Sat Jun 13 20:43:43 2009 New Revision: 784469 URL: http://svn.apache.org/viewvc?rev=784469&view=rev Log: Remove applied fixes. Votes. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=784469&r1=784468&r2=784469&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jun 13 20:43:43 2009 @@ -66,12 +66,6 @@ -1: markt (see https://issues.apache.org/bugzilla/show_bug.cgi?id=47308) kkolinko: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4686717 -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44382 - Port httpOnly support from 6.0.x - https://issues.apache.org/bugzilla/attachment.cgi?id=23497 - +1: markt, rjung, fhanik - -1: - * Fix locking in cluster/tcp/FastAsyncSocketSender: Locking in DataSender and the sub class FastAsyncSocketSender uses the same lock, although the reasons for locking are totally @@ -83,12 +77,6 @@ +1: rjung, pero, kkolinko -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46552 - Return a 400 rather than a 200 if headers are too large - http://people.apache.org/~markt/patches/2009-04-09-bug46552.patch - +1: markt, kkolinko, fhanik - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46384 Use sync when adding and removing members Note: Untested @@ -133,7 +121,7 @@ Discussion: http://markmail.org/message/nhkrskh6bwyirwru It is amendment to the rev=777624 patch proposed above. http://svn.apache.org/viewvc?rev=783934&view=rev - +1: kkolinko + +1: kkolinko, markt -1: @@ -143,23 +131,9 @@ This is partial backport of http://svn.apache.org/viewvc?view=rev&revision=673614 Also, update to NSIS 2.44 http://people.apache.org/~kkolinko/patches/2009-06-03_nsis-download-tc55.patch - +1: kkolinko, fhanik + +1: kkolinko, fhanik, markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47316 - Remove use of ServerFactory to enable MapperListener to start when service - name != engine name - This is a regression caused by the fix for bug 42707 - https://issues.apache.org/bugzilla/attachment.cgi?id=23764 - +1: markt, kkolinko, fhanik - -1: - -* Use a more senaible default for appBase - http://svn.apache.org/viewvc?rev=782791&view=rev - Patch by Ian Darwin - +1: markt, kkolinko, fhanik - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37084 https://issues.apache.org/bugzilla/attachment.cgi?id=23807 Port of fix for 46471 that also fixes this JspC compilation issue - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784470 - in /tomcat/container/branches/tc4.1.x: RELEASE-NOTES-4.1.txt catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Author: markt
Date: Sat Jun 13 20:54:56 2009
New Revision: 784470
URL: http://svn.apache.org/viewvc?rev=784470&view=rev
Log:
Provide a partial work-around for browsers that ignore charset requirements of
RFC2616
Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=784470&r1=784469&r2=784470&view=diff
==
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Sat Jun 13 20:54:56
2009
@@ -1766,6 +1766,10 @@
Don't use web application provided XML parser to process tld files
This is part of CVE-2009-0783
+[4.1.40] Error Reporting Valve
+ Use UTF-8 encoding for default error pages to provide a workaround for
+ browsers that ignore that charset requirements of RFC2616
+
Coyote Bug Fixes:
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java?rev=784470&r1=784469&r2=784470&view=diff
==
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Sat Jun 13 20:54:56 2009
@@ -23,7 +23,6 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -291,12 +290,8 @@
Writer writer = response.getReporter();
if (writer != null) {
-
-Locale locale = Locale.getDefault();
-
try {
-hres.setContentType("text/html");
-hres.setLocale(locale);
+hres.setContentType("text/html; charset=utf-8");
} catch (Throwable t) {
if (debug >= 1)
log("status.setContentType", t);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r784471 - /tomcat/current/tc4.1.x/STATUS.txt
Author: markt Date: Sat Jun 13 20:55:26 2009 New Revision: 784471 URL: http://svn.apache.org/viewvc?rev=784471&view=rev Log: Remove applied patch Modified: tomcat/current/tc4.1.x/STATUS.txt Modified: tomcat/current/tc4.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=784471&r1=784470&r2=784471&view=diff == --- tomcat/current/tc4.1.x/STATUS.txt (original) +++ tomcat/current/tc4.1.x/STATUS.txt Sat Jun 13 20:55:26 2009 @@ -25,8 +25,3 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Provide a partial work-around for browsers that ignore charset requirements of - RFC2616 - http://people.apache.org/~markt/patches/2009-03-03-broken-browser.patch - +1: markt, fhanik, kkolinko - -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
