DO NOT REPLY [Bug 47109] Upgrade to mod_jk 1.2.28 with Apache 2.0.46 works until load balanced
https://issues.apache.org/bugzilla/show_bug.cgi?id=47109 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Rainer Jung 2009-04-28 02:08:57 PST --- Bugzilla is not a support forum. The feature works in mod_jk 1.2.28. Your observation is most likely a configuration problem. Please post your information including configuration to the tomcat users list. -- 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
DO NOT REPLY [Bug 46822] Avoid redundant instantiations in StandardContext
https://issues.apache.org/bugzilla/show_bug.cgi?id=46822 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2009-04-28 04:00:43 PST --- This has been fixed in 6.0.x and will be included in 6.0.20 onwards. Thanks again for the patch. -- 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: r769331 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 11:03:22 2009
New Revision: 769331
URL: http://svn.apache.org/viewvc?rev=769331&view=rev
Log:
Fix 46822. Remove unnecessary object creation from StandardContext.
Patch provided by Anthony Whitford.
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 Tue Apr 28 11:03:22 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769331&r1=769330&r2=769331&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:03:22 2009
@@ -104,20 +104,6 @@
+1: markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46822
- http://svn.apache.org/viewvc?rev=758616&view=rev
- Remove unnecessary object creation in StandardContext
- +1: markt, rjung, remm
- -1:
- rjung: firePropertyChange() creates a PropertyChangeEvent, which only has
- object type arguments in the constructor. Brief inspection of the Sun
JDK
- shows, that the firePropertyChange() method with primitive type
arguments
- first converts them to objects and then creates the
PropertyChangeEvent().
- So in general there will be no object creation safed, although in some
- cases we use e.g. "new Boolean" instead of Boolean.valueOf(), so
there might be
- some savings.
- remm: yes, it's not going to do anything useful ;)
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
When resolving ResourceBundle properties, don't claim to have resolved the
property unless we really have resolved it.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=769331&r1=769330&r2=769331&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Apr 28 11:03:22 2009
@@ -827,8 +827,8 @@
boolean oldDelegate = this.delegate;
this.delegate = delegate;
-support.firePropertyChange("delegate", new Boolean(oldDelegate),
- new Boolean(this.delegate));
+support.firePropertyChange("delegate", oldDelegate,
+ this.delegate);
}
@@ -942,8 +942,8 @@
boolean oldAntiJARLocking = this.antiJARLocking;
this.antiJARLocking = antiJARLocking;
support.firePropertyChange("antiJARLocking",
- new Boolean(oldAntiJARLocking),
- new Boolean(this.antiJARLocking));
+ oldAntiJARLocking,
+ this.antiJARLocking);
}
@@ -958,8 +958,8 @@
boolean oldAntiResourceLocking = this.antiResourceLocking;
this.antiResourceLocking = antiResourceLocking;
support.firePropertyChange("antiResourceLocking",
- new Boolean(oldAntiResour
svn commit: r769336 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/javax/el/ResourceBundleELResolver.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 11:16:00 2009
New Revision: 769336
URL: http://svn.apache.org/viewvc?rev=769336&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
When resolving ResourceBundle properties, don't claim to have resolved the
property unless we really have resolved it.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 11:16:00 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769336&r1=769335&r2=769336&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:16:00 2009
@@ -104,15 +104,6 @@
+1: markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
- When resolving ResourceBundle properties, don't claim to have resolved the
- property unless we really have resolved it.
- http://svn.apache.org/viewvc?rev=758664&view=rev
- +1: markt, rjung, remm
- -1:
- rjung: r758664 (above URL) contains strange whitespace.
- Seems tabs are mixed with spaces.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41606
Prevent double init() of JSP
Patch provided by Chris Halstead
Modified: tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java?rev=769336&r1=769335&r2=769336&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Tue Apr 28
11:16:00 2009
@@ -38,12 +38,12 @@
}
if (base instanceof ResourceBundle) {
- context.setPropertyResolved(true);
-
if (property != null) {
try {
- return ((ResourceBundle)
base).getObject(property
+ Object result = ((ResourceBundle)
base).getObject(property
.toString());
+ context.setPropertyResolved(true);
+ return result;
} catch (MissingResourceException mre) {
return "???" + property.toString() +
"???";
}
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=769336&r1=769335&r2=769336&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 11:16:00 2009
@@ -100,6 +100,10 @@
46910: Properties files corrupted by build process. (remm)
+
+46915: When resolving ResourceBundle properties, don't claim
+to have resolved the property unless we really have resolved it.
(markt)
+
DO NOT REPLY [Bug 46915] Unable to get ResourceBundle keys in Tomcat 6
https://issues.apache.org/bugzilla/show_bug.cgi?id=46915 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2009-04-28 04:16:24 PST --- This has been fixed in 6.0.x and will be in 6.0.20 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: r769337 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Compiler.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 11:21:44 2009
New Revision: 769337
URL: http://svn.apache.org/viewvc?rev=769337&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41606
Prevent double init() of JSP
Patch provided by Chris Halstead
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 11:21:44 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769337&r1=769336&r2=769337&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:21:44 2009
@@ -104,13 +104,6 @@
+1: markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41606
- Prevent double init() of JSP
- Patch provided by Chris Halstead
- http://svn.apache.org/viewvc?view=rev&revision=759074
- +1: markt, rjung, remm
- -1:
-
* Fix some failures when testing WebDAV with litmus test suite
http://svn.apache.org/viewvc?view=rev&revision=761601
+1: markt, remm, rjung
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=769337&r1=769336&r2=769337&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Tue Apr
28 11:21:44 2009
@@ -332,6 +332,15 @@
String[] smap = generateJava();
if (compileClass) {
generateClass(smap);
+// Fix for bugzilla 41606
+// Set JspServletWrapper.servletClassLastModifiedTime after
successful compile
+String targetFileName = ctxt.getClassFileName();
+if (targetFileName != null) {
+File targetFile = new File(targetFileName);
+if (targetFile.exists() && jsw != null) {
+
jsw.setServletClassLastModifiedTime(targetFile.lastModified());
+}
+}
}
} finally {
if (tfp != null && ctxt.isPrototypeMode()) {
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=769337&r1=769336&r2=769337&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 11:21:44 2009
@@ -70,6 +70,14 @@
+
+
+
+41606: Prevent double initialisation of JSPs. Patch provided
+by Chris Halstead. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r769328 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/valves/CometConnectionManagerValve.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 10:39:24 2009
New Revision: 769328
URL: http://svn.apache.org/viewvc?rev=769328&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46875
Catch possible ISE as a result of session expiration in comet valve
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.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=769328&r1=769327&r2=769328&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 10:39:24 2009
@@ -104,12 +104,6 @@
+1: markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46875
- http://svn.apache.org/viewvc?rev=758407&view=rev
- Catch possible ISE as a result of session expiration in comet valve
- +1: markt, rjung, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46822
http://svn.apache.org/viewvc?rev=758616&view=rev
Remove unnecessary object creation in StandardContext
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=769328&r1=769327&r2=769328&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
Tue Apr 28 10:39:24 2009
@@ -312,8 +312,14 @@
HttpSession session = request.getSession(false);
if (session != null) {
synchronized (session) {
-Request[] reqs = (Request[])
-session.getAttribute(cometRequestsAttribute);
+Request[] reqs = null;
+try {
+ reqs = (Request[])
+session.getAttribute(cometRequestsAttribute);
+} catch (IllegalStateException ise) {
+// Ignore - session has been invalidated
+// Listener will have cleaned up
+}
if (reqs != null) {
boolean found = false;
for (int i = 0; !found && (i < reqs.length); i++) {
@@ -329,11 +335,22 @@
newConnectionInfos[pos++] =
reqs[i];
}
}
-
session.setAttribute(cometRequestsAttribute,
-newConnectionInfos);
+try {
+session.setAttribute(
+cometRequestsAttribute,
+newConnectionInfos);
+} catch (IllegalStateException ise) {
+// Ignore - session has been
invalidated
+// Listener will have cleaned up
+}
} else {
-session.removeAttribute(
-cometRequestsAttribute);
+try {
+session.removeAttribute(
+cometRequestsAttribute);
+} catch (IllegalStateException ise) {
+// Ignore - session has been
invalidated
+// Listener will have cleaned up
+}
}
}
}
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=769328&r1=769327&r2=769328&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 10:39:24 2009
@@ -45,6 +45,10 @@
46866: Better initialisation of Random objects. (markt)
+
+46875: Catch and handle possible IllegalStateExceptions
+in CometConnectionManagerValve related to session expiration. (markt)
+
--
DO NOT REPLY [Bug 41606] The jspInit method is called twice.
https://issues.apache.org/bugzilla/show_bug.cgi?id=41606 --- Comment #5 from Mark Thomas 2009-04-28 04:22:43 PST --- This has been fixed in 6.0.x and will be included in 6.0.20 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: r769338 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/servlets/WebdavServlet.java java/org/apache/naming/resources/FileDirContext.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 11:25:01 2009
New Revision: 769338
URL: http://svn.apache.org/viewvc?rev=769338&view=rev
Log:
Fix some failures when testing WebDAV with litmus test suite
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/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 11:25:01 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769338&r1=769337&r2=769338&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:25:01 2009
@@ -104,11 +104,6 @@
+1: markt, remm
-1:
-* Fix some failures when testing WebDAV with litmus test suite
- http://svn.apache.org/viewvc?view=rev&revision=761601
- +1: markt, remm, rjung
- -1:
-
* Update native to 1.1.16
http://svn.apache.org/viewvc?view=rev&revision=762868
+1: markt, remm, rjung
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=769338&r1=769337&r2=769338&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Tue Apr 28 11:25:01 2009
@@ -19,6 +19,7 @@
package org.apache.catalina.servlets;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
@@ -464,7 +465,7 @@
Node propNode = null;
-if (req.getInputStream().available() > 0) {
+if (req.getContentLength() > 0) {
DocumentBuilder documentBuilder = getDocumentBuilder();
try {
@@ -495,9 +496,11 @@
}
}
} catch (SAXException e) {
-// Something went wrong - use the defaults.
+// Something went wrong - bad request
+resp.sendError(WebdavStatus.SC_BAD_REQUEST);
} catch (IOException e) {
-// Something went wrong - use the defaults.
+// Something went wrong - bad request
+resp.sendError(WebdavStatus.SC_BAD_REQUEST);
}
}
@@ -1663,14 +1666,20 @@
path, destinationPath);
if ((!result) || (!errorList.isEmpty())) {
-
-sendReport(req, resp, errorList);
+if (errorList.size() == 1) {
+resp.sendError(errorList.elements().nextElement().intValue());
+} else {
+sendReport(req, resp, errorList);
+}
return false;
-
}
// Copy was successful
-resp.setStatus(WebdavStatus.SC_CREATED);
+if (exists) {
+resp.setStatus(WebdavStatus.SC_NO_CONTENT);
+} else {
+resp.setStatus(WebdavStatus.SC_CREATED);
+}
// Removing any lock-null
svn commit: r769341 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 11:36:40 2009
New Revision: 769341
URL: http://svn.apache.org/viewvc?rev=769341&view=rev
Log:
Update tc-native to 1.1.16
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 11:36:40 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769341&r1=769340&r2=769341&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:36:40 2009
@@ -104,11 +104,6 @@
+1: markt, remm
-1:
-* Update native to 1.1.16
- http://svn.apache.org/viewvc?view=rev&revision=762868
- +1: markt, remm, rjung
- -1:
-
* Fix .exe and .pdf corruption in -src.tar.gz bundle
http://svn.apache.org/viewvc?view=rev&revision=762936
+1: markt, remm, rjung
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=769341&r1=769340&r2=769341&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Apr 28 11:36:40 2009
@@ -62,7 +62,7 @@
jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# - Tomcat native library -
-tomcat-native.version=1.1.15
+tomcat-native.version=1.1.16
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz
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=769341&r1=769340&r2=769341&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 11:36:40 2009
@@ -72,6 +72,9 @@
Set remote port for AJP connectors from the optional request
attribute AJP_REMOTE_PORT. (rjung)
+
+Update tc-native to 1.1.16 (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r769343 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt dist.xml webapps/docs/changelog.xml
Author: markt Date: Tue Apr 28 11:41:32 2009 New Revision: 769343 URL: http://svn.apache.org/viewvc?rev=769343&view=rev Log: Fix corruption of .pdf and .exe in .tar.gz src distro Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/dist.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 11:41:32 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,768335 +/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762936,768335 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769343&r1=769342&r2=769343&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:41:32 2009 @@ -104,11 +104,6 @@ +1: markt, remm -1: -* Fix .exe and .pdf corruption in -src.tar.gz bundle - http://svn.apache.org/viewvc?view=rev&revision=762936 - +1: markt, remm, rjung - -1: - * Enable running of Tomcat directly from build directory on linux http://svn.apache.org/viewvc?view=rev&revision=762937 http://svn.apache.org/viewvc?view=rev&revision=762929 Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=769343&r1=769342&r2=769343&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Tue Apr 28 11:41:32 2009 @@ -564,7 +564,7 @@ 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=769343&r1=769342&r2=769343&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 11:41:32 2009 @@ -119,6 +119,9 @@ 46915: When resolving ResourceBundle properties, don't claim to have resolved the property unless we really have resolved it. (markt) + +Fix .pdf and .exe corruption in -src.tar.gz distribution. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r769347 - /tomcat/trunk/java/org/apache/catalina/valves/FastCommonAccessLogValve.java
Author: markt Date: Tue Apr 28 11:51:47 2009 New Revision: 769347 URL: http://svn.apache.org/viewvc?rev=769347&view=rev Log: Delete deprecated class. Removed: tomcat/trunk/java/org/apache/catalina/valves/FastCommonAccessLogValve.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46982] AccessLogValve reports correct time but incorrect offset following Spring DST transition.
https://issues.apache.org/bugzilla/show_bug.cgi?id=46982 Mark Thomas changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #3 from Mark Thomas 2009-04-28 04:55:15 PST --- Opps. Still open for 5.5.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
DO NOT REPLY [Bug 46933] Using Java 1.5 in StringManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=46933 --- Comment #5 from Mark Thomas 2009-04-28 05:00:41 PST --- Can you create a new bugzilla issue for your second patch please. We try and keep each bugzilla entry to s single problem. Cheers. -- 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
DO NOT REPLY [Bug 46982] AccessLogValve reports correct time but incorrect offset following Spring DST transition.
https://issues.apache.org/bugzilla/show_bug.cgi?id=46982 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2009-04-28 04:54:24 PST --- This has been fixed in 6.0.x and will be included in 6.0.20 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: r769349 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/changelog.xml
Author: markt Date: Tue Apr 28 11:54:10 2009 New Revision: 769349 URL: http://svn.apache.org/viewvc?rev=769349&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46982 Correct report DST offset in access logs Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 11:54:10 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,768335 +/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,768335 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769349&r1=769348&r2=769349&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:54:10 2009 @@ -104,12 +104,6 @@ +1: markt, remm -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46982 - Correct report DST offset in access logs - http://svn.apache.org/viewvc?rev=763166&view=rev - +1: markt, remm, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46933 Simplify StringManager using Java 5. Includes test case. Based on a patch by Jens Kapitza Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=769349&r1=769348&r2=769349&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java Tue Apr 28 11:54:10 2009 @@ -27,7 +27,6 @@ import java.net.InetAddress; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.TimeZone; @@ -857,8 +856,7 @@ // Initialize the timeZone, Date formatters, and currentDate timezone = TimeZone.getDefault(); timeZoneNoDST = calculateTimeZoneOffset(timezone.getRawOffset()); -Calendar calendar = Calendar.getInstance(timezone); -int offset = calendar.get(Calendar.DST_OFFSET); +int offset = timezone.getDSTSavings(); timeZoneDST = calculateTimeZoneOffset(timezone.getRawOffset() + offset); if (fileDateFormat == null || fileDateFormat.length() == 0) 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=769349&r1=769348&r2=769349&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 11:54:10 2009 @@ -75,6 +75,10 @@ Update tc-native to 1.1.16 (markt) + +46982: Correct reporting of DST offset in access logs. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46875] CometConnectionManagerValve: concurrent access on session object when calling HttpSession.invalidate()
https://issues.apache.org/bugzilla/show_bug.cgi?id=46875 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2009-04-28 03:39:32 PST --- This has been fixed in 6.0.x and will be included in 6.0.20 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: r769345 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.xml webapps/docs/changelog.xml
Author: markt Date: Tue Apr 28 11:45:12 2009 New Revision: 769345 URL: http://svn.apache.org/viewvc?rev=769345&view=rev Log: Enable running Tomcat from the build directory on linux Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 11:45:12 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762936,768335 +/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,768335 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769345&r1=769344&r2=769345&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:45:12 2009 @@ -104,12 +104,6 @@ +1: markt, remm -1: -* Enable running of Tomcat directly from build directory on linux - http://svn.apache.org/viewvc?view=rev&revision=762937 - http://svn.apache.org/viewvc?view=rev&revision=762929 - +1: markt, remm, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46982 Correct report DST offset in access logs http://svn.apache.org/viewvc?rev=763166&view=rev Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=769345&r1=769344&r2=769345&view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Tue Apr 28 11:45:12 2009 @@ -91,7 +91,7 @@ - + @@ -101,6 +101,7 @@ + @@ -450,6 +451,8 @@ + + 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=769345&r1=769344&r2=769345&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 11:45:12 2009 @@ -122,6 +122,10 @@ Fix .pdf and .exe corruption in -src.tar.gz distribution. (markt) + +Enable running Tomcat directly from the build directory on linux +systems. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r769384 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/tomcat/util/res/ test/org/apache/tomcat/ test/org/apache/tomcat/util/ test/org/apache/tomcat/util/res/ webapps/docs/
Author: markt
Date: Tue Apr 28 13:14:14 2009
New Revision: 769384
URL: http://svn.apache.org/viewvc?rev=769384&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46933
Simplify StringManager using Java 5. Includes test case
Based on a patch by Jens Kapitza
Added:
tomcat/tc6.0.x/trunk/test/org/apache/tomcat/
tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/
tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/res/
tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 13:14:14 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769384&r1=769383&r2=769384&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 13:14:14 2009
@@ -104,15 +104,6 @@
+1: markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46933
- Simplify StringManager using Java 5. Includes test case. Based on a patch by
- Jens Kapitza
- http://svn.apache.org/viewvc?rev=763183&view=rev
- +1: markt, remm, rjung
- -1:
- rjung: J. Kapitza added later another patch to StringManager as
- https://issues.apache.org/bugzilla/attachment.cgi?id=23550
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46958
Allow xml manager status to work irrespective of context path
http://svn.apache.org/viewvc?rev=763193&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=769384&r1=769383&r2=769384&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java Tue
Apr 28 13:14:14 2009
@@ -131,107 +131,17 @@
* @param args
*/
-public String getString(String key, Object[] args) {
-String iString = null;
+public String getString(final String key, final Object... args) {
String value = getString(key);
-
-// this check for the runtime exception is some pre 1.1.6
-// VM's don't do an automatic toString() on the passed in
-// objects and barf out
-
-try {
-// ensure the arguments are not null so pre 1.2 VM's don't barf
-if(args==null){
-args = new Object[1];
-}
-
-Object[] nonNullArgs = args;
-for (int i=0; ihttp://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java?rev=769384&view=auto
==
--- tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java
(added)
+++ tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java
Tue Apr 28 13:14
DO NOT REPLY [Bug 46933] Using Java 1.5 in StringManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=46933 --- Comment #6 from Mark Thomas 2009-04-28 06:14:54 PST --- This has been fixed in 6.0.x and will be in 6.0.20 onwards. This issue can be marked as fixed once the second patch is moved to a new bugzilla entry. -- 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: r769385 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/manager/Constants.java webapps/docs/changelog.xml
Author: markt Date: Tue Apr 28 13:18:51 2009 New Revision: 769385 URL: http://svn.apache.org/viewvc?rev=769385&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46958 Allow xml manager status to work irrespective of context path Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 13:18:51 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,768335 +/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,768335 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769385&r1=769384&r2=769385&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 13:18:51 2009 @@ -104,12 +104,6 @@ +1: markt, remm -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46958 - Allow xml manager status to work irrespective of context path - http://svn.apache.org/viewvc?rev=763193&view=rev - +1: markt, remm, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46967 Better handling of errors when trying to use Manager.randomFile Based on a patch by Kirk Wolf Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=769385&r1=769384&r2=769385&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java Tue Apr 28 13:18:51 2009 @@ -193,7 +193,7 @@ ""; public static final String XML_STYLE = -""; +""; } 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=769385&r1=769384&r2=769385&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 13:18:51 2009 @@ -112,6 +112,10 @@ 46924: Clarify behaviour when auto deployment is enabled and a WAR, directory or context file is deleted or updated. (markt) + +46958: All xml manager status output to work regardless of +context path. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46958] manager XML interface hard-coded path in XSL transformation
https://issues.apache.org/bugzilla/show_bug.cgi?id=46958 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2009-04-28 06:19:15 PST --- This has been fixed in 6.0.x and will be in 6.0.20 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: r769387 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jk/server/JkCoyoteHandler.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 13:23:32 2009
New Revision: 769387
URL: http://svn.apache.org/viewvc?rev=769387&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46991
Update counters before request is re-cycled
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 13:23:32 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769387&r1=769386&r2=769387&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 13:23:32 2009
@@ -126,12 +126,6 @@
0: remm (zzz)
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46991
- Update counters before request is re-cycled
- http://svn.apache.org/viewvc?rev=763302&view=rev
- +1: markt, remm, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46509
Use correct link on error page in JSP security example
Patch provided by Michael Moody
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java?rev=769387&r1=769386&r2=769387&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java Tue Apr
28 13:23:32 2009
@@ -195,8 +195,8 @@
res.finish();
}
-req.recycle();
req.updateCounters();
+req.recycle();
res.recycle();
ep.recycle();
if( ep.getStatus() == MsgContext.JK_STATUS_ERROR ) {
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=769387&r1=769386&r2=769387&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 13:23:32 2009
@@ -83,6 +83,10 @@
46982: Correct reporting of DST offset in access logs.
(markt)
+
+46991: Fix AJP connector always reporting bytes received as
+zero. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46991] "Bytes received " problem
https://issues.apache.org/bugzilla/show_bug.cgi?id=46991 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2009-04-28 06:23:35 PST --- This has been fixed in 6.0.x and will be in 6.0.20 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: r769388 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ssi/SSIServlet.java webapps/docs/changelog.xml
Author: markt Date: Tue Apr 28 13:26:54 2009 New Revision: 769388 URL: http://svn.apache.org/viewvc?rev=769388&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46562 Close the reader in the SSI servlet when we are done Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServlet.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 13:26:54 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,768335 +/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,768335 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769388&r1=769387&r2=769388&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 13:26:54 2009 @@ -133,12 +133,6 @@ +1: markt, rjung -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46562 - Close the reader in the SSI servlet when we are done - http://svn.apache.org/viewvc?rev=763599&view=rev - +1: markt, remm, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909 Only include ';' in type attribute if there is a parameter http://svn.apache.org/viewvc?rev=763611&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServlet.java?rev=769388&r1=769387&r2=769388&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServlet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServlet.java Tue Apr 28 13:26:54 2009 @@ -210,5 +210,6 @@ String text = stringWriter.toString(); res.getWriter().write(text); } +bufferedReader.close(); } } \ No newline at end of file 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=769388&r1=769387&r2=769388&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 13:26:54 2009 @@ -61,6 +61,10 @@ 46933: Update StringManager to use Java 5 features. Patch provided by Jens Kapitza. (markt) + +46562: Close shtml files after processing to allow other +processes to modify the files. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46562] Reader not closed
https://issues.apache.org/bugzilla/show_bug.cgi?id=46562 --- Comment #9 from Mark Thomas 2009-04-28 06:27:03 PST --- This has been fixed in 6.0.x and will be in 6.0.20 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: r769392 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/runtime/BodyContentImpl.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 13:32:02 2009
New Revision: 769392
URL: http://svn.apache.org/viewvc?rev=769392&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46354
ArrayIndexOutOfBoundsException when using
org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
Pathc provided by Konstantin Kolinko
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 13:32:02 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769392&r1=769391&r2=769392&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 13:32:02 2009
@@ -146,13 +146,6 @@
+1: markt, rjung
-1:
-* Fix http://svn.apache.org/viewvc?rev=763681&view=rev
- ArrayIndexOutOfBoundsException when using
- org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
- Patch provided by Konstantin Kolinko
- +1: markt, remm, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42579
Handle both relative and absolute search results
Patch provided by Brandon DuRette
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java?rev=769392&r1=769391&r2=769392&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
Tue Apr 28 13:32:02 2009
@@ -51,9 +51,6 @@
// Enclosed writer to which any output is written
private Writer writer;
-// See comment in setWriter()
-private int bufferSizeSave;
-
/**
* Constructor.
*/
@@ -508,6 +505,19 @@
}
/**
+ * This method returns the size of the buffer used by the JspWriter.
+ *
+ * @return the size of the buffer in bytes, or 0 is unbuffered.
+ */
+public int getBufferSize() {
+// According to the spec, the JspWriter returned by
+// JspContext.pushBody(java.io.Writer writer) must behave as
+// though it were unbuffered. This means that its getBufferSize()
+// must always return 0.
+return (writer == null) ? bufferSize : 0;
+}
+
+/**
* @return the number of bytes unused in the buffer
*/
public int getRemaining() {
@@ -558,22 +568,7 @@
void setWriter(Writer writer) {
this.writer = writer;
closed = false;
-if (writer != null) {
-// According to the spec, the JspWriter returned by
-// JspContext.pushBody(java.io.Writer writer) must behave as
-// though it were unbuffered. This means that its getBufferSize()
-// must always return 0. The implementation of
-// JspWriter.getBufferSize() returns the value of JspWriter's
-
DO NOT REPLY [Bug 46354] LIMIT_BUFFER setting causes arraycopy errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=46354 --- Comment #8 from Mark Thomas 2009-04-28 06:32:43 PST --- This has been fixed in 6.0.x and will be included in 6.0.20 onwards. Thanks again for the patch. -- 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: r769402 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 13:42:08 2009
New Revision: 769402
URL: http://svn.apache.org/viewvc?rev=769402&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42579
Handle both relative and absolute search results
Patch provided by Brandon DuRette
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 13:42:08 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,763706,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769402&r1=769401&r2=769402&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 13:42:08 2009
@@ -146,13 +146,6 @@
+1: markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42579
- Handle both relative and absolute search results
- Patch provided by Brandon DuRette
- http://svn.apache.org/viewvc?rev=763706&view=rev
- +1: markt, remm, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
Correct JSP compilation error with nested tagfile tags with variables with
"AT_BEGIN" scope
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=769402&r1=769401&r2=769402&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Apr
28 13:42:08 2009
@@ -18,6 +18,8 @@
package org.apache.catalina.realm;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.security.Principal;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -1821,6 +1823,62 @@
}
+/**
+ * Returns the distinguished name of a search result.
+ *
+ * @param context Our DirContext
+ * @param base The base DN
+ * @param result The search result
+ * @return String containing the distinguished name
+ */
+protected String getDistinguishedName(DirContext context, String base,
+SearchResult result) throws NamingException {
+// Get the entry's distinguished name. For relative results, this
means
+// we need to composite a name with the base name, the context name,
and
+// the result name. For non-relative names, use the returned name.
+if (result.isRelative()) {
+ if (containerLog.isTraceEnabled()) {
+ containerLog.trace(" search returned relative name: " +
+ result.getName());
+ }
+ NameParser parser = context.getNameParser("");
+ Name contextName = parser.parse(context.getNameInNamespace());
+ Name baseName = parser.parse(base);
+
+ // Bugzilla 32269
+ Name entryName =
+ parser.parse(new CompositeName(result.getName()).get(0));
+
DO NOT REPLY [Bug 42579] [Patch] JNDIRealm fails to parse absolute names
https://issues.apache.org/bugzilla/show_bug.cgi?id=42579 --- Comment #3 from Mark Thomas 2009-04-28 06:42:12 PST --- This has been fixed in 6.0.x and will be included in 6.0.20 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: r769403 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/Tomcat6.launch java/org/apache/jasper/runtime/PageContextImpl.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 13:45:50 2009
New Revision: 769403
URL: http://svn.apache.org/viewvc?rev=769403&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37929
Invalidated session causes pageContext methods to fail
Removed:
tomcat/tc6.0.x/trunk/bin/Tomcat6.launch
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 13:45:50 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,763706,768335
+/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,763706,765662,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769403&r1=769402&r2=769403&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 13:45:50 2009
@@ -162,12 +162,6 @@
-0: remm: Why should this be backported ?
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37929
- Invalidated session causes pageContext methods to fail
- http://svn.apache.org/viewvc?rev=765662&view=rev
- +1: markt, remm, rjung
- -1:
-
* Fix use of non-ASCII characters in property files
http://people.apache.org/~markt/patches/2009-04-20-native2ascii-de.patch
(German)
http://people.apache.org/~markt/patches/2009-04-20-native2ascii-en.patch
(English)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=769403&r1=769402&r2=769403&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Tue Apr 28 13:45:50 2009
@@ -421,8 +421,13 @@
return REQUEST_SCOPE;
if (session != null) {
- if (session.getAttribute(name) != null)
- return SESSION_SCOPE;
+ try {
+ if (session.getAttribute(name) != null)
+ return SESSION_SCOPE;
+ } catch(IllegalStateException ise) {
+ // Session has been invalidated.
+ // Ignore and fall through to application scope.
+ }
}
if (context.getAttribute(name) != null)
@@ -464,7 +469,12 @@
return o;
if (session != null) {
- o = session.getAttribute(name);
+ try {
+ o = session.getAttribute(name);
+ } catch(IllegalStateException ise) {
+ // Session has been invalidated.
+ // Ignore and fall through to application scope.
+ }
if (o != null)
return o;
}
@@ -528,17 +538,17 @@
}
private void doRemoveAttribute(String name) {
- try {
-
DO NOT REPLY [Bug 37929] invalidated session causes pageContext methods to fail
https://issues.apache.org/bugzilla/show_bug.cgi?id=37929 --- Comment #9 from Mark Thomas 2009-04-28 06:45:54 PST --- This has been fixed in 6.0.x and will be included in 6.0.20 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
DO NOT REPLY [Bug 37929] invalidated session causes pageContext methods to fail
https://issues.apache.org/bugzilla/show_bug.cgi?id=37929 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED -- 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
Tomcat Native: APR Http Endpoint handler behavior under Windows
Hi all. We've been doing some rather extreme JBoss/Tomcat stress-testing on both Windows and Linux, APR and non-APR. We played with maxThreads and acceptCount and tried to make sense of the various behaviors that we saw. In a nutshell, we discovered that under Windows, the maximum size of the backLog on a listening socket is hard limited to 200 and there is nothing you can do to overcome this at the O/S level. This has some implications for high-load (peaky) situations where a flood of new connection requests hits the server all at once. (Let's put to one side the SYN flood DoS protection that the O/S might also have that might get in the way of things). Now unfortunately, APR does not appear to help alleviate this problem...you can have thousands of open connections, all idling away with CPU at zero, and still have lots of new clients turned away at the door if there is a burst of them. I dug into the AprEndpoint code to see how it worked. It would seem that when a new connection is accepted, it requires a thread from the worker thread pool to help process the new connection. This is the same pool of threads that is servicing requests from the existing connection pool. If there is a reasonable amount of activity with all the existing connections, contention for these threads will be very high, and the rate at which the new connection requests can be serviced is therefore quite low. Thus with a burst of new connection requests, the backlog queue fills quickly and (under Windows) the ones that don't make it to the queue get their connection unceremoniously and immediately reset. (Which is rather ugly in itself since it does not allow for tcp recovery attempts on the connection request over the next 20 secs or so, as happens under Linux). So what I was wondering is whether the acceptor could adopt a slightly different strategy. Firstly, can it not use a separate (perhaps internal) small pool of threads for handling new connection requests, and in addition, hand them straight over to the poller without processing the first request that might be associated with it. [I think that the relatively new connector setting deferAccept might have some relevance here?] Basically the idea would be to simply get the new connections out of the backlog as quickly as possible and over to the poller to deal with. This would mean that the listen backlog is likely to be kept to an absolute minimum even in flooding situations. (Until of course, you hit the other limit of how many sockets the poller can handle). Be interested in your thoughts. Cheers, MT
svn commit: r769428 - in /tomcat/container/tc5.5.x: modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 15:04:48 2009
New Revision: 769428
URL: http://svn.apache.org/viewvc?rev=769428&view=rev
Log:
Backport: Handle session suffix rewrite at JvmRouteBinderValve with parallel
requests from same client (pero)
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(contents, props changed)
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=769428&r1=769427&r2=769428&view=diff
==
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Tue Apr 28 15:04:48 2009
@@ -35,6 +35,7 @@
import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.cluster.ClusterValve;
+import org.apache.catalina.ha.session.DeltaSession;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.session.ManagerBase;
@@ -218,8 +219,8 @@
* @param response current response
*/
protected void handlePossibleTurnover(Request request, Response response) {
-Session session = request.getSessionInternal(false);
-if (session != null) {
+String sessionID = request.getRequestedSessionId() ;
+if (sessionID != null) {
long t1 = 0 ;
if (log.isDebugEnabled()) {
t1 = System.currentTimeMillis();
@@ -230,7 +231,7 @@
log.warn(sm.getString("jvmRoute.missingJvmRouteAttribute"));
return;
}
-handleJvmRoute( request, response,session.getIdInternal(),
jvmRoute);
+handleJvmRoute( request, response, sessionID, jvmRoute);
if (log.isDebugEnabled()) {
long t2 = System.currentTimeMillis();
long time = t2 - t1;
@@ -310,23 +311,32 @@
log.debug(sm.getString("jvmRoute.failover", requestJvmRoute,
localJvmRoute, sessionId));
}
-// OK - turnover the session ?
-String newSessionID = sessionId.substring(0, index) + "."
-+ localJvmRoute;
Session catalinaSession = null;
try {
catalinaSession = getManager(request).findSession(sessionId);
} catch (IOException e) {
// Hups!
}
+String id = sessionId.substring(0, index);
+String newSessionID = id + "." + localJvmRoute;
+// OK - turnover the session and inform other cluster nodes
if (catalinaSession != null) {
changeSessionID(request, response, sessionId, newSessionID,
catalinaSession);
numberOfSessions++;
} else {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("jvmRoute.cannotFindSession",
-sessionId));
+try {
+catalinaSession =
getManager(request).findSession(newSessionID);
+} catch (IOException e) {
+// Hups!
+}
+if (catalinaSession != null) {
+// session is rewrite at other request, rewrite this also
+changeRequestSessionID(request, response, sessionId,
newSessionID);
+} else {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString("jvmRoute.cannotFindSession",sessionId));
+}
}
}
}
@@ -348,10 +358,34 @@
Response response, String sessionId, String newSessionID, Session
catalinaSession) {
lifecycle.fireLifecycleEvent("Before session migration",
catalinaSession);
-request.setRequestedSessionId(newSessionID);
+// FIXME: setId trigger session Listener, but only chance to
registiert manager with correct id!
catalinaSession.setId(newSessionID);
+// FIXME: Why we remove change data from other running request?
+// setId also trigger resetDeltaRequest!!
if (catalinaSession instanceof DeltaSession)
((DeltaSession) catalinaSession).resetDeltaRequest();
+changeRequestSessionID(request, response, sessionId, newSessionID);
+// now sending the change to all other clusternode!
+ClusterManager manager = (Cl
svn commit: r769429 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Tue Apr 28 15:05:08 2009 New Revision: 769429 URL: http://svn.apache.org/viewvc?rev=769429&view=rev Log: Patch applied 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=769429&r1=769428&r2=769429&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Apr 28 15:05:08 2009 @@ -32,11 +32,6 @@ +1: markt, rjung -1: -* Backport: Handle session suffix rewrite at JvmRouteBinderValve with parallel requests from same client - http://svn.apache.org/viewvc?rev=693378&view=rev - +1: pero, markt, mturk - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45880 More careful use of File /r and and NOTICE file http://people.apache.org/~markt/patches/2008-09-24-bug45880.patch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat Native: APR Http Endpoint handler behavior under Windows
On Wed, 2009-04-29 at 00:42 +1000, mcto...@gmail.com wrote: > In a nutshell, we discovered that under Windows, the maximum size of the I think with Windows, APR will have scalability problems sooner or later, as poller performance is bad on that platform (the code has a hack to use many pollers as performance degrades quickly with size). There is a Vista+ solution to that somewhere in the future, but I'm not sure this whole thing will still be relevant then. DeferAccept on Unix makes accept return a socket only if it has data available. Of course, this is much faster, but I'm not sure about its support status on any OS. Setting the options in done in a regular thread due to possible SSL processing (and just to be safe overall). Maybe an option there to do that in the accept thread would be decent (obviously, only useful if there's no SSL and no deferAccept; in theory, although setSocketOptions is cheap, Poller.add does sync, which is a problem since it's bad if the accept thread is blocked for any reason, so I don't know if that would work better in the real world). Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47111] New: do caching the resources like the docu say it (StringManager)
https://issues.apache.org/bugzilla/show_bug.cgi?id=47111 Summary: do caching the resources like the docu say it (StringManager) Product: Tomcat 6 Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: j.kapi...@schwarze-allianz.de Created an attachment (id=23559) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23559) do caching the resources like the docu say it do caching the resources like the docu say it see https://issues.apache.org/bugzilla/show_bug.cgi?id=46933 -- 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
DO NOT REPLY [Bug 47111] do caching the resources like the docu say it (StringManager)
https://issues.apache.org/bugzilla/show_bug.cgi?id=47111 Jens Kapitza changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Jens Kapitza 2009-04-28 09:03:51 PST --- as said in https://issues.apache.org/bugzilla/show_bug.cgi?id=46933 it will be closed -- 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
DO NOT REPLY [Bug 46933] Using Java 1.5 in StringManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=46933 Jens Kapitza changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED -- 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
DO NOT REPLY [Bug 47111] do caching the resources like the docu say it (StringManager)
https://issues.apache.org/bugzilla/show_bug.cgi?id=47111 Rainer Jung changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #2 from Rainer Jung 2009-04-28 09:07:04 PST --- I reopened because I think we still need to apply this patch. -- 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
DO NOT REPLY [Bug 47109] Upgrade to mod_jk 1.2.28 with Apache 2.0.46 works until load balanced
https://issues.apache.org/bugzilla/show_bug.cgi?id=47109 --- Comment #2 from Chris 2009-04-28 12:02:58 PST --- Sorry this turned out to be a configuration issue. I am running Virtual servers and JkMounts as of some version of mod_jk since 1.2.14 are no longer inherited in vertual servers unless you set global of JkMountCopy=All or withing the Virtual Server config JkMountCopy=On. -- 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: Tomcat Native: APR Http Endpoint handler behavior under Windows
A few followups on this. It's only now that I have realised that the
the tomcat apr handler in JBoss is subtly different from the one in
Tomcatie that whole piece of tomcat has been forked into JBossWeb,
and they're starting to diverge. Be that as it may, my comments cover
the current design as it exists in both of them at trunk level.
I think with Windows, APR will have scalability problems sooner or
later, as poller performance is bad on that platform (the code has a
hack to use many pollers as performance degrades quickly with size).
There is a Vista+ solution to that somewhere in the future, but I'm not
sure this whole thing will still be relevant then.
Why is poller performance bad in Windows? Is that a consequence of the
way the APR interfaces to WinSock? I'm guessing that APR uses a
Unix-style approach to polling the sockets. Or is it to do with the
performance of the poll inside Window itself?
Be that as it may, at our end we still have to make Windows work as well
as possible, so if there are simple tweaks we can do to cause
performance to degrade more gracefully under conditions of peaky load,
can we not discuss it?
Also I couldn't see where it specifically sets a high number of pollers
high for Windows? (And in which fork?? :-)
And could you elaborate please on that last statement? "I'm not sure
this whole thing will still be relevant then".
DeferAccept on Unix makes accept return a socket only if it has data
available. Of course, this is much faster, but I'm not sure about its
support status on any OS. Setting the options in done in a regular
thread due to possible SSL processing (and just to be safe overall).
Maybe an option there to do that in the accept thread would be decent
(obviously, only useful if there's no SSL and no deferAccept; in theory,
although setSocketOptions is cheap, Poller.add does sync, which is a
problem since it's bad if the accept thread is blocked for any reason,
so I don't know if that would work better in the real world).
There seems to be two distinct aspects to this deferAccept thing. One is
what happens with the socket options. (And as I understand it this
option is only supported in Linux 2.6 anyway). The other - which is in
the AprEndpoint code, concerns the processing of the new connection.
Just on that note, I have a question about this bit of code:
if (!deferAccept) {
if (setSocketOptions(socket)) {
getPoller().add(socket);
} else {
// Close socket and pool
Socket.destroy(socket);
socket = 0;
}
} else {
// Process the request from this socket
if (!setSocketOptions(socket)
|| handler.process(socket) ==
Handler.SocketState.CLOSED) {
// Close socket and pool
Socket.destroy(socket);
socket = 0;
The default value of deferAccept is true, but on Windows this option is
not supported in the TCP/IP stack, so there is code that falsifies the
flag if this is the case. In which case, the socket is added straight to
the poller. I'm happy with that approach anyway. But, the act of
getting it across to the poller - which should be a relatively quick
operation (?) requires the use of a worker thread from the common pool.
This gets back to my original point. If the new connection could be
pushed across to the poller asap, (without handling the request), and
without having to rely on the worker threads, then surely this is going
to degrade more gracefully than the current situation where a busy
server is going to leave things in the backlog for quite some time.
Which is a problem with a relatively small backlog.
In the Tomcat branch, there is code to have multiple acceptor threads,
with a remark that it doesn't seem to work that well if you do. So that
being the case, why not push it straight across to the poller in the
context of the acceptor thread?
...MT
Re: Tomcat Native: APR Http Endpoint handler behavior under Windows
On Wed, 2009-04-29 at 08:50 +1000, mcto...@gmail.com wrote:
> A few followups on this. It's only now that I have realised that the
> the tomcat apr handler in JBoss is subtly different from the one in
> Tomcatie that whole piece of tomcat has been forked into JBossWeb,
> and they're starting to diverge. Be that as it may, my comments cover
> the current design as it exists in both of them at trunk level.
The accept code is the same, and that part of the poller code is
equivalent. JBoss Web is my new connector code (that I was doing in the
comet branch here before moving it).
> Why is poller performance bad in Windows? Is that a consequence of the
I've been told it uses select, which works only on 64 sockets at a time.
So if you have a large poller, then the poll call performance degrades.
Mladen is really the only one who can answer Windows questions.
(personally, I think it is a lot cause for really high scalability)
> way the APR interfaces to WinSock? I'm guessing that APR uses a
> Unix-style approach to polling the sockets. Or is it to do with the
> performance of the poll inside Window itself?
>
> Be that as it may, at our end we still have to make Windows work as well
> as possible, so if there are simple tweaks we can do to cause
> performance to degrade more gracefully under conditions of peaky load,
> can we not discuss it?
>
> Also I couldn't see where it specifically sets a high number of pollers
> high for Windows? (And in which fork?? :-)
Both. It's pretty easy, there are Windows specific flags in the code.
Look there. If the poller size is larger than 1024, it creates multiple
pollers, each holding 1024 sockets (my testing did show this was a
magical value, where it was not too slow, yet large enough).
> And could you elaborate please on that last statement? "I'm not sure
> this whole thing will still be relevant then".
I think APR is by far the best technology for implementing Servlet 3.0,
but I'm not so sure beyond that. The Vista+ enhancements need a new
major version of APR, so it will take some time (too much IMP).
> There seems to be two distinct aspects to this deferAccept thing. One is
> what happens with the socket options. (And as I understand it this
> option is only supported in Linux 2.6 anyway). The other - which is in
> the AprEndpoint code, concerns the processing of the new connection.
> Just on that note, I have a question about this bit of code:
>
> if (!deferAccept) {
> if (setSocketOptions(socket)) {
> getPoller().add(socket);
> } else {
> // Close socket and pool
> Socket.destroy(socket);
> socket = 0;
> }
> } else {
> // Process the request from this socket
> if (!setSocketOptions(socket)
> || handler.process(socket) ==
> Handler.SocketState.CLOSED) {
> // Close socket and pool
> Socket.destroy(socket);
> socket = 0;
>
>
> The default value of deferAccept is true, but on Windows this option is
> not supported in the TCP/IP stack, so there is code that falsifies the
> flag if this is the case. In which case, the socket is added straight to
> the poller. I'm happy with that approach anyway. But, the act of
> getting it across to the poller - which should be a relatively quick
> operation (?) requires the use of a worker thread from the common pool.
> This gets back to my original point. If the new connection could be
> pushed across to the poller asap, (without handling the request), and
> without having to rely on the worker threads, then surely this is going
> to degrade more gracefully than the current situation where a busy
> server is going to leave things in the backlog for quite some time.
> Which is a problem with a relatively small backlog.
Yes, but (as I said in my previous email):
- Poller.add does sync. This is bad for the Acceptor thread, but it
might be ok.
- Socket options also does SSL handshake, which is not doable in the
Acceptor thread.
So (as I was also saying) if there is no SSL and deferAccept is false,
it is possible to have a configuration option to have the Acceptor
thread set the options and put the socket in the poller without using a
thread from the pool. That is, if you tested it and you found it worked
better for you.
Also, you are supposed to have a large maxThreads in the pool if you
want to scale. Otherwise, although it might work well 99% of the time
since thread use is normally limited due to the poller for keepalive,
it's very easy to DoS your server. BTW, it's rather cheap (on Linux, at
least ;) ).
> In the Tomcat branch, there is code to have multiple acceptor threads,
That stuff wasn't really implemented. I don't think it's such a good
idea to be too efficient to accept and poll, if all it's going to do is
blow up the app serv
Re: Tomcat Native: APR Http Endpoint handler behavior under Windows
Why is poller performance bad in Windows? Is that a consequence of the I've been told it uses select, which works only on 64 sockets at a time. So if you have a large poller, then the poll call performance degrades. Mladen is really the only one who can answer Windows questions. (personally, I think it is a lot cause for really high scalability) Hmm...I looked into this...the limit of 64 is a MS compile-time thing ... and in APR it appears that the constant is actually being re-defined to 1024 for WIN32 in the poller code. Hence I would not expect that under Windows this would actually be too much of an issue...1024 sockets per poller doesn't seem an unreasonable idea... in which case (if true) the performance implication of having a small number of poller threads is completely dwarfed by the DoS performance issue I have raised here. Be that as it may, this is a digression from my main issue... I think APR is by far the best technology for implementing Servlet 3.0, but I'm not so sure beyond that. The Vista+ enhancements need a new major version of APR, so it will take some time (too much IMP). Yep - we have to work with what we've got... (Sidebar: to your knowledge is there a working implementation of Servlet 3.0 yet in JBoss?) The default value of deferAccept is true, but on Windows this option is not supported in the TCP/IP stack, so there is code that falsifies the flag if this is the case. In which case, the socket is added straight to the poller. I'm happy with that approach anyway. But, the act of getting it across to the poller - which should be a relatively quick operation (?) requires the use of a worker thread from the common pool. This gets back to my original point. If the new connection could be pushed across to the poller asap, (without handling the request), and without having to rely on the worker threads, then surely this is going to degrade more gracefully than the current situation where a busy server is going to leave things in the backlog for quite some time. Which is a problem with a relatively small backlog. Yes, but (as I said in my previous email): - Poller.add does sync. This is bad for the Acceptor thread, but it might be ok. - Socket options also does SSL handshake, which is not doable in the Acceptor thread. So (as I was also saying) if there is no SSL and deferAccept is false, it is possible to have a configuration option to have the Acceptor thread set the options and put the socket in the poller without using a thread from the pool. That is, if you tested it and you found it worked better for you. I might give that a try...I'm less concerned about SSL as I would not anticipate SSL connection floods in the scenarios I'm considering. Otherwise, even with Poller.add doing a sync, surely that is still generally an improved situation versus having to contend for worker threads to get the connection open? Also, you are supposed to have a large maxThreads in the pool if you want to scale. Otherwise, although it might work well 99% of the time since thread use is normally limited due to the poller for keepalive, it's very easy to DoS your server. BTW, it's rather cheap (on Linux, at least ;) ). You're quite right...with a small number of Worker threads, as things stand it would be easy to get DoS for /new connections/...that is exactly my point. I'm specifically looking at Comet situations here...large numbers of long-lived connections potentially. But I wouldn't want maxThreads to be more than a few hundred to service several thousand connections...that was one major reason for using NIO/APR. In the Tomcat branch, there is code to have multiple acceptor threads, That stuff wasn't really implemented. I don't think it's such a good idea to be too efficient to accept and poll, if all it's going to do is blow up the app server (which would probably be even more challenged by the burst than the connector). The network stack is actually a decent place to smooth things out a little (or you could implement a backlog as part of the accept process). Maybe. I agree the network stack is not a bad place to handle it, except for the fact that stupid Windows wants to send a reset if the (size limited) backlog fills. If you implement an applic backlog on top of the O/S backlog, to me that is much the same as moving it straight off to the poller...just a question of which queue it sits in. I'll see if I can hack the AprEndpoint to test out what would happen. Cheers, MT
Re: Tomcat Native: APR Http Endpoint handler behavior under Windows
Remy Maucherat wrote: Why is poller performance bad in Windows? Is that a consequence of the I've been told it uses select, which works only on 64 sockets at a time. So if you have a large poller, then the poll call performance degrades. Mladen is really the only one who can answer Windows questions. (personally, I think it is a lot cause for really high scalability) Well, we are forcing it to 1024 by setting the FD_SIZE before including the socket. Anyhow, this still requires multiple poller threads. The Vista+ windows has WSAPoll which is equivalent even on the API level to unix poll, and it doesn't bring any limitation on the pollset size. I've tested it with 32K sockets, and there is no performance degradations caused by the size like there is on the select implementation. I've added the WASPoll support to APR2, but there are some other things with APR2 that are still to be resolved before we can create tomcat-native 2. It merged with apr-util and introduced feature modules, so instead one it might end up with tens of dll's. Regards -- ^(TM) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
