DO NOT REPLY [Bug 48253] Tomcat Native patch - adding dynamic locking callbacks for openssl engines
https://issues.apache.org/bugzilla/show_bug.cgi?id=48253 --- Comment #4 from jfclere 2011-01-07 03:01:23 EST --- Fixed by svn commit: r1055907 -- 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 50557] Tomcat , Comet - Writes are getting blocked some time
https://issues.apache.org/bugzilla/show_bug.cgi?id=50557 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2011-01-07 03:03:59 EST --- This looks likes it belongs on the users list. Feel free to re-open this as and when it is determined that there is actually a bug here and you have a reproducible test case. -- 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: r1056216 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml
Author: kfujino
Date: Fri Jan 7 08:08:01 2011
New Revision: 1056216
URL: http://svn.apache.org/viewvc?rev=1056216&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547.
Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.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=1056216&r1=1056215&r2=1056216&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 08:08:01 2011
@@ -288,12 +288,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, fhanik, funkman
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547
- Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
- http://svn.apache.org/viewvc?view=revision&revision=1055798
- +1: kfujino, fhanik, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
Return IP address rather than null for getRemoteHost() and the APR connector
http://people.apache.org/~markt/patches/2011-01-06-bug47319-tc6.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1056216&r1=1056215&r2=1056216&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Fri Jan 7 08:08:01 2011
@@ -645,6 +645,7 @@ public class DeltaManager extends Cluste
SessionMessage.EVT_CHANGE_SESSION_ID, data,
orgSessionID, orgSessionID + "-"
+ System.currentTimeMillis());
+msg.setTimestamp(System.currentTimeMillis());
counterSend_EVT_CHANGE_SESSION_ID++;
send(msg);
} catch (IOException e) {
@@ -1330,6 +1331,7 @@ public class DeltaManager extends Cluste
protected void sessionExpired(String id) {
counterSend_EVT_SESSION_EXPIRED++ ;
SessionMessage msg = new
SessionMessageImpl(getName(),SessionMessage.EVT_SESSION_EXPIRED, null, id, id+
"-EXPIRED-MSG");
+msg.setTimestamp(System.currentTimeMillis());
if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.createMessage.expire",getName(), id));
send(msg);
}
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=1056216&r1=1056215&r2=1056216&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 08:08:01 2011
@@ -340,6 +340,10 @@
If maxInactiveInterval is negative, the access message is
not
being sent. (kfujino)
+
+50547: Add time stamp for CHANGE_SESSION_ID message and
+SESSION_EXPIRED message. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50547] The CHANGE_SESSION_ID message that received during cluster session synchronization is dropped.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50547 Keiichi Fujino changed: What|Removed |Added Component|Cluster |Catalina:Cluster Version|unspecified |5.5.31 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #3 from Keiichi Fujino 2011-01-07 03:11:09 EST --- Fixed in 6.0.x and will be in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49557] index erro in the loop to get the env info in the proc.create function
https://issues.apache.org/bugzilla/show_bug.cgi?id=49557 --- Comment #5 from jfclere 2011-01-07 03:22:10 EST --- the free() are needed as the tcn_get_string makes malloc(). -- 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: r1056218 - in /tomcat/native/branches/1.1.x: native/src/proc.c xdocs/miscellaneous/changelog.xml
Author: jfclere
Date: Fri Jan 7 08:28:05 2011
New Revision: 1056218
URL: http://svn.apache.org/viewvc?rev=1056218&view=rev
Log:
Fix for 49557.
Modified:
tomcat/native/branches/1.1.x/native/src/proc.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/branches/1.1.x/native/src/proc.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/proc.c?rev=1056218&r1=1056217&r2=1056218&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/proc.c (original)
+++ tomcat/native/branches/1.1.x/native/src/proc.c Fri Jan 7 08:28:05 2011
@@ -211,7 +211,7 @@ TCN_IMPLEMENT_CALL(jint, Proc, create)(T
if (args)
as = (*e)->GetArrayLength(e, args);
if (env)
-es = (*e)->GetArrayLength(e, args);
+es = (*e)->GetArrayLength(e, env);
if (as > (MAX_ARGS_SIZE - 1) || es > (MAX_ENV_SIZE - 2)) {
TCN_FREE_CSTRING(progname);
return APR_EINVAL;
@@ -228,7 +228,7 @@ TCN_IMPLEMENT_CALL(jint, Proc, create)(T
if (es) {
for (i = 0; i < es; i++) {
jstring str = (*e)->GetObjectArrayElement(e, env, i);
-s_env[i+1] = tcn_get_string(e, str);
+s_env[i] = tcn_get_string(e, str);
(*e)->DeleteLocalRef(e, str);
}
#ifdef WIN32
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1056218&r1=1056217&r2=1056218&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Fri Jan 7
08:28:05 2011
@@ -39,6 +39,9 @@
+ 49557: index erro in the loop to get the env info in the
proc.create function. (kkolinko, jfclere)
+
+
49851: JNI Registry.deleteKey and Registry.deleteValue
corrupt Windows registry. (jfclere)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49557] index erro in the loop to get the env info in the proc.create function
https://issues.apache.org/bugzilla/show_bug.cgi?id=49557 jfclere changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from jfclere 2011-01-07 03:28:39 EST --- Fixed by r1056218 -- 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 46179] apr ssl client authentication
https://issues.apache.org/bugzilla/show_bug.cgi?id=46179 --- Comment #4 from jfclere 2011-01-07 03:34:14 EST --- Could you please try with SSLVerifyDepth="1". Note that the certificates attached to the case are too old new :-( -- 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 50552] Ant Tasks give a null pointer exception when an error occurs, masking true error
https://issues.apache.org/bugzilla/show_bug.cgi?id=50552 --- Comment #5 from chris.rim...@nominet.org.uk 2011-01-07 04:40:28 EST --- Btw I would have written a test or tests to show that my patch fixes the problem, but there don't seem to be any tests for these ant tasks. Unless I'm looking in the wrong place? -- 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: r1056234 - /tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
Author: markt
Date: Fri Jan 7 10:05:07 2011
New Revision: 1056234
URL: http://svn.apache.org/viewvc?rev=1056234&view=rev
Log:
Fix various warnings
Modified:
tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
Modified: tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java?rev=1056234&r1=1056233&r2=1056234&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java Fri
Jan 7 10:05:07 2011
@@ -31,11 +31,8 @@ import javax.naming.Name;
import javax.naming.NamingException;
import javax.naming.RefAddr;
import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
import javax.sql.DataSource;
-import org.apache.naming.ResourceLinkRef;
-
/**
@@ -43,8 +40,7 @@ import org.apache.naming.ResourceLinkRef
*
* @author Filip Hanik
*/
-public class DataSourceLinkFactory extends ResourceLinkFactory
-implements ObjectFactory {
+public class DataSourceLinkFactory extends ResourceLinkFactory {
// -- ObjectFactory Methods
@@ -55,6 +51,7 @@ public class DataSourceLinkFactory exten
*
* @param obj The reference object describing the DataSource
*/
+@Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable environment)
throws NamingException {
@@ -103,6 +100,7 @@ public class DataSourceLinkFactory exten
this.password = password;
}
+@Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
if ("getConnection".equals(method.getName()) && args.length==0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056237 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Fri Jan 7 10:16:59 2011 New Revision: 1056237 URL: http://svn.apache.org/viewvc?rev=1056237&view=rev Log: Numerical order, fix indenting Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1056237&r1=1056236&r2=1056237&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 7 10:16:59 2011 @@ -44,9 +44,6 @@ - 49543 Allow Tomcat to use shared data sources with - per application credentials. (fhanik) - 8705: org.apache.catalina.SessionListener now extends java.util.EventListener. (markt) @@ -96,6 +93,10 @@ (markt) +49543 Allow Tomcat to use shared data sources with per +application credentials. (fhanik) + + 49650: Remove unnecessary entries package.access property defined in catalina.properties. Patch provided by Owen Farrell. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056244 - in /tomcat/trunk: java/org/apache/naming/java/javaURLContextFactory.java res/findbugs/filter-false-positives.xml webapps/docs/changelog.xml
Author: markt
Date: Fri Jan 7 10:31:59 2011
New Revision: 1056244
URL: http://svn.apache.org/viewvc?rev=1056244&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50554
Various FindBugs / Eclipse warnings
Silence the false positives
Modified:
tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java?rev=1056244&r1=1056243&r2=1056244&view=diff
==
--- tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java Fri Jan
7 10:31:59 2011
@@ -80,6 +80,8 @@ public class javaURLContextFactory
/**
* Crete a new Context's instance.
*/
+@SuppressWarnings("unchecked")
+@Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable environment)
throws NamingException {
@@ -94,6 +96,8 @@ public class javaURLContextFactory
/**
* Get a new (writable) initial context.
*/
+@SuppressWarnings("unchecked")
+@Override
public Context getInitialContext(Hashtable environment)
throws NamingException {
if (ContextBindings.isThreadBound() ||
@@ -105,7 +109,7 @@ public class javaURLContextFactory
// If the thread is not bound, return a shared writable context
if (initialContext == null) {
-synchronized(getClass()) {
+synchronized(javaURLContextFactory.class) {
if (initialContext == null) {
initialContext = new NamingContext(
(Hashtable)environment, MAIN);
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1056244&r1=1056243&r2=1056244&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Jan 7 10:31:59
2011
@@ -5,6 +5,10 @@
+
+
+
+
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1056244&r1=1056243&r2=1056244&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 7 10:31:59 2011
@@ -193,6 +193,9 @@
ensure that a subsequent request for that directory does not result in
a
404 response. (markt)
+
+50554: Code clean up. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50554] Bad use of getClass() could potentially lead to concurrency bugs in future
https://issues.apache.org/bugzilla/show_bug.cgi?id=50554 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2011-01-07 05:32:45 EST --- Fixed in 7.0.x and will be included in 7.0.6 The issue was already reported by FindBugs. I fixed this issue and the handful of other FindBugs and Eclipse warnings in that class. -- 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
[PROPOSAL] Remove o.a.catlina.InstanceListener
All, I just stumbled across o.a.catlina.InstanceListener and the associated classes when I was reviewing the results of the unused code detector. It isn't used at all in 7.0.x, nor can I find any sign of it being used in 6.0.x and 5.5.x. A search of the mail archives doesn't turn up any uses either. On that basis, I intend to remove it before I tag 7.0.6. Any objections? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056256 - in /tomcat/trunk/java/javax/servlet: ServletRequestEvent.java jsp/tagext/BodyTagSupport.java jsp/tagext/TagSupport.java
Author: markt
Date: Fri Jan 7 11:02:25 2011
New Revision: 1056256
URL: http://svn.apache.org/viewvc?rev=1056256&view=rev
Log:
Fix some simple FindBugs issues
Modified:
tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
Modified: tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestEvent.java?rev=1056256&r1=1056255&r2=1056256&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletRequestEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestEvent.java Fri Jan 7
11:02:25 2011
@@ -26,7 +26,7 @@ package javax.servlet;
public class ServletRequestEvent extends java.util.EventObject {
private static final long serialVersionUID = 1L;
-private final ServletRequest request;
+private final transient ServletRequest request;
/**
* Construct a ServletRequestEvent for the given ServletContext and
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java?rev=1056256&r1=1056255&r2=1056256&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java Fri Jan 7
11:02:25 2011
@@ -149,5 +149,5 @@ public class BodyTagSupport extends TagS
/**
* The current BodyContent for this BodyTag.
*/
-protected BodyContent bodyContent;
+protected transient BodyContent bodyContent;
}
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java?rev=1056256&r1=1056255&r2=1056256&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java Fri Jan 7
11:02:25 2011
@@ -286,6 +286,6 @@ public class TagSupport implements Itera
/**
* The PageContext.
*/
-protected PageContext pageContext;
+protected transient PageContext pageContext;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50410] Poll.create with THREADSAFE will silently switch the flag off
https://issues.apache.org/bugzilla/show_bug.cgi?id=50410 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mladen Turk 2011-01-07 06:10:48 EST --- This is APR's wrongly designed API. No mater if the native OS pollset implementation is thread safe or not, if APR_POLLSET_THREADSAFE is not provided internal mutex will be created. However if required create will fail and we would need to call that API again. If not required beside creating unneeded mutex what's worse it's be used although not required, so it's clear why we wish too call it with that flag. However from the end user (tomcat native) point of view this makes no difference at all. What we do internally is to clear that flag and try again without that flag, fixing the APR api which should treat APR_POLLSET_THREADSAFE as a 'hint' not as a requirement. Whether native pollset implementation is thread safe or not makes no real value because if it's not APR will create internal mutex protecting it, so this is just one of those "legacy" api's. -- 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: r1056264 - in /tomcat/trunk: java/org/apache/catalina/ant/BaseRedirectorHelperTask.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jan 7 11:24:36 2011
New Revision: 1056264
URL: http://svn.apache.org/viewvc?rev=1056264&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50552
Avoid NPE that hides error when using Ant tasks (schultz)
Modified:
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1056264&r1=1056263&r2=1056264&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java Fri
Jan 7 11:24:36 2011
@@ -263,7 +263,7 @@ public abstract class BaseRedirectorHelp
*/
protected void closeRedirector() {
try {
-if (redirectOutput) {
+if (redirectOutput && redirectOutPrintStream != null) {
redirector.complete();
}
} catch (IOException ioe) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1056264&r1=1056263&r2=1056264&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 7 11:24:36 2011
@@ -305,6 +305,10 @@
14416: Make TagLibraryInfo.getTag() more robust
at handling nulls. (markt)
+
+50552: Avoid NPE that hides error message when using Ant
+tasks. (schultz)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056266 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Jan 7 11:26:58 2011 New Revision: 1056266 URL: http://svn.apache.org/viewvc?rev=1056266&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1056266&r1=1056265&r2=1056266&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 11:26:58 2011 @@ -305,4 +305,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=1055989 +1: fhanik, funkman -1: - + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50552 + Avoid NPE that hides error message + http://svn.apache.org/viewvc?rev=1056264&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50552] Ant Tasks give a null pointer exception when an error occurs, masking true error
https://issues.apache.org/bugzilla/show_bug.cgi?id=50552 Mark Thomas changed: What|Removed |Added Component|Integration |Catalina Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #6 from Mark Thomas 2011-01-07 06:28:10 EST --- Fixed in 7.0.x for 7.0.6 using Chris S's first proposal. Chris R - You are correct. There are no tests for this code. I also proposed the fix for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Remove o.a.catlina.InstanceListener
2011/1/7 Mark Thomas : > All, > > I just stumbled across o.a.catlina.InstanceListener and the associated > classes when I was reviewing the results of the unused code detector. > > It isn't used at all in 7.0.x, nor can I find any sign of it being used > in 6.0.x and 5.5.x. A search of the mail archives doesn't turn up any > uses either. On that basis, I intend to remove it before I tag 7.0.6. > Any objections? We indeed do not have our own classes that implement InstanceListener, but if you search for o.a.c.InstanceEvent, it is used in a plenty of places (to implement this feature actually). So it is not just throwing away classes, it also removal of many lines of code. Searching the web, it is mentioned e.g. here: http://community.jboss.org/message/288150?tstart=0 See also http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA/tomcat/src/main/org/jboss/web/tomcat/security/RunAsListener.java My opinion on this proposal is "-1". Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Remove o.a.catlina.InstanceListener
On 07/01/2011 12:18, Konstantin Kolinko wrote: > 2011/1/7 Mark Thomas : >> All, >> >> I just stumbled across o.a.catlina.InstanceListener and the associated >> classes when I was reviewing the results of the unused code detector. >> >> It isn't used at all in 7.0.x, nor can I find any sign of it being used >> in 6.0.x and 5.5.x. A search of the mail archives doesn't turn up any >> uses either. On that basis, I intend to remove it before I tag 7.0.6. >> Any objections? > > We indeed do not have our own classes that implement InstanceListener, > but if you search for o.a.c.InstanceEvent, it is used in a plenty of places > (to implement this feature actually). > > So it is not just throwing away classes, it also removal of many lines of > code. Yep - the main reason I wanted to get rid of it. > Searching the web, it is mentioned e.g. here: > http://community.jboss.org/message/288150?tstart=0 > > See also > http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA/tomcat/src/main/org/jboss/web/tomcat/security/RunAsListener.java > > My opinion on this proposal is "-1". Drat. If it is being used as an integration point then I guess we'll have to keep it. Oh well. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Remove o.a.catlina.InstanceListener
On Fri, 2011-01-07 at 15:18 +0300, Konstantin Kolinko wrote: > We indeed do not have our own classes that implement InstanceListener, > but if you search for o.a.c.InstanceEvent, it is used in a plenty of places > (to implement this feature actually). > > So it is not just throwing away classes, it also removal of many lines of > code. > > Searching the web, it is mentioned e.g. here: > http://community.jboss.org/message/288150?tstart=0 > > See also > http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA/tomcat/src/main/org/jboss/web/tomcat/security/RunAsListener.java > > My opinion on this proposal is "-1". The web container that is used there is not fully compatible with Tomcat already, so you can remove InstanceListener in Tomcat without breaking AS. However, unless there's a comparable hook somewhere, removing this is probably not a good idea, valves and filters are not exactly the same thing. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056298 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/valves/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/or
Author: markt
Date: Fri Jan 7 13:01:00 2011
New Revision: 1056298
URL: http://svn.apache.org/viewvc?rev=1056298&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50496
Differentiate between content written (what the app writes to the output
stream) and bytes written (what Tomcat writes to the socket) and use bytes for
the access logs
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/coyote/OutputBuffer.java
tomcat/trunk/java/org/apache/coyote/RequestInfo.java
tomcat/trunk/java/org/apache/coyote/Response.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1056298&r1=1056297&r2=1056298&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Fri Jan 7
13:01:00 2011
@@ -308,12 +308,30 @@ public class Response
/**
- * Return the number of bytes actually written to the output stream.
+ * Return the number of bytes the application has actually written to the
+ * output stream. This excludes chunking, compression, etc. as well as
+ * headers.
*/
-public long getContentCount() {
+public long getContentWritten() {
return outputBuffer.getContentWritten();
}
+
+/**
+ * Return the number of bytes the actually written to the socket. This
+ * includes chunking, compression, etc. but excludes headers.
+ */
+public long getBytesWritten(boolean flush) {
+if (flush) {
+try {
+outputBuffer.flush();
+} catch (IOException ioe) {
+// Ignore - the client has probably closed the connection
+}
+}
+return coyoteResponse.getBytesWritten(flush);
+}
+
/**
* Set the application commit flag.
*
@@ -330,7 +348,7 @@ public class Response
public boolean isAppCommitted() {
return (this.appCommitted || isCommitted() || isSuspended()
|| ((getContentLength() > 0)
-&& (getContentCount() >= getContentLength(;
+&& (getContentWritten() >= getContentLength(;
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1056298&r1=1056297&r2=1056298&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Fri Jan 7
13:01:00 2011
@@ -1049,7 +1049,7 @@ public class AccessLogValve extends Valv
@Override
public void addElement(StringBuilder buf, Date date, Request request,
Response response, long time) {
-long length = response.getContentCount() ;
+long length = response.getBytesWritten(true);
if (length <= 0 && conversion) {
buf.append('-');
} else {
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1056298&r1=1056297&r2=1056298&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Fri Jan
7 13:01:00 2011
@@ -157,7 +157,7 @@ public class ErrorReportValve extends Va
// Do nothing on a 1xx, 2xx and 3xx status
// D
DO NOT REPLY [Bug 50496] AccessLogValve not logging size correctly for %B with enabled compression
https://issues.apache.org/bugzilla/show_bug.cgi?id=50496 --- Comment #2 from Mark Thomas 2011-01-07 08:01:31 EST --- This is fixed in 7.0.x and will be included in 7.0.6 onwards. The changes required were simple but extensive. I am leaning towards WONTFIX for 6.0.x and earlier. -- 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: r1056310 - /tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Author: markt Date: Fri Jan 7 13:26:33 2011 New Revision: 1056310 URL: http://svn.apache.org/viewvc?rev=1056310&view=rev Log: Put sleep in right place for test to pass. With acceptCount of 1 need a short delay else connections get rejected as Tomcat doesn't process incoming connections fast enough (on 8-core machine) Modified: tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java Modified: tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1056310&r1=1056309&r2=1056310&view=diff == --- tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java (original) +++ tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java Fri Jan 7 13:26:33 2011 @@ -47,6 +47,7 @@ public class TestMaxConnections extends } for (int i=0; i
Re: svn commit: r1050249 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11NioProtocol.java webapps/docs/changelog.xml
Is it worth being ported to 6.0? It looks so, though have not reviewed
it in detail yet.
2010/12/17 :
> Author: markt
> Date: Fri Dec 17 00:17:18 2010
> New Revision: 1050249
>
> URL: http://svn.apache.org/viewvc?rev=1050249&view=rev
> Log:
> Fix massive memory leak in NIO connector. Http11NioProcessor objects were not
> being recycled.
>
> Modified:
> tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1050249&r1=1050248&r2=1050249&view=diff
> ==
> --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
> (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Dec
> 17 00:17:18 2010
> @@ -244,6 +244,10 @@ public class Http11NioProtocol extends A
> log.debug("Done iterating through our connections to release
> a socket channel:"+socket +" released:"+released);
> }
>
> + /**
> + * Use this only if the processor is not available, otherwise use
> + * {...@link #release(NioChannel, Http11NioProcessor).
> + */
> @Override
> public void release(NioChannel socket) {
> Http11NioProcessor result = connections.remove(socket);
> @@ -253,6 +257,14 @@ public class Http11NioProtocol extends A
> }
> }
>
> +
> + public void release(NioChannel socket, Http11NioProcessor processor)
> {
> + connections.remove(socket);
> + processor.recycle();
> + recycledProcessors.offer(processor);
> + }
> +
> +
> @Override
> public SocketState event(NioChannel socket, SocketStatus status) {
> Http11NioProcessor processor = connections.get(socket);
> @@ -294,7 +306,7 @@ public class Http11NioProtocol extends A
> state = processor.asyncPostProcess();
> }
> if (state == SocketState.OPEN || state ==
> SocketState.CLOSED) {
> - release(socket);
> + release(socket, processor);
> if (state == SocketState.OPEN) {
> socket.getPoller().add(socket);
> }
> @@ -362,11 +374,11 @@ public class Http11NioProtocol extends A
> } else if (state == SocketState.OPEN){
> // In keep-alive but between requests. OK to recycle
> // processor. Continue to poll for the next request.
> - release(socket);
> + release(socket, processor);
> socket.getPoller().add(socket);
> } else {
> // Connection closed. OK to recycle the processor.
> - release(socket);
> + release(socket, processor);
> }
> return state;
>
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1050249&r1=1050248&r2=1050249&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Fri Dec 17 00:17:18 2010
> @@ -175,6 +175,10 @@
> Connector.stop(). This fix also includes further
> Lifecycle
> refactoring for Connectors and associated components. (markt)
>
> +
> + Remove a huge memory leak in the NIO connector introduced by the fix
> + for 49884. (markt)
> +
>
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056340 - in /tomcat/trunk/test/org/apache/catalina: filters/TestRemoteIpFilter.java valves/TestRemoteIpValve.java
Author: markt
Date: Fri Jan 7 14:56:50 2011
New Revision: 1056340
URL: http://svn.apache.org/viewvc?rev=1056340&view=rev
Log:
Fix tests after regex changes
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
Modified: tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java?rev=1056340&r1=1056339&r2=1056340&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java Fri
Jan 7 14:56:50 2011
@@ -246,7 +246,7 @@ public class TestRemoteIpFilter extends
// PREPARE
FilterDef filterDef = new FilterDef();
-filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
+filterDef.addInitParameter("internalProxies",
"192\\.168\\.0\\.10|192\\.168\\.0\\.11");
filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
@@ -278,8 +278,8 @@ public class TestRemoteIpFilter extends
// PREPARE
RemoteIpFilter remoteIpFilter = new RemoteIpFilter();
FilterDef filterDef = new FilterDef();
-filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
-filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
+filterDef.addInitParameter("internalProxies",
"192\\.168\\.0\\.10|192\\.168\\.0\\.11");
+filterDef.addInitParameter("trustedProxies", "proxy1|proxy2|proxy3");
filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
@@ -311,8 +311,8 @@ public class TestRemoteIpFilter extends
// PREPARE
FilterDef filterDef = new FilterDef();
-filterDef.addInitParameter("internalProxies", "127\\.0\\.0\\.1,
192\\.168\\..*, another-internal-proxy");
-filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
+filterDef.addInitParameter("internalProxies",
"127\\.0\\.0\\.1|192\\.168\\..*|another-internal-proxy");
+filterDef.addInitParameter("trustedProxies", "proxy1|proxy2|proxy3");
filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
@@ -344,8 +344,8 @@ public class TestRemoteIpFilter extends
// PREPARE
FilterDef filterDef = new FilterDef();
-filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
-filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
+filterDef.addInitParameter("internalProxies",
"192\\.168\\.0\\.10|192\\.168\\.0\\.11");
+filterDef.addInitParameter("trustedProxies", "proxy1|proxy2|proxy3");
filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
@@ -406,8 +406,8 @@ public class TestRemoteIpFilter extends
public void testInvokeUntrustedProxyInTheChain() throws Exception {
// PREPARE
FilterDef filterDef = new FilterDef();
-filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
-filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3");
+filterDef.addInitParameter("internalProxies",
"192\\.168\\.0\\.10|192\\.168\\.0\\.11");
+filterDef.addInitParameter("trustedProxies", "proxy1|proxy2|proxy3");
filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for");
filterDef.addInitParameter("proxiesHeader", "x-forwarded-by");
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java?rev=1056340&r1=1056339&r2=1056340&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Fri Jan
7 14:56:50 2011
@@ -131,8 +131,8 @@ public class TestRemoteIpValve extends T
// PREPARE
RemoteIpValve remoteIpValve = new RemoteIpValve();
-remoteIpValve.setInternalProxies("192\\.168\\.0\\.10,
192\\.168\\.0\\.11");
-remoteIpValve.setTrustedProxies("proxy1, proxy2, proxy3");
+
remoteIpValve.setInternalProxies("192\\.168\\.0\\.10|192\\.168\\.0\\.11");
+remoteIpValve.setTrustedProxies("proxy1
svn commit: r1056344 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
Author: markt
Date: Fri Jan 7 15:16:44 2011
New Revision: 1056344
URL: http://svn.apache.org/viewvc?rev=1056344&view=rev
Log:
Update tests now name only cookies are not accepted by default
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=1056344&r1=1056343&r2=1056344&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Fri Jan 7
15:16:44 2011
@@ -27,16 +27,16 @@ public class TestCookies extends TestCas
test("foo=bar;a=b;", "foo", "bar", "a", "b");
test("foo=bar;a=b; ", "foo", "bar", "a", "b");
test("foo=bar;a=b; ;", "foo", "bar", "a", "b");
-test("foo=;a=b; ;", "foo", "", "a", "b");
-test("foo;a=b; ;", "foo", "", "a", "b");
+test("foo=;a=b; ;", "a", "b");
+test("foo;a=b; ;", "a", "b");
// v1
test("$Version=1; foo=bar;a=b", "foo", "bar", "a", "b");
// OK
test("$Version=1;foo=bar;a=b; ; ", "foo", "bar", "a", "b");
-test("$Version=1;foo=;a=b; ; ", "foo", "", "a", "b");
-test("$Version=1;foo= ;a=b; ; ", "foo", "", "a", "b");
-test("$Version=1;foo;a=b; ; ", "foo", "", "a", "b");
+test("$Version=1;foo=;a=b; ; ", "a", "b");
+test("$Version=1;foo= ;a=b; ; ", "a", "b");
+test("$Version=1;foo;a=b; ; ", "a", "b");
test("$Version=1;foo=\"bar\";a=b; ; ", "foo", "bar", "a", "b");
test("$Version=1;foo=\"bar\";$Domain=apache.org;a=b", "foo", "bar",
"a", "b");
@@ -69,26 +69,26 @@ public class TestCookies extends TestCas
test("$Version=1;foo=\"bar\";$Domain=apache.org;$Port=8080;a=b",
"foo", "bar", "a", "b");
// Test name-only at the end of the header
-test("foo;a=b;bar", "foo", "", "a", "b", "bar", "");
-test("foo;a=b;bar;", "foo", "", "a", "b", "bar", "");
-test("foo;a=b;bar ", "foo", "", "a", "b", "bar", "");
-test("foo;a=b;bar ;", "foo", "", "a", "b", "bar", "");
+test("foo;a=b;bar", "a", "b");
+test("foo;a=b;bar;", "a", "b");
+test("foo;a=b;bar ", "a", "b");
+test("foo;a=b;bar ;", "a", "b");
// Multiple delimiters next to each other
// BUG -- the ' ' needs to be skipped.
-test("foo;a=b; ;bar", "foo", "", "a", "b", "bar", "");
+test("foo;a=b; ;bar", "a", "b");
// BUG -- ';' needs skipping
-test("foo;a=b;;bar", "foo", "", "a", "b", "bar", "");
-test("foo;a=b; ;;bar=rab", "foo", "", "a", "b", "bar", "rab");
+test("foo;a=b;;bar", "a", "b");
+test("foo;a=b; ;;bar=rab", "a", "b", "bar", "rab");
// These pass currently
-test("foo;a=b;; ;bar=rab", "foo", "", "a", "b", "bar", "rab");
+test("foo;a=b;; ;bar=rab", "a", "b", "bar", "rab");
// '#' is a valid cookie name (not a separator)
-test("foo;a=b;;#;bar=rab","foo", "", "a", "b", "#", "", "bar", "rab");
+test("foo;a=b;;#;bar=rab","a", "b", "bar", "rab");
-test("foo;a=b;;\\;bar=rab", "foo", "", "a", "b", "bar", "rab");
+test("foo;a=b;;\\;bar=rab", "a", "b", "bar", "rab");
// Try all the separators of version1 in version0 cookie.
// Won't work we only parse version1 cookie result 1 cookie.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50552] Ant Tasks give a null pointer exception when an error occurs, masking true error
https://issues.apache.org/bugzilla/show_bug.cgi?id=50552 --- Comment #7 from Christopher Schultz 2011-01-07 10:35:59 EST --- (In reply to comment #6) > Fixed in 7.0.x for 7.0.6 using Chris S's first proposal. I hadn't taken enough time to determine if that fix (adding the null check, right?) would be appropriate, since other streams in the redirector may have been open, and a call to complete() might be in order. If you've checked them out, then I'm happy. -- 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: r1056386 - /tomcat/trunk/build.properties.default
Author: mturk
Date: Fri Jan 7 16:45:31 2011
New Revision: 1056386
URL: http://svn.apache.org/viewvc?rev=1056386&view=rev
Log:
Update daemon to 1.0.5
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1056386&r1=1056385&r2=1056386&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri Jan 7 16:45:31 2011
@@ -144,7 +144,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
# - Commons Daemon, version 1.0-Alpha or later -
-commons-daemon.version=1.0.4
+commons-daemon.version=1.0.5
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
commons-daemon.native.win.home=${commons-daemon.home}/windows
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056387 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Fri Jan 7 16:47:53 2011 New Revision: 1056387 URL: http://svn.apache.org/viewvc?rev=1056387&view=rev Log: Propose Commons Daemon update to 1.0.5 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=1056387&r1=1056386&r2=1056387&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 16:47:53 2011 @@ -311,3 +311,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1056264&view=rev +1: markt -1: + +* Upgrade Commons Daemon to version 1.0.5 + Fixes various Windows platform issues. + Patch is trivial so not provided. + +1: mturk + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056389 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: mturk Date: Fri Jan 7 16:49:49 2011 New Revision: 1056389 URL: http://svn.apache.org/viewvc?rev=1056389&view=rev Log: Propose Commons Daemon update to 1.0.5 Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1056389&r1=1056388&r2=1056389&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Jan 7 16:49:49 2011 @@ -113,4 +113,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1055975&view=rev +1: markt -1: - \ No newline at end of file + +* Upgrade Commons Daemon to version 1.0.5 + Fixes various Windows platform issues. + Patch is trivial so not provided. + +1: mturk + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure of tomcat-trunk on ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1074 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: Build Source Stamp: [branch tomcat/trunk] 1056386 Blamelist: mturk BUILD FAILED: failed compile sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
tagging TC 6.0.30 on Monday
Hi, I plan to tag 6.0.30 on Monday, please complain if you disagree. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056403 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Fri Jan 7 17:25:48 2011 New Revision: 1056403 URL: http://svn.apache.org/viewvc?rev=1056403&view=rev Log: my 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=1056403&r1=1056402&r2=1056403&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 17:25:48 2011 @@ -309,11 +309,11 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50552 Avoid NPE that hides error message http://svn.apache.org/viewvc?rev=1056264&view=rev - +1: markt + +1: markt, jfclere -1: * Upgrade Commons Daemon to version 1.0.5 Fixes various Windows platform issues. Patch is trivial so not provided. - +1: mturk + +1: mturk, jfclere -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056411 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/ELFunctionMapper.java webapps/docs/changelog.xml
Author: markt Date: Fri Jan 7 17:46:32 2011 New Revision: 1056411 URL: http://svn.apache.org/viewvc?rev=1056411&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49555 Correctly handle tag libraries that use functions defined in static inner classes 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/ELFunctionMapper.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 7 17:46:32 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,962865,962872,962881,962900,963865,963868,964614,966177-966178,966292,966692,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1037715,1037794,1037887,1037924,1038041,1044987 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753
DO NOT REPLY [Bug 49555] Custom Taglibs should support all parameters
https://issues.apache.org/bugzilla/show_bug.cgi?id=49555 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2011-01-07 12:46:40 EST --- This has been fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056414 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11AprProcessor.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jan 7 17:49:20 2011
New Revision: 1056414
URL: http://svn.apache.org/viewvc?rev=1056414&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
Return IP address rather than null for getRemoteHost() and the APR connector
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.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=1056414&r1=1056413&r2=1056414&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 17:49:20 2011
@@ -275,12 +275,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, fhanik, funkman
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
- Return IP address rather than null for getRemoteHost() and the APR connector
- http://people.apache.org/~markt/patches/2011-01-06-bug47319-tc6.patch
- +1: markt, fhanik, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
Requests for a newly created directory using MKCOL should not result in a 404
http://svn.apache.org/viewvc?rev=1055975&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1056414&r1=1056413&r2=1056414&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Fri Jan 7 17:49:20 2011
@@ -1084,6 +1084,9 @@ public class Http11AprProcessor implemen
try {
long sa = Address.get(Socket.APR_REMOTE, socket);
remoteHost = Address.getnameinfo(sa, 0);
+if (remoteHost == null) {
+remoteHost = Address.getip(sa);
+}
} catch (Exception e) {
log.warn(sm.getString("http11processor.socket.info"), e);
}
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=1056414&r1=1056413&r2=1056414&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 17:49:20 2011
@@ -192,6 +192,11 @@
+47913: Return the IP address rather than null for
+getRemoteHost() with the APR connector if the IP address
+does not resolve. (markt)
+
+
Avoid a NPE for APR connector unlockAccept with default soTimeout.
(mturk)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47319] With APR, getRemoteHost() returns NULL for unknown clients
https://issues.apache.org/bugzilla/show_bug.cgi?id=47319 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2011-01-07 12:49:33 EST --- This has been fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056426 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/config.ini res/jvm.ini res/main.ico res/tomcat.nsi res/uninst.ico webapps/docs/changelog.xml
Author: markt Date: Fri Jan 7 18:00:28 2011 New Revision: 1056426 URL: http://svn.apache.org/viewvc?rev=1056426&view=rev Log: * Backport Windows installer improvements from Tomcat 7.0.5. - Use *modern* types of nsis install/uninstall icons (r76, mturk) - Create service-install.log file during installation with params that were used to invoke commons daemon. (r1003840, mturk; r1035083,r1035088 kkolinko) - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50140 Don't ignore a user specified install directory on 64-bit platforms. - Allow 32-bit or 64-bit JVMs to be selected when installing on a 64-bit platform. (r1027504, markt; r1033856,r1033882 kkolinko) - Reimplemented the Windows installer GUI using nsDialogs and MUI2 libraries, instead of deprecated InstallOptions. The *.ini files are no more used. All is specified in the nsi script. (r1034911, kkolinko) - Use new admin-gui and manager-gui roles for the user (r982151, mturk) - Add a field to display/edit the roles for the user that we add to tomcat-user.xml - The roles are calculated depending on what webapps are installed (only manager, vs. host-manager, vs. both of them). - Do not display "username", "password", "roles" fields when neither manager nor host-manager are selected. In the previous version we showed them as disabled. Now we do not show them on screen. - Add support for the '/?' command line option. It displays a message box. See .onInit function in tomcat.nsi for details. (r1034911, kkolinko) - When installing on Windows, do not leave undeleted stale files in $TEMP/src/res/confinstall/. Pack only needed fines, not duplicates. Place those files into $PLUGINSDIR instead of $TEMP. - Add DetailPrint statements for operations that take noticeable time. (r1034924, kkolinko) - Improve descriptions of the components. (r964211, r1035051) Added: tomcat/tc6.0.x/trunk/res/main.ico - copied unchanged from r1056404, tomcat/trunk/res/main.ico tomcat/tc6.0.x/trunk/res/uninst.ico - copied unchanged from r1056404, tomcat/trunk/res/uninst.ico Removed: tomcat/tc6.0.x/trunk/res/config.ini tomcat/tc6.0.x/trunk/res/jvm.ini Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/tomcat.nsi 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=1056426&r1=1056425&r2=1056426&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 18:00:28 2011 @@ -99,68 +99,6 @@ PATCHES PROPOSED TO BACKPORT: kkolinko: Discussed in Re:r1005192 thread on dev@ -* Backport Windows installer improvements from Tomcat 7.0.5. - - - Use *modern* types of nsis install/uninstall icons (r76, mturk) - - - Create service-install.log file during installation with params that - were used to invoke commons daemon. (r1003840, mturk; r1035083,r1035088 kkolinko) - - - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50140 - Don't ignore a user specified install directory on 64-bit platforms. - - Allow 32-bit or 64-bit JVMs to be selected when installing on a 64-bit - platform. - (r1027504, markt; r1033856,r1033882 kkolinko) - - - Reimplemented the Windows installer GUI using nsDialogs and MUI2 libraries, - instead of deprecated InstallOptions. - The *.ini files are no more used. All is specified in the nsi script. - (r1034911, kkolinko) - - - Use new admin-gui and manager-gui roles for the user (r982151, mturk) - - - Add a field to display/edit the roles for the user that we add to tomcat-user.xml - - The roles are calculated depending on what webapps are installed - (only manager, vs. host-manager, vs. both of them). - - Do not display "username", "password", "roles" fields when neither - manager nor host-manager are selected. In the previous version we showed - them as disabled. Now we do not show them on screen. - - Add support for the '/?' command line option. It displays a message box. - See .onInit function in tomcat.nsi for details. - (r1034911, kkolinko) - - - When installing on Windows, do not leave undeleted stale files in - $TEMP/src/res/confinstall/. Pack only needed fines, not duplicates. - Place those files into $PLUGINSDIR instead of $TEMP. - - Add DetailPrint statements for operations that take noticeable time. - (r1034924, kkolinko) - - - Improve descriptions of the components. - (r964211, r1035051) - - Backported revisions: - 964211,982151,982157,76,1003840,1027504,1033856,1033882,1034911,1034924, - 1034926,1035051,1035062,1035068,1035071,1035083,1035088,1035093,1035094, - 1035132, 1038975 - - 1. Run the following SVN commands: - svn del res/config.ini - svn del res/jvm.ini - svn del res/main.ico - svn del res/uninst.ico - # copy icons from TC7, see r76 - svn copy ../../trunk/res/ma
DO NOT REPLY [Bug 50140] Silent installation into wrong target directory
https://issues.apache.org/bugzilla/show_bug.cgi?id=50140 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2011-01-07 13:01:02 EST --- This (and a whole bunch of other improvements) has been applied to 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1056244 - in /tomcat/trunk: java/org/apache/naming/java/javaURLContextFactory.java res/findbugs/filter-false-positives.xml webapps/docs/changelog.xml
On 7 January 2011 10:32, wrote:
> Author: markt
> Date: Fri Jan 7 10:31:59 2011
> New Revision: 1056244
>
> URL: http://svn.apache.org/viewvc?rev=1056244&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50554
> Various FindBugs / Eclipse warnings
> Silence the false positives
>
> Modified:
> tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java
> tomcat/trunk/res/findbugs/filter-false-positives.xml
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified: tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java?rev=1056244&r1=1056243&r2=1056244&view=diff
> ==
> --- tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java
> (original)
> +++ tomcat/trunk/java/org/apache/naming/java/javaURLContextFactory.java Fri
> Jan 7 10:31:59 2011
> @@ -80,6 +80,8 @@ public class javaURLContextFactory
> /**
> * Crete a new Context's instance.
> */
> + �...@suppresswarnings("unchecked")
It would be helpful to document which line(s) generate the warning,
and why it is safe to suppress it.
Ideally also localise the annotation to the specific line(s) that
causes the warning.
This can usually be done by adding a temporary local variable.
At present the suppression applies to the whole method, so subsequent
additions of "unchecked" casts won't be detected.
> + �...@override
> public Object getObjectInstance(Object obj, Name name, Context nameCtx,
> Hashtable environment)
> throws NamingException {
> @@ -94,6 +96,8 @@ public class javaURLContextFactory
> /**
> * Get a new (writable) initial context.
> */
> + �...@suppresswarnings("unchecked")
Ditto.
> + �...@override
> public Context getInitialContext(Hashtable environment)
> throws NamingException {
> if (ContextBindings.isThreadBound() ||
> @@ -105,7 +109,7 @@ public class javaURLContextFactory
>
> // If the thread is not bound, return a shared writable context
> if (initialContext == null) {
> - synchronized(getClass()) {
> + synchronized(javaURLContextFactory.class) {
> if (initialContext == null) {
> initialContext = new NamingContext(
> (Hashtable)environment, MAIN);
>
> Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1056244&r1=1056243&r2=1056244&view=diff
> ==
> --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
> +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Jan 7 10:31:59
> 2011
> @@ -5,6 +5,10 @@
>
>
>
> +
> +
> +
> +
>
>
>
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1056244&r1=1056243&r2=1056244&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 7 10:31:59 2011
> @@ -193,6 +193,9 @@
> ensure that a subsequent request for that directory does not result
> in a
> 404 response. (markt)
>
> +
> + 50554: Code clean up. (markt)
> +
>
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056434 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Fri Jan 7 18:13:38 2011
New Revision: 1056434
URL: http://svn.apache.org/viewvc?rev=1056434&view=rev
Log:
Fix security exception when running Servlet TCK
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1056434&r1=1056433&r2=1056434&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Fri
Jan 7 18:13:38 2011
@@ -231,6 +231,7 @@ public final class SecurityClassLoad {
basePackage + "util.http.FastHttpDateFormat");
clazz.newInstance();
loader.loadClass(basePackage + "util.http.HttpMessages");
+loader.loadClass(basePackage + "util.net.Constants");
loader.loadClass(basePackage + "util.net.SSLSupport$CipherData");
loader.loadClass
(basePackage + "util.net.JIoEndpoint$PrivilegedSetTccl");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056442 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardEngine.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jan 7 18:26:09 2011
New Revision: 1056442
URL: http://svn.apache.org/viewvc?rev=1056442&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50201
Handle ROOT webapp redeployment, host start/stop etc for default access log
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.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=1056442&r1=1056441&r2=1056442&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 18:26:09 2011
@@ -127,12 +127,6 @@ PATCHES PROPOSED TO BACKPORT:
-0: markt - Patch doesn't apply cleanly to tc6.0.x/trunk
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50201
- Handle ROOT webapp redeployment, host start/stop etc for default access log
- http://people.apache.org/~kkolinko/patches/2010-12-07_tc6_bug50201.patch
- +1: kkolinko, markt, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48973
Avoid creating file SESSIONS.ser if there's no session.
The patch provided by Marc Guillemot works for tc 6 & 7
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1056442&r1=1056441&r2=1056442&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java Fri
Jan 7 18:26:09 2011
@@ -19,8 +19,11 @@
package org.apache.catalina.core;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
@@ -28,10 +31,15 @@ import javax.management.ObjectName;
import org.apache.catalina.AccessLog;
import org.apache.catalina.Container;
+import org.apache.catalina.ContainerEvent;
+import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Realm;
import org.apache.catalina.Service;
import org.apache.catalina.connector.Request;
@@ -132,7 +140,8 @@ public class StandardEngine
* Default access log to use for request/response pairs where we can't ID
* the intended host and context.
*/
-private volatile AccessLog defaultAccessLog;
+private final AtomicReference defaultAccessLog =
+new AtomicReference();
// - Properties
@@ -496,28 +505,59 @@ public class StandardEngine
}
if (!logged && useDefault) {
-if (defaultAccessLog == null) {
+AccessLog newDefaultAccessLog = defaultAccessLog.get();
+if (newDefaultAccessLog == null) {
// If we reached this point, this Engine can't have an
AccessLog
// Look in the defaultHost
Host host = (Host) findChild(getDefaultHost());
-if (host != null) {
-defaultAccessLog = host.getAccessLog();
+Context context = null;
+boolean checkHost = (host != null);
+if (checkHost && host instanceof ContainerBase) {
+checkHost = ((ContainerBase) host).started;
+}
+if (checkHost) {
+newDefaultAccessLog = host.getAccessLog();
-if (defaultAccessLog == null) {
+if (newDefaultAccessLog != null) {
+if (defaultAccessLog.compareAndSet(null,
+newDefaultAccessLog)) {
+AccessLogListener l = new AccessLogListener(this,
+host, null);
+l.install();
+}
+} else {
// Try the ROOT context of default host
-Context context = (Context) host.findChild("");
-if (context != null) {
-defaultAccessLog = context.getAccessLog();
+context = (Context) host.findChild("");
+boolean checkContext = (context != null);
+if (checkContext && cont
DO NOT REPLY [Bug 50201] StandardEngine.defaultAccessLog may become stale when ROOT webapp is redeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=50201 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2011-01-07 13:26:14 EST --- Fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056445 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jan 7 18:28:40 2011
New Revision: 1056445
URL: http://svn.apache.org/viewvc?rev=1056445&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50453
Correctly handle multiple X-Forwarded-For headers in RemoteIpValve
Patch provided by Jim Riggs
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.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=1056445&r1=1056444&r2=1056445&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 18:28:40 2011
@@ -201,12 +201,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: fhanik - fix indentation
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50453
- Correct handle multiple X-Forwarded-For headers in RemoteIpValve
-
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?r1=1055482&r2=1055481&pathrev=1055482
- +1: markt, fhanik, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
Requests for a newly created directory using MKCOL should not result in a 404
http://svn.apache.org/viewvc?rev=1055975&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1056445&r1=1056444&r2=1056445&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Fri
Jan 7 18:28:40 2011
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -558,8 +559,17 @@ public class RemoteIpValve extends Valve
String remoteIp = null;
// In java 6, proxiesHeaderValue should be declared as a
java.util.Deque
LinkedList proxiesHeaderValue = new LinkedList();
+StringBuffer concatRemoteIpHeaderValue = new StringBuffer();
-String[] remoteIpHeaderValue =
commaDelimitedListToStringArray(request.getHeader(remoteIpHeader));
+for (Enumeration e = request.getHeaders(remoteIpHeader);
e.hasMoreElements();) {
+if (concatRemoteIpHeaderValue.length() > 0) {
+concatRemoteIpHeaderValue.append(", ");
+}
+
+concatRemoteIpHeaderValue.append(e.nextElement());
+}
+
+String[] remoteIpHeaderValue =
commaDelimitedListToStringArray(concatRemoteIpHeaderValue.toString());
int idx;
// loop on remoteIpHeaderValue to find the first trusted remote ip
and to build the proxies chain
for (idx = remoteIpHeaderValue.length - 1; idx >= 0; idx--) {
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=1056445&r1=1056444&r2=1056445&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 18:28:40 2011
@@ -185,6 +185,10 @@
exceptions. (markt)
+50453: Correctly handle multiple
X-Forwarded-For
+headers in the RemoteIpValve. Patch provided by Jim Riggs. (markt)
+
+
50459: Fix thread/classloader binding issues in
StandardContext. (slaurent)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50453] Multiple X-Forwarded-For headers not handled by RemoteIP valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=50453 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #14 from Mark Thomas 2011-01-07 13:28:50 EST --- Fixed in Tomcat 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50467] Occasional NIO connector lockups on high load
https://issues.apache.org/bugzilla/show_bug.cgi?id=50467 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2011-01-07 13:40:10 EST --- Fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056451 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/el/lang/ELArithmetic.java java/org/apache/tomcat/util/net/NioEndpoint.java test/org/apache/el/lang/TestELArithmetic.java
Author: markt Date: Fri Jan 7 18:43:39 2011 New Revision: 1056451 URL: http://svn.apache.org/viewvc?rev=1056451&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50500 Use correct coercions for EL arithmetic operations. Based on a patch by Brian Weisleder Added: tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java - copied unchanged from r1055055, tomcat/trunk/test/org/apache/el/lang/TestELArithmetic.java Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 7 18:43:39 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1037715,1037794,1037887,1037924,1038041,1044987 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,72
DO NOT REPLY [Bug 50500] EL evaluation of floating-point String value vs BigInteger loses precision
https://issues.apache.org/bugzilla/show_bug.cgi?id=50500 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2011-01-07 13:43:55 EST --- Fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1056445 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml
On 7 January 2011 18:28, wrote:
> Author: markt
> Date: Fri Jan 7 18:28:40 2011
> New Revision: 1056445
>
> URL: http://svn.apache.org/viewvc?rev=1056445&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50453
> Correctly handle multiple X-Forwarded-For headers in RemoteIpValve
> Patch provided by Jim Riggs
>
> Modified:
> tomcat/tc6.0.x/trunk/STATUS.txt
> tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.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=1056445&r1=1056444&r2=1056445&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/STATUS.txt (original)
> +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 18:28:40 2011
> @@ -201,12 +201,6 @@ PATCHES PROPOSED TO BACKPORT:
> +1: fhanik - fix indentation
> -1:
>
> -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50453
> - Correct handle multiple X-Forwarded-For headers in RemoteIpValve
> -
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?r1=1055482&r2=1055481&pathrev=1055482
> - +1: markt, fhanik, funkman
> - -1:
> -
> * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
> Requests for a newly created directory using MKCOL should not result in a
> 404
> http://svn.apache.org/viewvc?rev=1055975&view=rev
>
> Modified:
> tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1056445&r1=1056444&r2=1056445&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
> (original)
> +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
> Fri Jan 7 18:28:40 2011
> @@ -19,6 +19,7 @@ package org.apache.catalina.valves;
>
> import java.io.IOException;
> import java.util.ArrayList;
> +import java.util.Enumeration;
> import java.util.Iterator;
> import java.util.LinkedList;
> import java.util.List;
> @@ -558,8 +559,17 @@ public class RemoteIpValve extends Valve
> String remoteIp = null;
> // In java 6, proxiesHeaderValue should be declared as a
> java.util.Deque
> LinkedList proxiesHeaderValue = new LinkedList();
> + StringBuffer concatRemoteIpHeaderValue = new StringBuffer();
Surely could use StringBuilder here?
> - String[] remoteIpHeaderValue =
> commaDelimitedListToStringArray(request.getHeader(remoteIpHeader));
> + for (Enumeration e = request.getHeaders(remoteIpHeader);
> e.hasMoreElements();) {
> + if (concatRemoteIpHeaderValue.length() > 0) {
> + concatRemoteIpHeaderValue.append(", ");
> + }
> +
> + concatRemoteIpHeaderValue.append(e.nextElement());
> + }
> +
> + String[] remoteIpHeaderValue =
> commaDelimitedListToStringArray(concatRemoteIpHeaderValue.toString());
> int idx;
> // loop on remoteIpHeaderValue to find the first trusted remote
> ip and to build the proxies chain
> for (idx = remoteIpHeaderValue.length - 1; idx >= 0; idx--) {
>
> 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=1056445&r1=1056444&r2=1056445&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 18:28:40 2011
> @@ -185,6 +185,10 @@
> exceptions. (markt)
>
>
> + 50453: Correctly handle multiple
> X-Forwarded-For
> + headers in the RemoteIpValve. Patch provided by Jim Riggs. (markt)
> +
> +
> 50459: Fix thread/classloader binding issues in
> StandardContext. (slaurent)
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FAQ/Performance_and_Monitori ng" by MichaelCzeiszperger
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FAQ/Performance_and_Monitoring" page has been changed by MichaelCzeiszperger. http://wiki.apache.org/tomcat/FAQ/Performance_and_Monitoring?action=diff&rev1=7&rev2=8 -- <>'''Is there a comprehensive, up-to-date, detailed benchmark comparing various servlet containers, including Tomcat?''' - Yes. Here's the most comprehensive and objective one we've found to date: [[http://www.webperformanceinc.com/library/reports/ServletReport/|Web Performance, Inc.'s comparison]]. + Yes. Here's the most comprehensive and objective one we've found to date: [[http://www.webperformance.com/library/reports/ServletReport/|Web Performance, Inc.'s comparison]]. <> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: ThreadLocal Clear References Problem
>>>So, you are stopping a second application from the code shown in the >>>bug? Yes. >>>Can you post a working example? I will try to attach a simple JSF application. Thanks; --Gurkan - Original Message From: Christopher Schultz To: Tomcat Developers List Sent: Thu, January 6, 2011 7:32:10 PM Subject: Re: ThreadLocal Clear References Problem Gurkan, On 1/6/2011 7:08 AM, Gurkan Erdogdu wrote: > Could you see the problem in >https://issues.apache.org/jira/browse/MYFACES-3006? So, you are stopping a second application from the code shown in the bug? Can you post a working example? -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056492 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Jan 7 20:26:17 2011 New Revision: 1056492 URL: http://svn.apache.org/viewvc?rev=1056492&view=rev Log: Correct a typo Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1056492&r1=1056491&r2=1056492&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 20:26:17 2011 @@ -439,7 +439,7 @@ on 64-bit platforms when using the Windows installer. (markt) -Numerous improvements to the Windows installar: update install/uninstall +Numerous improvements to the Windows installer: update install/uninstall icons, create an installation log, allow 32-bit JVMs to be selected when installing on a 64-bit platform, replace the .ini files with the script equivalents, use the new manager and host-manager roles, provide the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat JDBC Pool in Tomcat 6.0.x / 7.0.x
> I can run a vote for a release, people just need to check it out, and then > we can release it. +1 > Personally I like to see it as default for Tomcat 7, as it offers much > enhancements, and little disadvantages over dbcp > the code base is so small, that the interest in working on it, makes it a > bit harder Filip, will you also produce a Maven artifact ? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056500 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Jan 7 20:45:24 2011 New Revision: 1056500 URL: http://svn.apache.org/viewvc?rev=1056500&view=rev Log: Withdraw proposals. Manager & HostManager using httpOnly=true is fine with me (r1041251). Let's not force this option by default. Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1056500&r1=1056499&r2=1056500&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Jan 7 20:45:24 2011 @@ -42,13 +42,6 @@ PATCHES PROPOSED TO BACKPORT: -O: jim -1: -* Configure Tomcat to use HttpOnly for session cookies by default - http://people.apache.org/~kkolinko/patches/2010-04-21_tc55_context_httpOnly.patch - +1: kkolinko - -0: markt - Consensus was for disabled in 5.5.x - http://svn.apache.org/viewvc?view=revision&revision=749019 - -1: - * Backport Windows installer improvements from Tomcat 7.0.5. See TC 6 proposal for details (r1035106). Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1056500&r1=1056499&r2=1056500&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 20:45:24 2011 @@ -45,13 +45,6 @@ PATCHES PROPOSED TO BACKPORT: and fix it later if needed? I think that actually nobody besides the release manager uses this, so I am letting this pass. -* Configure Tomcat to use HttpOnly for session cookies by default - http://people.apache.org/~kkolinko/patches/2010-04-21_tc6_context_httpOnly.patch - +1: kkolinko - -0: markt - There wasn't consensus previously. -- If you are going to change the default, do it in the code - -1: - * Expose the new WebappLoader flag in the VirtualWebappLoader, but allow alternative name searchVirtualFirst to make it consistent with the "virtual" terminology. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1056451 - svn:log
Author: kkolinko Revision: 1056451 Modified property: svn:log Modified: svn:log at Fri Jan 7 21:08:19 2011 -- --- svn:log (original) +++ svn:log Fri Jan 7 21:08:19 2011 @@ -1,2 +1,4 @@ -Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50500 +1) Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50500 Use correct coercions for EL arithmetic operations. Based on a patch by Brian Weisleder +2) Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50467 +Avoid NPE that causes NIO poller to fail - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056511 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Jan 7 21:12:18 2011 New Revision: 1056511 URL: http://svn.apache.org/viewvc?rev=1056511&view=rev Log: Additional changelog entry for r1056451, where two issues were fixed in one commit. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1056511&r1=1056510&r2=1056511&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 21:12:18 2011 @@ -324,6 +324,12 @@ 50460: Fix memory leak in JspDocumentParser triggered by first access to a jspx page. (kkolinko) + +50500: Use correct coercions (as per the EL spec) for +arithmetic operations involving string values containing '.', +'e' or 'E'. Based on a patch by Brian Weisleder. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50560] New: StringBuffer => StringBuilder for internal buffer construction
https://issues.apache.org/bugzilla/show_bug.cgi?id=50560 Summary: StringBuffer => StringBuilder for internal buffer construction Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Created an attachment (id=26465) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26465) StringBuffer => Builder for internal buffers StringBuilder is cheaper than StringBuffer if synch. is not needed. -- 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: r1056546 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Jan 7 22:31:16 2011 New Revision: 1056546 URL: http://svn.apache.org/viewvc?rev=1056546&view=rev Log: Propose backport of 47319 fix to TC 5.5 Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1056546&r1=1056545&r2=1056546&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Jan 7 22:31:16 2011 @@ -113,3 +113,9 @@ PATCHES PROPOSED TO BACKPORT: +1: mturk -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319 + Return IP address rather than null for getRemoteHost() and the APR connector + http://svn.apache.org/viewvc?view=revision&revision=1056414 + (markt's patch) + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47319] With APR, getRemoteHost() returns NULL for unknown clients
https://issues.apache.org/bugzilla/show_bug.cgi?id=47319 --- Comment #4 from Konstantin Kolinko 2011-01-07 17:33:10 EST --- Proposed for 5.5.x as well. -- 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: r1056553 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java java/org/apache/catalina/core/LocalStrings.properties webapps/docs/changelog.xml webapps/doc
Author: slaurent
Date: Fri Jan 7 22:56:30 2011
New Revision: 1056553
URL: http://svn.apache.org/viewvc?rev=1056553&view=rev
Log:
bug 50556: improve JreMemoryLeakPreventionListener against leak caused by
LdapPoolManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=50556
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/listeners.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1056553&r1=1056552&r2=1056553&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Fri Jan 7 22:56:30 2011
@@ -35,6 +35,8 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
+import com.sun.jndi.ldap.LdapPoolManager;
+
/**
* Provide a workaround for known places where the Java Runtime environment can
* cause a memory leak or lock files.
@@ -162,6 +164,20 @@ public class JreMemoryLeakPreventionList
this.xmlParsingProtection = xmlParsingProtection;
}
+/**
+ * {...@link LdapPoolManager} spawns a thread when it is initialized if
the
+ * system property com.sun.jndi.ldap.connect.pool.timeout is
+ * greater than 0.
+ * That thread inherits the context class loader of the current thread, so
+ * that there my be a web application class loader leak if the web app
+ * is the first to use {...@link LdapPoolManager}.
+ */
+private boolean ldapPoolProtection = true;
+public boolean isLdapPoolProtection() { return ldapPoolProtection; }
+public void setLdapPoolProtection(boolean ldapPoolProtection) {
+this.ldapPoolProtection = ldapPoolProtection;
+}
+
@Override
public void lifecycleEvent(LifecycleEvent event) {
// Initialise these classes when Tomcat starts
@@ -358,6 +374,22 @@ public class JreMemoryLeakPreventionList
e);
}
}
+
+if (ldapPoolProtection) {
+try {
+Class.forName("com.sun.jndi.ldap.LdapPoolManager");
+} catch (ClassNotFoundException e) {
+if (System.getProperty("java.vendor").startsWith(
+"Sun")) {
+log.error(sm.getString(
+"jreLeakListener.ldapPoolManagerFail"), e);
+} else {
+log.debug(sm.getString(
+"jreLeakListener.ldapPoolManagerFail"), e);
+}
+}
+}
+
} finally {
Thread.currentThread().setContextClassLoader(loader);
}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1056553&r1=1056552&r2=1056553&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Fri Jan
7 22:56:30 2011
@@ -82,6 +82,7 @@ jreLeakListener.gcDaemonFail=Failed to t
jreLeakListener.jarUrlConnCacheFail=Failed to disable Jar URL connection
caching by default
jreLeakListener.xmlParseFail=Error whilst attempting to prevent memory leaks
during XML parsing
jreLeakListener.authPolicyFail=Error whilst attempting to prevent memory leak
in javax.security.auth.Policy class
+jreLeakListener.ldapPoolManagerFail=Failed to trigger creation of the
com.sun.jndi.ldap.LdapPoolManager class during Tomcat start to prevent possible
memory leaks. This is expected on non-Sun JVMs.
naming.wsdlFailed=Failed to find wsdl file: {0}
naming.bindFailed=Failed to bind object: {0}
naming.jmxRegistrationFailed=Failed to register in JMX: {0}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1056553&r1=1056552&r2=1056553&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 7 22:56:30 2011
@@ -200,6 +200,13 @@
50554: Code clean up. (markt)
+
+50556: Improve JreMemoryLeakPreventi
DO NOT REPLY [Bug 50556] improve JreMemoryLeakPreventionListener against leak caused by LdapPoolManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=50556 --- Comment #4 from Sylvain Laurent 2011-01-07 18:01:14 EST --- >I guess you'd only have to do it if com.sun.jndi.ldap.connect.pool.timeout > >0, though system properties can be changed at runtime, so it might be a good >idea to temporarily set it to 1 if it's currently 0, init the class, then set >it back. I don't think this is a good idea. This would force the leaking thread to be spawned even in cases where it is never spawned (if com.sun.jndi.ldap.connect.pool.timeout=0). This property is supposed to be set on the command line, so that it does not change at runtime. I committed the fix on trunk, will be ready for 7.0.6 -- 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: r1056557 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: slaurent Date: Fri Jan 7 23:17:36 2011 New Revision: 1056557 URL: http://svn.apache.org/viewvc?rev=1056557&view=rev Log: proposed bacport on tc 6 for bug 50556: improve JreMemoryLeakPreventionListener against leak caused by LdapPoolManager https://issues.apache.org/bugzilla/show_bug.cgi?id=50556 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=1056557&r1=1056556&r2=1056557&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 23:17:36 2011 @@ -203,3 +203,9 @@ PATCHES PROPOSED TO BACKPORT: Patch is trivial so not provided. +1: mturk, jfclere -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50556 + Improve JreMemoryLeakPreventionListener against leak caused by LdapPoolManager + Patch tc 6: http://people.apache.org/~slaurent/patches/2011-01-07_BZ50556_jre_leak_ldapPoolManager.patch + +1: slaurent + -1: \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50556] improve JreMemoryLeakPreventionListener against leak caused by LdapPoolManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=50556 Sylvain Laurent changed: What|Removed |Added Component|Catalina|Catalina Version|7.0.5 |6.0.29 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #5 from Sylvain Laurent 2011-01-07 18:19:57 EST --- proposed backport on Tomcat 6, moving this BZ issue to tomcat 6. -- 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 50518] jps.exe and jvisualvm.exe cannot detect tomcat using jdk1.6.0_23
https://issues.apache.org/bugzilla/show_bug.cgi?id=50518 --- Comment #9 from Konstantin Kolinko 2011-01-07 18:35:22 EST --- (In reply to comment #8) > I've added a known issues section to the FAQ. For reference: The known issues FAQ page is [1]. The Sun/Oracle bug page for this issue is [2]. [1] http://wiki.apache.org/tomcat/FAQ/KnownIssues#OracleJREIssues [2] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7009828 -- 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: r1056562 - in /tomcat/trunk: build.properties.default build.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Jan 7 23:54:54 2011
New Revision: 1056562
URL: http://svn.apache.org/viewvc?rev=1056562&view=rev
Log:
Provide two alternative locations for the libraries downloaded from the ASF web
site at build time. Use the main distribution site as default and the archive
one as fallback.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1056562&r1=1056561&r2=1056562&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri Jan 7 23:54:54 2011
@@ -52,8 +52,13 @@ compile.source=1.6
compile.target=1.6
compile.debug=true
-base-commons.loc=http://archive.apache.org/dist/commons
-base-tomcat.loc=http://archive.apache.org/dist/tomcat
+base-apache.loc.1=http://www.apache.org/dist
+base-apache.loc.2=http://archive.apache.org/dist
+base-commons.loc.1=${base-apache.loc.1}/commons
+base-commons.loc.2=${base-apache.loc.2}/commons
+base-tomcat.loc.1=${base-apache.loc.1}/tomcat
+base-tomcat.loc.2=${base-apache.loc.2}/tomcat
+
base-sf.loc=http://downloads.sourceforge.net
base-maven1.loc=http://repo1.maven.org/maven
@@ -68,7 +73,8 @@ base-maven1.loc=http://repo1.maven.org/m
# - servletapi
commons-logging.version=1.1.1
commons-logging.home=${base.path}/commons-logging-${commons-logging.version}
-commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
+commons-logging-src.loc.1=${base-commons.loc.1}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
+commons-logging-src.loc.2=${base-commons.loc.2}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
commons-logging-src.tar.gz=${commons-logging.home}/commons-logging-${commons-logging.version}-src.tar.gz
# - Avalon Framework (required by commons logging) -
@@ -120,8 +126,10 @@ jdt.loc.2=http://download.eclipse.org/ec
tomcat-native.version=1.1.20
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.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.dll.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.dll.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries
tomcat-native.dll.win32=${tomcat-native.home}/tcnative-1.dll.x86
tomcat-native.dll.x64=${tomcat-native.home}/tcnative-1.dll.x64
tomcat-native.dll.i64=${tomcat-native.home}/tcnative-1.dll.i64
@@ -129,11 +137,13 @@ tomcat-native.dll.i64=${tomcat-native.ho
# - Commons DBCP, version 1.1 or later -
commons-dbcp.version=1.4
commons-dbcp.home=${base.path}/commons-dbcp-1.4-src
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.4-src.tar.gz
+commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-1.4-src.tar.gz
+commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-1.4-src.tar.gz
# - Commons Pool, version 1.1 or later -
commons-pool.home=${base.path}/commons-pool-1.5.5-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.5-src.tar.gz
+commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-1.5.5-src.tar.gz
+commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-1.5.5-src.tar.gz
# - NSIS, version 2.0 or later -
nsis.home=${base.path}/nsis-2.46
@@ -151,9 +161,12 @@ commons-daemon.native.win.home=${commons
commons-daemon.native.win.mgr.exe=${commons-daemon.native.win.home}/prunmgr.exe
commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
-commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
-commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
-commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
+commons-daemon.bin.loc.1=${base-commons.loc.1}/daemon/binaries/${commons-da
svn commit: r1056569 - /tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
Author: kkolinko
Date: Sat Jan 8 00:22:56 2011
New Revision: 1056569
URL: http://svn.apache.org/viewvc?rev=1056569&view=rev
Log:
Folloup to r1055989
Add qualifiers to the fields of DataSourceLinkFactory.DataSourceHandler class.
Modified:
tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
Modified: tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java?rev=1056569&r1=1056568&r2=1056569&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java Sat
Jan 8 00:22:56 2011
@@ -91,9 +91,9 @@ public class DataSourceLinkFactory exten
* {...@link javax.sql.DataSource#getConnection(String, String)} with the
preconfigured username and password.
*/
public static class DataSourceHandler implements InvocationHandler {
-DataSource ds;
-String username;
-String password;
+private final DataSource ds;
+private final String username;
+private final String password;
public DataSourceHandler(DataSource ds, String username, String
password) {
this.ds = ds;
this.username = username;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build of tomcat-trunk on ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1078 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: Build Source Stamp: [branch tomcat/trunk] 1056569 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056576 - /tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Author: kkolinko
Date: Sat Jan 8 00:50:02 2011
New Revision: 1056576
URL: http://svn.apache.org/viewvc?rev=1056576&view=rev
Log:
Followup to r1056553
There should not be "import com.sun.jndi.ldap.LdapPoolManager;" as we must not
depend on that class at build time. Actually the import was used by JavaDoc
comments only.
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1056576&r1=1056575&r2=1056576&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Sat Jan 8 00:50:02 2011
@@ -35,8 +35,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-import com.sun.jndi.ldap.LdapPoolManager;
-
/**
* Provide a workaround for known places where the Java Runtime environment can
* cause a memory leak or lock files.
@@ -165,12 +163,12 @@ public class JreMemoryLeakPreventionList
}
/**
- * {...@link LdapPoolManager} spawns a thread when it is initialized if
the
- * system property com.sun.jndi.ldap.connect.pool.timeout is
- * greater than 0.
+ * com.sun.jndi.ldap.LdapPoolManager class spawns a thread
when it
+ * is initialized if the system property
+ * com.sun.jndi.ldap.connect.pool.timeout is greater than 0.
* That thread inherits the context class loader of the current thread, so
- * that there my be a web application class loader leak if the web app
- * is the first to use {...@link LdapPoolManager}.
+ * that there may be a web application class loader leak if the web app
+ * is the first to use LdapPoolManager.
*/
private boolean ldapPoolProtection = true;
public boolean isLdapPoolProtection() { return ldapPoolProtection; }
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056577 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jan 8 00:52:03 2011 New Revision: 1056577 URL: http://svn.apache.org/viewvc?rev=1056577&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=1056577&r1=1056576&r2=1056577&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jan 8 00:52:03 2011 @@ -177,7 +177,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50527 Improve error message http://svn.apache.org/viewvc?rev=1055236&view=rev - +1: markt, jfclere, fhanik, kfujino + +1: markt, jfclere, fhanik, kfujino, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550 @@ -190,12 +190,17 @@ PATCHES PROPOSED TO BACKPORT: * Add helper class to allow a shared data source with different credentials http://svn.apache.org/viewvc?view=revision&revision=1055989 +1: fhanik, funkman - -1: + -1: + 0: kkolinko (have not tested it with TC6 yet) + Additional patch: + http://svn.apache.org/viewvc?rev=1056569&view=rev + +1: kkolinko + -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50552 Avoid NPE that hides error message http://svn.apache.org/viewvc?rev=1056264&view=rev - +1: markt, jfclere + +1: markt, jfclere, kkolinko -1: * Upgrade Commons Daemon to version 1.0.5 @@ -208,4 +213,9 @@ PATCHES PROPOSED TO BACKPORT: Improve JreMemoryLeakPreventionListener against leak caused by LdapPoolManager Patch tc 6: http://people.apache.org/~slaurent/patches/2011-01-07_BZ50556_jre_leak_ldapPoolManager.patch +1: slaurent - -1: \ No newline at end of file + -1: + 0: kkolinko (not tested) + Additional patch: + http://svn.apache.org/viewvc?rev=1056576&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056583 - /tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
Author: kkolinko
Date: Sat Jan 8 01:09:54 2011
New Revision: 1056583
URL: http://svn.apache.org/viewvc?rev=1056583&view=rev
Log:
Correct typo in the method names in a test case, so that they match to what
method is actually being tested.
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java?rev=1056583&r1=1056582&r2=1056583&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Sat Jan
8 01:09:54 2011
@@ -71,13 +71,13 @@ public class TestRemoteIpValve extends T
}
}
-public void testCommaDelimitedListToStringArray() {
+public void testListToCommaDelimitedString() {
List elements = Arrays.asList("element1", "element2",
"element3");
String actual = RemoteIpValve.listToCommaDelimitedString(elements);
assertEquals("element1, element2, element3", actual);
}
-public void testCommaDelimitedListToStringArrayEmptyList() {
+public void testListToCommaDelimitedStringEmptyList() {
List elements = new ArrayList();
String actual = RemoteIpValve.listToCommaDelimitedString(elements);
assertEquals("", actual);
@@ -625,7 +625,7 @@ public class TestRemoteIpValve extends T
assertEquals("postInvoke remoteAddr", "remote-host-original-value",
actualPostInvokeRemoteHost);
}
-public void testListToCommaDelimitedString() {
+public void testCommaDelimitedListToStringArray() {
String[] actual =
RemoteIpValve.commaDelimitedListToStringArray("element1, element2, element3");
String[] expected = new String[] {
"element1", "element2", "element3"
@@ -633,7 +633,7 @@ public class TestRemoteIpValve extends T
assertArrayEquals(expected, actual);
}
-public void testListToCommaDelimitedStringMixedSpaceChars() {
+public void testCommaDelimitedListToStringArrayMixedSpaceChars() {
String[] actual =
RemoteIpValve.commaDelimitedListToStringArray("element1 , element2,\t
element3");
String[] expected = new String[] {
"element1", "element2", "element3"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
