svn commit: r689389 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Wed Aug 27 00:02:55 2008 New Revision: 689389 URL: http://svn.apache.org/viewvc?rev=689389&view=rev Log: Propose backport for PR#43327 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=689389&r1=689388&r2=689389&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 27 00:02:55 2008 @@ -107,3 +107,9 @@ I propose to keep the CoyoteAdapter code consistent. +1: rjung, fhanik, remm -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327 + http://svn.apache.org/viewvc?rev=687755&view=rev + Note use trunk of TC-native to test it as it also needs patches there. + +1: jfclere + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689395 - in /tomcat/trunk: java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: jfclere
Date: Wed Aug 27 00:23:40 2008
New Revision: 689395
URL: http://svn.apache.org/viewvc?rev=689395&view=rev
Log:
Fix for PR#44809
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=689395&r1=689394&r2=689395&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Wed
Aug 27 00:23:40 2008
@@ -86,7 +86,7 @@
if (!log.isDebugEnabled()) {
log.info(sm.getString("aprListener.sslInit"));
} else {
-log.debug(sm.getString("aprListener.sslInit"));
+log.debug(sm.getString("aprListener.sslInit"), t);
}
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=689395&r1=689394&r2=689395&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 27 00:23:40 2008
@@ -57,6 +57,7 @@
+ 44809Improve AprLifecycleListener Error Messages
67197345272
Workaround for IE cookie behavior
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689398 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Wed Aug 27 00:28:22 2008 New Revision: 689398 URL: http://svn.apache.org/viewvc?rev=689398&view=rev Log: Propose backport for PR#44809 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=689398&r1=689397&r2=689398&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 27 00:28:22 2008 @@ -113,3 +113,9 @@ Note use trunk of TC-native to test it as it also needs patches there. +1: jfclere -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44809 + http://svn.apache.org/viewvc?rev=689395&view=rev + +1: jfclere + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44809] Improve AprLifecycleListener Error Messages
https://issues.apache.org/bugzilla/show_bug.cgi?id=44809 jfclere <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from jfclere <[EMAIL PROTECTED]> 2008-08-27 00:29:00 PST --- Fixed in trunk and proposed for backup in tc6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689402 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11AprProtocol.java webapps/docs/changelog.xml
Author: jfclere
Date: Wed Aug 27 00:42:58 2008
New Revision: 689402
URL: http://svn.apache.org/viewvc?rev=689402&view=rev
Log:
Fix for PR#45074
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=689402&r1=689401&r2=689402&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Wed Aug
27 00:42:58 2008
@@ -242,9 +242,15 @@
public void setPollerSize(int pollerSize) {
endpoint.setPollerSize(pollerSize); }
public int getPollerSize() { return endpoint.getPollerSize(); }
+public void setPollerThreadCount(int pollerThreadCount) {
endpoint.setPollerThreadCount(pollerThreadCount); }
+public int getPollerThreadCount() { return
endpoint.getPollerThreadCount(); }
+
public int getSendfileSize() { return endpoint.getSendfileSize(); }
public void setSendfileSize(int sendfileSize) {
endpoint.setSendfileSize(sendfileSize); }
+public void setSendfileThreadCount(int sendfileThreadCount) {
endpoint.setSendfileThreadCount(sendfileThreadCount); }
+public int getSendfileThreadCount() { return
endpoint.getSendfileThreadCount(); }
+
protected int socketBuffer = 9000;
public int getSocketBuffer() { return socketBuffer; }
public void setSocketBuffer(int socketBuffer) { this.socketBuffer =
socketBuffer; }
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=689402&r1=689401&r2=689402&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 27 00:42:58 2008
@@ -49,6 +49,7 @@
+ 45074Add configuration parameters in
Http11AprProtocol
644858
Inproper curly brackets cause NIO/SendFile to fail. Workaround prior to
this version, set
useSendFile="false" in the Connector element.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689403 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Wed Aug 27 00:45:03 2008 New Revision: 689403 URL: http://svn.apache.org/viewvc?rev=689403&view=rev Log: Propose backport for PR#45074 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=689403&r1=689402&r2=689403&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 27 00:45:03 2008 @@ -119,3 +119,8 @@ +1: jfclere -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45074 + http://svn.apache.org/viewvc?rev=689402&view=rev + +1: jfclere + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45074] Add configuration parameters for finer tuning of Http11AprProtocol thread usage
https://issues.apache.org/bugzilla/show_bug.cgi?id=45074 jfclere <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from jfclere <[EMAIL PROTECTED]> 2008-08-27 00:45:40 PST --- Fixed in trunk and proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43327] Socket bind fails on tomcat startup when using apr
https://issues.apache.org/bugzilla/show_bug.cgi?id=43327 jfclere <[EMAIL PROTECTED]> changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Comment #23 from jfclere <[EMAIL PROTECTED]> 2008-08-27 00:47:34 PST --- Fixed in tc-native and trunk proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45392] No OCSP support for client SSL verification
https://issues.apache.org/bugzilla/show_bug.cgi?id=45392 jfclere <[EMAIL PROTECTED]> changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Comment #9 from jfclere <[EMAIL PROTECTED]> 2008-08-27 00:59:47 PST --- apr has a pool for memory allocation. Couldn't the malloc,realloc,free be changed to the apr corresponding ones? -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689447 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Wed Aug 27 04:09:01 2008 New Revision: 689447 URL: http://svn.apache.org/viewvc?rev=689447&view=rev Log: - Votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=689447&r1=689446&r2=689447&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 27 04:09:01 2008 @@ -111,16 +111,17 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327 http://svn.apache.org/viewvc?rev=687755&view=rev Note use trunk of TC-native to test it as it also needs patches there. - +1: jfclere + +1: jfclere, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44809 http://svn.apache.org/viewvc?rev=689395&view=rev - +1: jfclere + +1: jfclere, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45074 http://svn.apache.org/viewvc?rev=689402&view=rev +1: jfclere - -1: + -0: remm: configuring this is useless (esp on Windows, only the default behavior gives acceptable performance) + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_proxy_balancer issue
Mladen Turk wrote: Jess Holle wrote: I'm quite willing to help, but you're clearly much more familiar with both mod_jk and APR/MPM than I am, so I suspect I'd just get in the way except at the testing level. Well, I plan to create mpm watchdog hook system first. I'll also create a small callback in mod_proxy, just to maintain the connection pool so you are free to implement any additional mod_proxy interval operations (like heath checking) from there. Is there already something along these lines in mod_jk (or more specifically the IIS connector)? I did a little simplistic testing and haven't gotten down and dirty to debug this, but I have no managed to figure out any configuration of mod_jk where the load balancers' "dead" workers will be tested in the background and avoid testing this with foreground requests. I have a simple "ping" request that takes many seconds all too often, presumably delayed by re-checking all the dead workers. I have a worker.maintain of 15 and a recover_time for my balanced worker of 30 -- under the theory that background maintenance should be able to test any "dead" connections and mark them as recently tested without any request threads ever checking the workers. This assumes that the recover_time is only observed by request threads, though. Is there a means of achieving background-only (or nearly so) testing of dead workers with mod_jk? That's what I'm looking for in both jk and mod_proxy_ajp connectors. I guess I was hoping/assuming it was there in mod_jk from reading the docs. -- Jess Holle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_proxy_balancer issue
Jess Holle wrote: Mladen Turk wrote: Is there a means of achieving background-only (or nearly so) testing of dead workers with mod_jk? That's what I'm looking for in both jk and mod_proxy_ajp connectors. I guess I was hoping/assuming it was there in mod_jk from reading the docs. There is in the mod_jk (SVN trunk). Add JkWatchdogInterval 60 This will create thread calling maintain each 60 seconds. If you add worker.xxx.connection_keepalive=60 it will fire a cping/cpong on all connections in connection pool that were not used more then 60 seconds Regards -- ^(TM) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_proxy_balancer issue
Mladen Turk wrote: Jess Holle wrote: Mladen Turk wrote: Is there a means of achieving background-only (or nearly so) testing of dead workers with mod_jk? That's what I'm looking for in both jk and mod_proxy_ajp connectors. I guess I was hoping/assuming it was there in mod_jk from reading the docs. There is in the mod_jk (SVN trunk). Ah... I'd been looking in 1.2.26. Add JkWatchdogInterval 60 This will create thread calling maintain each 60 seconds. How does this differ from worker.maintain? If you add worker.xxx.connection_keepalive=60 it will fire a cping/cpong on all connections in connection pool that were not used more then 60 seconds What about for load balance members with no established connections? My primary case here is a fairly large bank of ports which will be sparsely populated with Tomcats. I do not want normal request threads to spend time seeing if the ports have "come to life", but I want a background thread to do so periodically. I'm thinking I'd want most of the workers being load balanced over to start in a presumed dead state until the background thread discovered they were alive. Does this sound close? I will take a look at the SVN code. I take it there's no such code in Apache SVN yet for mod_proxy_ajp? [I did look there.] -- Jess Holle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_proxy_balancer issue
Jess Holle wrote: Add JkWatchdogInterval 60 Also how/where would one specify this for the IIS/Tomcat connector? [I need such a capability for IIS and Apache 2.2, specifically.] -- Jess Holle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689608 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Author: markt
Date: Wed Aug 27 13:35:45 2008
New Revision: 689608
URL: http://svn.apache.org/viewvc?rev=689608&view=rev
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44282
Do call to getClassLoader() in a privileged block.
Note the security manager test also had to change slightly to work with 5.5.x
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=689608&r1=689607&r2=689608&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Wed Aug 27 13:35:45 2008
@@ -131,6 +131,20 @@
}
+protected final class PrivilegedGetClassLoader
+implements PrivilegedAction {
+
+public Class clazz;
+
+public PrivilegedGetClassLoader(Class clazz){
+this.clazz = clazz;
+}
+
+public ClassLoader run() {
+return clazz.getClassLoader();
+}
+}
+
// --- Static Variables
@@ -911,8 +925,17 @@
// Return the class we have located
if (log.isTraceEnabled())
log.debug(" Returning class " + clazz);
-if ((log.isTraceEnabled()) && (clazz != null))
-log.debug(" Loaded by " + clazz.getClassLoader());
+
+if ((log.isTraceEnabled()) && (clazz != null)) {
+ClassLoader cl;
+if (securityManager != null){
+cl = (ClassLoader) AccessController.doPrivileged(
+new PrivilegedGetClassLoader(clazz));
+} else {
+cl = clazz.getClassLoader();
+}
+log.debug(" Loaded by " + cl.toString());
+}
return (clazz);
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=689608&r1=689607&r2=689608&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Aug 27 13:35:45 2008
@@ -72,6 +72,11 @@
CATALINA_HOME. Patch provided by Takayuki Kaneko. (markt)
+44282: Prevent security exception in trace level logging for
+web application class loader when running under a security manager.
+(markt)
+
+
44529: No roles specified (deny all) should take precedence
over no auth-constraint specified (allow-all). (markt)
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=689608&r1=689607&r2=689608&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Aug 27 13:35:45 2008
@@ -25,16 +25,6 @@
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44282
- Do call to getClassLoader() in a privileged block.
- http://svn.apache.org/viewvc?rev=616953&view=rev (less the generics stuff)
- +1: markt, fhanik, rjung
- -1:
- 0: yoavs (because I think there might be a bug when we're only diong the
work if log.isTraceEnabled)
- markt I believe this is correct. The privileged block is only required for
- the getClassloader() call. This call is only ever made if trace is
- enabled
-
* Better handling of lack of permission for context specific logging
http://svn.apache.org/viewvc?rev=646543&view=rev
+1: markt
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44282] WebappClassLoader.findClass calls getClassLoader without privileges
https://issues.apache.org/bugzilla/show_bug.cgi?id=44282 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-08-27 13:35:52 PST --- This has been fixed in 5.5.x and will be included in 5.5.27 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_proxy_balancer issue
Jess Holle wrote: Mladen Turk wrote: Jess Holle wrote: Mladen Turk wrote: Is there a means of achieving background-only (or nearly so) testing of dead workers with mod_jk? That's what I'm looking for in both jk and mod_proxy_ajp connectors. I guess I was hoping/assuming it was there in mod_jk from reading the docs. There is in the mod_jk (SVN trunk). I've been reading this code now... The watchdog thread looks very useful. If I understand it correctly, the watchdog thread can do whatever it feels like but currently mainly calls wc_maintain, which will only do work at most every worker.maintain seconds, right? connection_keepalive does not look like it really my bill, though. I'm most worried about workers in an error state and ensuring that they are rechecked every recover_wait_time -- but only by the watchdog thread and ideally via a ping/pong. Currently recover_workers appears to just put workers into a recovery state where they'll be elligible to be tried again on a future request -- without checking whether the worker is actually accessible. That's fine for some use cases, but explicitly what I want to avoid. Are there any thoughts to have an option to have recover_workers() do a ping prior to returning a working to a non-error state? And, yes, a watchdog thread in mod_proxy_balancer /and /a reasonable means of balancer invoking a ping via mod_proxy_ajp would be really helpful as far as mod_proxy_ajp is concerned. -- Jess Holle
DO NOT REPLY [Bug 43578] Tomcat fails to start on linux if CATALINA_HOME contains a space
https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #9 from Mark Thomas <[EMAIL PROTECTED]> 2008-08-27 13:51:42 PST --- This has been fixed in 5.5.x and will be included in 5.5.27 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45585] Tomcat doesn't start when JULI is not used (NoClassDefFoundError)
https://issues.apache.org/bugzilla/show_bug.cgi?id=45585 --- Comment #4 from Mark Thomas <[EMAIL PROTECTED]> 2008-08-27 13:52:14 PST --- This has been applied to 5.5.x and will be included in 5.5.27 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689613 - in /tomcat: container/tc5.5.x/catalina/src/bin/catalina.sh container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Author: markt Date: Wed Aug 27 13:52:34 2008 New Revision: 689613 URL: http://svn.apache.org/viewvc?rev=689613&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 and https://issues.apache.org/bugzilla/show_bug.cgi?id=45585 Tomcat doesn't start if installation path contains a space Patch provided by Ray Sauers with improvements by Ian Ward Comfort Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=689613&r1=689612&r2=689613&view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Wed Aug 27 13:52:34 2008 @@ -165,7 +165,11 @@ # Set juli LogManager if it is present if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then - JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties" + JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" + LOGGING_CONFIG="-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties" +else + # Bugzilla 45585 + LOGGING_CONFIG="-Dnop" fi # - Execute The Requested Command - @@ -208,7 +212,7 @@ if [ "$1" = "-security" ] ; then echo "Using Security Manager" shift - exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \ + exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \ -Djava.security.manager \ @@ -218,7 +222,7 @@ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap "$@" start else - exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \ + exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \ -Dcatalina.base="$CATALINA_BASE" \ @@ -234,7 +238,7 @@ if [ "$1" = "-security" ] ; then echo "Using Security Manager" shift -exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ +exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Djava.security.manager \ -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ @@ -243,7 +247,7 @@ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap "$@" start else -exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ +exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ @@ -258,7 +262,7 @@ if [ "$1" = "-security" ] ; then echo "Using Security Manager" shift -"$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ +"$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Djava.security.manager \ -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ @@ -272,7 +276,7 @@ echo $! > $CATALINA_PID fi else -"$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ +"$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=689613&r1=689612&r2=689613&view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Aug 27 13:52:34 2008 @@ -79,7 +79,12 @@ 44529: No roles specified (deny all) should take precedence over no auth-constraint specified (allow-all). (markt) - + + +43578: Enable start on Linux if $CATALINA_HOME contains a +space. Original patch provided by Ray Sauers with improvements by Ian +Ward Comfort. (markt) + 44673: Throw IOE if ServletInputStream is closed and a call is made to any read(), ready(), mark(), reset(), or skip() method as per Modified: tomcat/current/tc5.5.x/S
svn commit: r689615 - in /tomcat: connectors/trunk/jk/java/org/apache/jk/server/JkMain.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Author: markt
Date: Wed Aug 27 13:57:50 2008
New Revision: 689615
URL: http://svn.apache.org/viewvc?rev=689615&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591
NPE on shutdown failure in some cases. Based on a patch by Matt Passell
Modified:
tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java?rev=689615&r1=689614&r2=689615&view=diff
==
--- tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java (original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java Wed Aug 27
13:57:50 2008
@@ -676,9 +676,12 @@
}
public void pause() throws Exception {
-for( int i=0; ihttp://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=689615&r1=689614&r2=689615&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Aug 27 13:57:50 2008
@@ -131,6 +131,10 @@
43191: Compression could not be disabled for some file
types.
Based on a patch by Len Popp. (markt)
+
+45591: Fix NPE on shutdown failure in some cases. Based on a
+patch by Matt Passell. (markt)
+
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=689615&r1=689614&r2=689615&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Aug 27 13:57:50 2008
@@ -31,12 +31,6 @@
0: fhanik - silently swallow an error, and default to the default config
file, yoavs: don't like silent swallowing
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591
- NPE on shutdown failure in some cases. Based on a patch by Matt Passell
- http://svn.apache.org/viewvc?rev=683982&view=rev
- +1: markt, fhanik, rjung
- -1:
-
* JAASMemoryLoginModule didn't confirm to JAASRealm contract. This prevented
any
user from being assigned a role.
http://svn.apache.org/viewvc?rev=684081&view=rev
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45591] NullPointerException during shutdown in JKMain.pause()
https://issues.apache.org/bugzilla/show_bug.cgi?id=45591 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas <[EMAIL PROTECTED]> 2008-08-27 13:58:02 PST --- This has been fixed in 5.5.x and will be included in 5.5.27 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_proxy_balancer issue
Jess Holle wrote: Jess Holle wrote: Mladen Turk wrote: Jess Holle wrote: Mladen Turk wrote: Is there a means of achieving background-only (or nearly so) testing of dead workers with mod_jk? That's what I'm looking for in both jk and mod_proxy_ajp connectors. I guess I was hoping/assuming it was there in mod_jk from reading the docs. There is in the mod_jk (SVN trunk). I've been reading this code now... The watchdog thread looks very useful. If I understand it correctly, the watchdog thread can do whatever it feels like but currently mainly calls wc_maintain, which will only do work at most every worker.maintain seconds, right? connection_keepalive does not look like it really my bill, though. I'm most worried about workers in an error state and ensuring that they are rechecked every recover_wait_time -- but only by the watchdog thread and ideally via a ping/pong. Currently recover_workers appears to just put workers into a recovery state where they'll be elligible to be tried again on a future request -- without checking whether the worker is actually accessible. That's fine for some use cases, but explicitly what I want to avoid. Are there any thoughts to have an option to have recover_workers() do a ping prior to returning a working to a non-error state? And, yes, a watchdog thread in mod_proxy_balancer /and /a reasonable means of balancer invoking a ping via mod_proxy_ajp would be really helpful as far as mod_proxy_ajp is concerned. P.S. As far as my other questions go, I noticed that you covered the IIS/isapi base as well. I assume this new option is configured via the registry then. Are you planning to modify the vbs configuration script be extended to cover this?
svn commit: r689619 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Author: markt
Date: Wed Aug 27 14:09:21 2008
New Revision: 689619
URL: http://svn.apache.org/viewvc?rev=689619&view=rev
Log:
JAASMemoryLoginModule didn't confirm to JAASRealm contract. This prevented any
user from being assigned a role.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=689619&r1=689618&r2=689619&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java
Wed Aug 27 14:09:21 2008
@@ -194,8 +194,18 @@
return (false);
// Add our Principal to the Subject if needed
-if (!subject.getPrincipals().contains(principal))
+if (!subject.getPrincipals().contains(principal)) {
subject.getPrincipals().add(principal);
+// Add the roles as additional subjects as per the contract with
the
+// JAASRealm
+if (principal instanceof GenericPrincipal) {
+String roles[] = ((GenericPrincipal) principal).getRoles();
+for (int i = 0; i < roles.length; i++) {
+subject.getPrincipals().add(
+new GenericPrincipal(null, roles[i], null));
+}
+}
+}
committed = true;
return (true);
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=689619&r1=689618&r2=689619&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Aug 27 14:09:21 2008
@@ -115,6 +115,9 @@
45453: Fix race condition in JDBC Realm. Based on a patch
provided by Santtu Hyrkk. (markt)
+
+JAAS Realm did not read role information for users. (markt)
+
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=689619&r1=689618&r2=689619&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Aug 27 14:09:21 2008
@@ -31,13 +31,6 @@
0: fhanik - silently swallow an error, and default to the default config
file, yoavs: don't like silent swallowing
-1:
-* JAASMemoryLoginModule didn't confirm to JAASRealm contract. This prevented
any
- user from being assigned a role.
- http://svn.apache.org/viewvc?rev=684081&view=rev
- +1: markt, fhanik, rjung
- -1:
- rjung: sudjucts -> subjects ;)
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45576
Add support for DIGEST to the JAASRealm
http://svn.apache.org/viewvc?rev=684234&view=rev
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689621 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Wed Aug 27 14:10:54 2008 New Revision: 689621 URL: http://svn.apache.org/viewvc?rev=689621&view=rev Log: Add missing patch reference 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=689621&r1=689620&r2=689621&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Aug 27 14:10:54 2008 @@ -39,9 +39,9 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41407 Add support for CLIENT-CERT to the JASSRealm. Builds on DIGEST patch above. + http://svn.apache.org/viewvc?rev=684270&view=rev +1: markt, fhanik -1: - rjung: Can you please add the original revision here? * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45528 Improved fix that hopefully addresses previous concerns - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689624 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Wed Aug 27 14:26:05 2008
New Revision: 689624
URL: http://svn.apache.org/viewvc?rev=689624&view=rev
Log:
Remove 1.5 dep that crept in with previous commit.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=689624&r1=689623&r2=689624&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Wed Aug 27 14:26:05 2008
@@ -136,11 +136,11 @@
public Class clazz;
-public PrivilegedGetClassLoader(Class clazz){
+public PrivilegedGetClassLoader(Class clazz){
this.clazz = clazz;
}
-public ClassLoader run() {
+public Object run() {
return clazz.getClassLoader();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r689625 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Wed Aug 27 14:29:21 2008 New Revision: 689625 URL: http://svn.apache.org/viewvc?rev=689625&view=rev Log: Vote 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=689625&r1=689624&r2=689625&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Aug 27 14:29:21 2008 @@ -53,5 +53,5 @@ * Fix redirect loop when using URIEncoding="UTF-8" http://svn.apache.org/viewvc?rev=688857&view=rev See also: http://marc.info/?t=12196780334&r=1&w=2 - +1: rjung, fhanik + +1: rjung, fhanik, markt -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_proxy_balancer issue
Jess Holle wrote: Jess Holle wrote: Mladen Turk wrote: Jess Holle wrote: Mladen Turk wrote: Is there a means of achieving background-only (or nearly so) testing of dead workers with mod_jk? That's what I'm looking for in both jk and mod_proxy_ajp connectors. I guess I was hoping/assuming it was there in mod_jk from reading the docs. There is in the mod_jk (SVN trunk). I've been reading this code now... The watchdog thread looks very useful. If I understand it correctly, the watchdog thread can do whatever it feels like but currently mainly calls wc_maintain, which will only do work at most every worker.maintain seconds, right? connection_keepalive does not look like it really my bill, though. I'm most worried about workers in an error state and ensuring that they are rechecked every recover_wait_time -- but only by the watchdog thread and ideally via a ping/pong. Currently recover_workers appears to just put workers into a recovery state where they'll be elligible to be tried again on a future request -- without checking whether the worker is actually accessible. That's fine for some use cases, but explicitly what I want to avoid. Are there any thoughts to have an option to have recover_workers() do a ping prior to returning a working to a non-error state? And, yes, a watchdog thread in mod_proxy_balancer /and /a reasonable means of balancer invoking a ping via mod_proxy_ajp would be really helpful as far as mod_proxy_ajp is concerned. Another possibly simpler alternative: we could introduce a limit as to how many workers we attempt to do (unforced) recoveries on for any given request. Any request could likely tolerate a recovery attempt or two. None should have to tolerate 6-12 recovery attempts just because of a currently sparsely populated port range. Thoughts? -- Jess Holle
Re: mod_proxy_balancer issue
P.S. I'd also like to quiet attempts to recover workers from errors to a lower (and by default unlogged) logging level. The transition of a worker into an error state should certainly be logged, but logging every time we find it to still be in an error state seems to be excessive -- at least for a sparsely populated port bank use case. Jess Holle wrote: Jess Holle wrote: Jess Holle wrote: Mladen Turk wrote: Jess Holle wrote: Mladen Turk wrote: Is there a means of achieving background-only (or nearly so) testing of dead workers with mod_jk? That's what I'm looking for in both jk and mod_proxy_ajp connectors. I guess I was hoping/assuming it was there in mod_jk from reading the docs. There is in the mod_jk (SVN trunk). I've been reading this code now... The watchdog thread looks very useful. If I understand it correctly, the watchdog thread can do whatever it feels like but currently mainly calls wc_maintain, which will only do work at most every worker.maintain seconds, right? connection_keepalive does not look like it really my bill, though. I'm most worried about workers in an error state and ensuring that they are rechecked every recover_wait_time -- but only by the watchdog thread and ideally via a ping/pong. Currently recover_workers appears to just put workers into a recovery state where they'll be elligible to be tried again on a future request -- without checking whether the worker is actually accessible. That's fine for some use cases, but explicitly what I want to avoid. Are there any thoughts to have an option to have recover_workers() do a ping prior to returning a working to a non-error state? And, yes, a watchdog thread in mod_proxy_balancer /and /a reasonable means of balancer invoking a ping via mod_proxy_ajp would be really helpful as far as mod_proxy_ajp is concerned. Another possibly simpler alternative: we could introduce a limit as to how many workers we attempt to do (unforced) recoveries on for any given request. Any request could likely tolerate a recovery attempt or two. None should have to tolerate 6-12 recovery attempts just because of a currently sparsely populated port range. Thoughts? -- Jess Holle
Re: mod_proxy_balancer issue
Jess Holle wrote: P.S. I'd also like to quiet attempts to recover workers from errors to a lower (and by default unlogged) logging level. The transition of a worker into an error state should certainly be logged, but logging every time we find it to still be in an error state seems to be excessive -- at least for a sparsely populated port bank use case. Everything you said is fine with me. I just did a functional logic via watchdog thread and two basic use cases (maintain and keepalive). The keepalive is meant to deal with firewalls that tends to cut inactive connections. As far as I'm concerned feel free to extend the logic so it can deal with error states more intelligently. ... and of course, the plan is to implement something or all of this to mod_proxy, but using a different mechanism. Many modules needs some sort of out of the request cycle detached maintenance, so I'll add a common mpm maintenance thread to lower down the resource usage. Regards -- ^(TM) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
