svn commit: r891158 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Wed Dec 16 08:45:29 2009 New Revision: 891158 URL: http://svn.apache.org/viewvc?rev=891158view=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=891158r1=891157r2=891158view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 08:45:29 2009 @@ -309,7 +309,7 @@ * Provide new option to allow = in cookie values http://people.apache.org/~markt/patches/2009-11-17-cookie-allow-equals.patch - +1: markt, jim + +1: markt, jim, jfclere -1: * Alternative fix for CVE-2009-3555 SSL MITN @@ -317,7 +317,7 @@ technically possible an attack may suceed before the socket is closed The new patch only logs failed server initiated negotiations http://people.apache.org/~markt/patches/2009-11-20-cve2009-3555-v2.patch - +1: markt, jim + +1: markt, jim, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48252 @@ -336,7 +336,7 @@ Correct file descriptor leak on context stop/reload Patch provided by George Sexton http://svn.apache.org/viewvc?rev=883130view=rev - +1: markt, jim + +1: markt, jim, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997 @@ -355,7 +355,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47554 httpOnly flag not applied to migrated session cookie https://issues.apache.org/bugzilla/show_bug.cgi?id=47554 - +1: markt, jim + +1: markt, jim, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47799 @@ -369,7 +369,7 @@ Fix copy and paste error and call correct function Patch provided by gingyang.xu http://svn.apache.org/viewvc?rev=883177view=rev - +1: markt, jim + +1: markt, jim, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48113 @@ -437,7 +437,7 @@ * Pre-load class required to obtain SSL key size if running under a security manager http://svn.apache.org/viewvc?rev=890349view=rev - +1: markt, jim + +1: markt, jim, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47744 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891185 - in /tomcat/trunk/java/org/apache/catalina/realm: DataSourceRealm.java JAASRealm.java JDBCRealm.java
Author: markt
Date: Wed Dec 16 11:02:54 2009
New Revision: 891185
URL: http://svn.apache.org/viewvc?rev=891185view=rev
Log:
Side issue from bug 47841
Overrides getInfo() in Realms so log messages that use it have useful info
Modified:
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=891185r1=891184r2=891185view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Wed Dec 16
11:02:54 2009
@@ -250,6 +250,18 @@
this.userTable = userTable;
}
+/**
+ * Return descriptive information about this Realm implementation and
+ * the corresponding version number, in the format
+ * codelt;descriptiongt;/lt;versiongt;/code.
+ */
+@Override
+ public String getInfo() {
+
+return info;
+
+}
+
// - Public Methods
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=891185r1=891184r2=891185view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Wed Dec 16
11:02:54 2009
@@ -309,7 +309,19 @@
this.userClassNames = userClassNames;
}
+/**
+ * Return descriptive information about this Realm implementation and
+ * the corresponding version number, in the format
+ * codelt;descriptiongt;/lt;versiongt;/code.
+ */
+@Override
+ public String getInfo() {
+
+return info;
+
+}
+
// - Public Methods
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=891185r1=891184r2=891185view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Wed Dec 16
11:02:54 2009
@@ -311,6 +311,17 @@
this.userTable = userTable;
}
+/**
+ * Return descriptive information about this Realm implementation and
+ * the corresponding version number, in the format
+ * codelt;descriptiongt;/lt;versiongt;/code.
+ */
+@Override
+ public String getInfo() {
+
+return info;
+
+}
// - Public Methods
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891186 - in /tomcat/trunk: java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/config/realm.xml
Author: markt
Date: Wed Dec 16 11:04:24 2009
New Revision: 891186
URL: http://svn.apache.org/viewvc?rev=891186view=rev
Log:
Side issues from bug 47841
Override getInfo() log messages that use it have useful info
Add support for a connectionTimeout attribute
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/webapps/docs/config/realm.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=891186r1=891185r2=891186view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Wed Dec 16
11:04:24 2009
@@ -380,6 +380,12 @@
protected String commonRole = null;
+/**
+ * The timeout, in milliseconds, to use when trying to create a connection
+ * to the directory. The default is 5000 (5 seconds).
+ */
+protected String connectionTimeout = 5000;
+
// - Properties
/**
@@ -870,6 +876,41 @@
}
+/**
+ * Return the connection timeout.
+ */
+public String getConnectionTimeout() {
+
+return connectionTimeout;
+
+}
+
+
+/**
+ * Set the connection timeout.
+ *
+ * @param timeout The new connection timeout
+ */
+public void setConnectionTimeout(String timeout) {
+
+this.connectionTimeout = timeout;
+
+}
+
+
+/**
+ * Return descriptive information about this Realm implementation and
+ * the corresponding version number, in the format
+ * codelt;descriptiongt;/lt;versiongt;/code.
+ */
+@Override
+ public String getInfo() {
+
+return info;
+
+}
+
+
// -- Realm Methods
@@ -1962,6 +2003,8 @@
env.put(Context.REFERRAL, referrals);
if (derefAliases != null)
env.put(JNDIRealm.DEREF_ALIASES, derefAliases);
+if (connectionTimeout != null)
+ env.put(com.sun.jndi.ldap.connect.timeout, connectionTimeout);
return env;
Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=891186r1=891185r2=891186view=diff
==
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Wed Dec 16 11:04:24 2009
@@ -336,6 +336,12 @@
property./p
/attribute
+ attribute name=connectionTimeout required=false
+pThe timeout in milliseconds to use when establishing the connection
+to the LDAP directory. If not specified, a value of 5000 (5 seconds) is
+used./p
+ /attribute
+
attribute name=connectionURL required=true
pThe connection URL to be passed to the JNDI driver when
establishing a connection to the directory./p
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891187 - in /tomcat/trunk/java/org/apache/catalina/realm: CombinedRealm.java LocalStrings.properties
Author: markt
Date: Wed Dec 16 11:05:09 2009
New Revision: 891187
URL: http://svn.apache.org/viewvc?rev=891187view=rev
Log:
Fix bug 47841: CombinedRealm fails to switch to other realm
https://issues.apache.org/bugzilla/show_bug.cgi?id=47841
Handle failure of sub-realm during combined realm start
Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=891187r1=891186r2=891187view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Wed Dec 16
11:05:09 2009
@@ -20,6 +20,7 @@
import java.security.Principal;
import java.security.cert.X509Certificate;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -227,9 +228,19 @@
@Override
public void start() throws LifecycleException {
// Start 'sub-realms' then this one
-for (Realm realm : realms) {
+ IteratorRealm iter = realms.iterator();
+
+while (iter.hasNext()) {
+ Realm realm = iter.next();
if (realm instanceof Lifecycle) {
-((Lifecycle) realm).start();
+ try {
+ ((Lifecycle) realm).start();
+ } catch (LifecycleException e) {
+ // If realm doesn't start can't authenticate against it
+ iter.remove();
+ log.error(sm.getString(combinedRealm.realmStartFail,
+ realm.getInfo()), e);
+ }
}
}
super.start();
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=891187r1=891186r2=891187view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Wed Dec
16 11:05:09 2009
@@ -95,5 +95,6 @@
combinedRealm.authFailed=Failed to authenticate user {0} with realm {1}
combinedRealm.authSucess=Authenticated user {0} with realm {1}
combinedRealm.addRealm=Add {0} realm, making a total of {1} realms
+combinedRealm.realmStartFail=Failed to start {0} realm
lockOutRealm.authLockedUser=An attempt was made to authenticate the locked
user {0}
lockOutRealm.removeWarning=User {0} was removed from the failed users cache
after {1} seconds to keep the cache size within the limit set
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891188 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Dec 16 11:09:26 2009 New Revision: 891188 URL: http://svn.apache.org/viewvc?rev=891188view=rev Log: Couple of proposals 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=891188r1=891187r2=891188view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 11:09:26 2009 @@ -458,3 +458,16 @@ http://svn.apache.org/viewvc?view=revisionrevision=883565 +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47841 + Failed sub-realm start prevents combined realm from starting + http://svn.apache.org/viewvc?rev=891187view=rev (fix) + http://svn.apache.org/viewvc?rev=891185view=rev (better log messages) + +1: markt + -1: + + +* Add support for a connectionTimeout attribute to the JNDIRealm + http://svn.apache.org/viewvc?rev=891186view=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 47841] CombinedRealm fails to switch to other realm
https://issues.apache.org/bugzilla/show_bug.cgi?id=47841 --- Comment #4 from Mark Thomas ma...@apache.org 2009-12-16 03:09:40 GMT --- I have fixed the issue on realm start and also added a connection timeout attribute to the JNDIRealm. These changes have been applied to trunk and proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891190 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/config/http.xml
Author: markt
Date: Wed Dec 16 11:17:30 2009
New Revision: 891190
URL: http://svn.apache.org/viewvc?rev=891190view=rev
Log:
Make SSL config JVM neutral. Based on a suggestion from Ivan.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=891190r1=891189r2=891190view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Wed Dec
16 11:17:30 2009
@@ -23,6 +23,8 @@
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
+import javax.net.ssl.KeyManagerFactory;
+
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -453,7 +455,7 @@
// SSL related properties
-private String algorithm = SunX509;
+private String algorithm = KeyManagerFactory.getDefaultAlgorithm();
public String getAlgorithm() { return algorithm;}
public void setAlgorithm(String s ) { this.algorithm = s;}
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=891190r1=891189r2=891190view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Wed Dec 16 11:17:30 2009
@@ -688,10 +688,11 @@
attributes
attribute name=algorithm required=false
- pThe certificate encoding algorithm to be used. This defaults to the
Sun
- implementation (codeSunX509/code). For IBM JVMs you should use the
- value codeIbmX509/code. For other vendors, consult the JVM
- documentation for the correct value./p
+ pThe certificate encoding algorithm to be used. This defaults to
+ codeKeyManagerFactory.getDefaultAlgorithm()/code which returns
+ codeSunX509/code for Sun JVMs. IBM JVMs return
+ codeIbmX509/code. For other vendors, consult the JVM
+ documentation for the default value./p
/attribute
attribute name=clientAuth required=false
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Use KeyManagerFactory.getDefaultAlgorithm() as the default value of algorithm
On 16/12/2009 05:34, Ivan wrote:
Hi,
While playing with Tomcat 7 with non-Sun JDK, I got an error SunX509
KeyManagerFactory not available, it seems that in AbstractEndpoint.java, it
uses SunX509 as the default value, how about using
KeyManagerFactory.getDefaultAlgorithm() as the default value to make Tomcat
more portable.
---
private String algorithm = KeyManagerFactory.getDefaultAlgorithm();
public String getAlgorithm() { return algorithm;}
public void setAlgorithm(String s ) { this.algorithm = s;}
---
Thanks !
I like it. Done (and the documentation updated) for trunk / Tomcat 7.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Use KeyManagerFactory.getDefaultAlgorithm() as the default value of algorithm
Many thanks ^_^
2009/12/16 Mark Thomas ma...@apache.org
On 16/12/2009 05:34, Ivan wrote:
Hi,
While playing with Tomcat 7 with non-Sun JDK, I got an error SunX509
KeyManagerFactory not available, it seems that in AbstractEndpoint.java,
it
uses SunX509 as the default value, how about using
KeyManagerFactory.getDefaultAlgorithm() as the default value to make
Tomcat
more portable.
---
private String algorithm = KeyManagerFactory.getDefaultAlgorithm();
public String getAlgorithm() { return algorithm;}
public void setAlgorithm(String s ) { this.algorithm = s;}
---
Thanks !
I like it. Done (and the documentation updated) for trunk / Tomcat 7.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
--
Ivan
Re: svn commit: r891187 - in /tomcat/trunk/java/org/apache/catalina/realm: CombinedRealm.java LocalStrings.properties
Would it be worth making this configurable? For example:
boolean ignoreFailedStarts = false;
...
} catch (LifecycleException e) {
if (ignoreFailedStarts) {
// If realm doesn't start can't authenticate against it
iter.remove();
log.error(sm.getString(combinedRealm.realmStartFail,
realm.getInfo()), e);
} else {
throw e;
}
}
On 12/16/2009 6:05 AM, ma...@apache.org wrote:
Author: markt
Date: Wed Dec 16 11:05:09 2009
New Revision: 891187
URL: http://svn.apache.org/viewvc?rev=891187view=rev
Log:
Fix bug 47841: CombinedRealm fails to switch to other realm
https://issues.apache.org/bugzilla/show_bug.cgi?id=47841
Handle failure of sub-realm during combined realm start
Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=891187r1=891186r2=891187view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Wed Dec 16
11:05:09 2009
@@ -20,6 +20,7 @@
import java.security.Principal;
import java.security.cert.X509Certificate;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -227,9 +228,19 @@
@Override
public void start() throws LifecycleException {
// Start 'sub-realms' then this one
-for (Realm realm : realms) {
+ IteratorRealm iter = realms.iterator();
+
+while (iter.hasNext()) {
+ Realm realm = iter.next();
if (realm instanceof Lifecycle) {
-((Lifecycle) realm).start();
+ try {
+ ((Lifecycle) realm).start();
+ } catch (LifecycleException e) {
+ // If realm doesn't start can't authenticate against it
+ iter.remove();
+ log.error(sm.getString(combinedRealm.realmStartFail,
+ realm.getInfo()), e);
+ }
}
}
super.start();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891197 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt Date: Wed Dec 16 11:32:06 2009 New Revision: 891197 URL: http://svn.apache.org/viewvc?rev=891197view=rev Log: Pre-load class required to obtain SSL key size if running under a security manager Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 11:32:06 2009 @@ -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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,885038,886019,889363,890417 +/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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,885038,886019,889363,890349,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891197r1=891196r2=891197view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 11:32:06 2009 @@ -434,12 +434,6 @@ +1: markt -1: -* Pre-load class required to obtain SSL key size if running under a security - manager - http://svn.apache.org/viewvc?rev=890349view=rev - +1: markt, jim, jfclere - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47744 Prevent medium term memory leak if using SSL under a security manager Based on a patch by Greg Vanore Modified:
svn commit: r891201 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/naming/NamingContext.java webapps/docs/changelog.xml
Author: markt Date: Wed Dec 16 11:37:40 2009 New Revision: 891201 URL: http://svn.apache.org/viewvc?rev=891201view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48049 Fix copy and paste error so NamingContext.destroySubContext() works correctly Patch provided by gingyang.xu Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 11:37:40 2009 @@ -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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,885038,886019,889363,890349,890417 +/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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,883177,885038,886019,889363,890349,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891201r1=891200r2=891201view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 11:37:40 2009 @@ -365,13 +365,6 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48049 - Fix copy and paste error and call correct function - Patch provided by gingyang.xu - http://svn.apache.org/viewvc?rev=883177view=rev - +1: markt, jim, jfclere - -1: - * Fix
DO NOT REPLY [Bug 48049] org.apache.naming.NamingContext's destroySubcontext() method doesn't invoke itself recursively, but invoke unbind() method
https://issues.apache.org/bugzilla/show_bug.cgi?id=48049 Mark Thomas ma...@apache.org changed: What|Removed |Added Component|Catalina|Catalina Version|6.0.20 |5.5.28 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #2 from Mark Thomas ma...@apache.org 2009-12-16 03:38:25 GMT --- This has been fixed in 6.0.x and will be in 6.0.21 onwards. Thanks again for the patch. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r891187 - in /tomcat/trunk/java/org/apache/catalina/realm: CombinedRealm.java LocalStrings.properties
On 16/12/2009 12:30, Tim Funk wrote:
Would it be worth making this configurable? For example:
There are probably some use cases where that would be useful. I don't
feel that strongly about it myself but I'm not going to get in your way
if you want to add it.
Mark
boolean ignoreFailedStarts = false;
...
} catch (LifecycleException e) {
if (ignoreFailedStarts) {
// If realm doesn't start can't authenticate against it
iter.remove();
log.error(sm.getString(combinedRealm.realmStartFail,
realm.getInfo()), e);
} else {
throw e;
}
}
On 12/16/2009 6:05 AM, ma...@apache.org wrote:
Author: markt
Date: Wed Dec 16 11:05:09 2009
New Revision: 891187
URL: http://svn.apache.org/viewvc?rev=891187view=rev
Log:
Fix bug 47841: CombinedRealm fails to switch to other realm
https://issues.apache.org/bugzilla/show_bug.cgi?id=47841
Handle failure of sub-realm during combined realm start
Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=891187r1=891186r2=891187view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Wed
Dec 16 11:05:09 2009
@@ -20,6 +20,7 @@
import java.security.Principal;
import java.security.cert.X509Certificate;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -227,9 +228,19 @@
@Override
public void start() throws LifecycleException {
// Start 'sub-realms' then this one
-for (Realm realm : realms) {
+IteratorRealm iter = realms.iterator();
+
+while (iter.hasNext()) {
+Realm realm = iter.next();
if (realm instanceof Lifecycle) {
-((Lifecycle) realm).start();
+try {
+((Lifecycle) realm).start();
+} catch (LifecycleException e) {
+// If realm doesn't start can't authenticate
against it
+iter.remove();
+
log.error(sm.getString(combinedRealm.realmStartFail,
+realm.getInfo()), e);
+}
}
}
super.start();
-
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: r891289 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/http/Cookies.java webapps/docs/changelog.xml webapps/docs/config/systemprops.xml
Author: markt
Date: Wed Dec 16 16:27:26 2009
New Revision: 891289
URL: http://svn.apache.org/viewvc?rev=891289view=rev
Log:
Provide new option to allow = in cookie values
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891289r1=891288r2=891289view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 16:27:26 2009
@@ -307,11 +307,6 @@
+1: markt, jim
-1:
-* Provide new option to allow = in cookie values
- http://people.apache.org/~markt/patches/2009-11-17-cookie-allow-equals.patch
- +1: markt, jim, jfclere
- -1:
-
* Alternative fix for CVE-2009-3555 SSL MITN
The current patch uses an async callback to close the socket. It is
technically possible an attack may suceed before the socket is closed
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java?rev=891289r1=891288r2=891289view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java Wed Dec
16 16:27:26 2009
@@ -46,6 +46,12 @@
MimeHeaders headers;
+/**
+ * If true, cookie values are allowed to contain an equals character
without
+ * being quoted.
+ */
+public static final boolean ALLOW_EQUALS_IN_VALUE;
+
/*
List of Separator Characters (see isSeparator())
Excluding the '/' char violates the RFC, but
@@ -65,6 +71,10 @@
for (int i = 0; i SEPARATORS.length; i++) {
separators[SEPARATORS[i]] = true;
}
+
+ALLOW_EQUALS_IN_VALUE = Boolean.valueOf(System.getProperty(
+
org.apache.tomcat.util.http.ServerCookie.ALLOW_EQUALS_IN_VALUE,
+false)).booleanValue();
}
/**
@@ -367,7 +377,7 @@
// Get the cookie name. This must be a token
valueEnd = valueStart = nameStart = pos;
-pos = nameEnd = getTokenEndPosition(bytes,pos,end);
+pos = nameEnd = getTokenEndPosition(bytes,pos,end,true);
// Skip whitespace
while (pos end isWhiteSpace(bytes[pos])) {pos++; };
@@ -414,12 +424,14 @@
// The position is OK (On a delimiter)
break;
default:;
-if (!isSeparator(bytes[pos])) {
+if (!isSeparator(bytes[pos]) ||
+bytes[pos] == '=' ALLOW_EQUALS_IN_VALUE) {
// Token
valueStart=pos;
// getToken returns the position at the delimeter
// or other non-token character
-valueEnd=getTokenEndPosition(bytes, valueStart, end);
+valueEnd = getTokenEndPosition(bytes, valueStart, end,
+false);
// We need pos to advance
pos = valueEnd;
} else {
@@ -551,13 +563,26 @@
}
/**
+ * @deprecated - Use private method
+ * {...@link #getTokenEndPosition(byte[], int, int, boolean)} instead
+ */
+public static final int getTokenEndPosition(byte bytes[], int off, int
end){
+return getTokenEndPosition(bytes, off, end, true);
+}
+
+/**
* Given the starting position of a token, this gets the end of the
* token, with no separator characters in between.
* JVK
*/
-public static final int getTokenEndPosition(byte bytes[], int off, int
end){
+private static final int getTokenEndPosition(byte bytes[], int off, int
end,
+boolean isName) {
int pos = off;
-while (pos end !isSeparator(bytes[pos])) {pos++; };
+while (pos end
+(!isSeparator(bytes[pos]) ||
+ bytes[pos]=='=' ALLOW_EQUALS_IN_VALUE !isName)) {
+pos++;
+}
if (pos end)
return end;
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=891289r1=891288r2=891289view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 16 16:27:26 2009
@@ -301,6 +301,10 @@
add
Make buffer
svn commit: r891292 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java java/org/apache/tomcat/util/net/jsse/JSSESupport.java webapps/docs/changelog.xml
Author: markt
Date: Wed Dec 16 16:31:54 2009
New Revision: 891292
URL: http://svn.apache.org/viewvc?rev=891292view=rev
Log:
Alternative fix for CVE-2009-3555 SSL MITN
The previous approach used an async callback to close the socket. It is
technically possible an attack may succeed before the socket is closed
Note: The new patch only logs failed server initiated negotiations
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.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=891292r1=891291r2=891292view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 16:31:54 2009
@@ -307,14 +307,6 @@
+1: markt, jim
-1:
-* Alternative fix for CVE-2009-3555 SSL MITN
- The current patch uses an async callback to close the socket. It is
- technically possible an attack may suceed before the socket is closed
- The new patch only logs failed server initiated negotiations
- http://people.apache.org/~markt/patches/2009-11-20-cve2009-3555-v2.patch
- +1: markt, jim, jfclere
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48252
Patch attached to BZ
+1: fhanik, markt, jim
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=891292r1=891291r2=891292view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Wed Dec 16 16:31:54 2009
@@ -42,8 +42,6 @@
import java.util.Vector;
import javax.net.ssl.CertPathTrustManagerParameters;
-import javax.net.ssl.HandshakeCompletedEvent;
-import javax.net.ssl.HandshakeCompletedListener;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.ManagerFactoryParameters;
@@ -152,10 +150,6 @@
SSLSocket asock = null;
try {
asock = (SSLSocket)socket.accept();
- if (!allowUnsafeLegacyRenegotiation) {
- asock.addHandshakeCompletedListener(
- new DisableSslRenegotiation());
- }
configureClientAuth(asock);
} catch (SSLException e){
throw new SocketException(SSL handshake error + e.toString());
@@ -163,27 +157,13 @@
return asock;
}
-private static class DisableSslRenegotiation
-implements HandshakeCompletedListener {
-private volatile boolean completed = false;
-
-public void handshakeCompleted(HandshakeCompletedEvent event) {
-if (completed) {
-try {
-log.warn(SSL renegotiation is disabled, closing
connection);
-event.getSession().invalidate();
-event.getSocket().close();
-} catch (IOException e) {
-// ignore
-}
-}
-completed = true;
-}
-}
-
-
public void handshake(Socket sock) throws IOException {
((SSLSocket)sock).startHandshake();
+
+if (!allowUnsafeLegacyRenegotiation) {
+// Prevent futher handshakes by removing all cipher suites
+((SSLSocket) sock).setEnabledCipherSuites(new String[0]);
+}
}
/*
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=891292r1=891291r2=891292view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Wed Dec 16 16:31:54 2009
@@ -148,6 +148,15 @@
ssl.setNeedClientAuth(true);
}
+if (ssl.getEnabledCipherSuites().length == 0) {
+// Handshake is never going to be successful.
+// Assume this is because handshakes are disabled
+log.warn(SSL server initiated renegotiation is disabled, closing
connection);
+session.invalidate();
+ssl.close();
+return;
+}
+
InputStream in = ssl.getInputStream();
int oldTimeout = ssl.getSoTimeout();
ssl.setSoTimeout(1000);
@@ -170,10 +179,7 @@
break;
}
}
-
DO NOT REPLY [Bug 47718] ManagerBase leaks fd to /dev/urandom when context stopped
https://issues.apache.org/bugzilla/show_bug.cgi?id=47718 --- Comment #3 from Mark Thomas ma...@apache.org 2009-12-16 08:40:14 GMT --- The patch has been applied to 6.0.x and will be included in 6.0.21 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: r891300 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/session/ManagerBase.java webapps/docs/changelog.xml
Author: markt Date: Wed Dec 16 16:41:10 2009 New Revision: 891300 URL: http://svn.apache.org/viewvc?rev=891300view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47718 Correct file descriptor leak on context stop/reload Patch provided by George Sexton Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 16:41:10 2009 @@ -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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,883177,885038,886019,889363,890349,890417 +/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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,883130,883177,885038,886019,889363,890349,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891300r1=891299r2=891300view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 16:41:10 2009 @@ -319,13 +319,6 @@ +1: markt, jim -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47718 - Correct file descriptor leak on context stop/reload - Patch provided by George Sexton - http://svn.apache.org/viewvc?rev=883130view=rev - +1: markt, jim, jfclere - -1: - *
svn commit: r891304 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/session/ webapps/docs/
Author: markt
Date: Wed Dec 16 16:45:24 2009
New Revision: 891304
URL: http://svn.apache.org/viewvc?rev=891304view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47554
httpOnly flag not applied to migrated session cookie
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
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=891304r1=891303r2=891304view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 16:45:24 2009
@@ -332,12 +332,6 @@
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47554
- httpOnly flag not applied to migrated session cookie
- https://issues.apache.org/bugzilla/show_bug.cgi?id=47554
- +1: markt, jim, jfclere
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47799
Unable to configure domain in Membership and DomainFilterInterceptor
Patch provided by Keiichi Fujino
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=891304r1=891303r2=891304view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Wed Dec 16 16:45:24 2009
@@ -471,12 +471,14 @@
newCookie.setSecure(true);
}
if (log.isDebugEnabled()) {
-log.debug(sm.getString(jvmRoute.newSessionCookie,
-sessionId, Globals.SESSION_COOKIE_NAME, newCookie
-.getPath(), new Boolean(newCookie
-.getSecure(;
+Object[] args = new Object[] {sessionId,
+Globals.SESSION_COOKIE_NAME,
+newCookie.getPath(),
+new Boolean(newCookie.getSecure()),
+new Boolean(context.getUseHttpOnly())};
+log.debug(sm.getString(jvmRoute.newSessionCookie, args));
}
-response.addCookie(newCookie);
+response.addCookieInternal(newCookie,
context.getUseHttpOnly());
}
}
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=891304r1=891303r2=891304view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
Wed Dec 16 16:45:24 2009
@@ -78,7 +78,7 @@
jvmRoute.listener.stopped=SessionID Binder Listener stopped
jvmRoute.lostSession=Lost Session [{0}] at path [{1}]
jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
-jvmRoute.newSessionCookie=Setting cookie with session id [{0}] name: [{1}]
path: [{2}] secure: [{3}]
+jvmRoute.newSessionCookie=Setting cookie with session id [{0}] name: [{1}]
path: [{2}] secure: [{3}] httpOnly: [{4}]
jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is
not being used. Fail over will still work, providing a PersistentManager is
used.
jvmRoute.notFoundManager=Not found Cluster DeltaManager {0} at {1}
jvmRoute.receiveMessage.sessionIDChanged=Cluster
JvmRouteSessionIDBinderListener received orginal session ID [{0}] set to new id
[{1}] for context path [{2}]
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=891304r1=891303r2=891304view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
Wed Dec 16 16:45:24 2009
@@ -78,7 +78,7 @@
jvmRoute.listener.stopped = Parado Oyente Ligador de SessionID
jvmRoute.lostSession = Perdida Sesi\u00F3n [{0}] en ruta [{1}]
jvmRoute.missingJvmRouteAttribute = \u00A1No se ha
DO NOT REPLY [Bug 47554] o.a.c.h.s.JvmRouteBinderValve doesn't set HttpOnly flag to session Cookie.
https://issues.apache.org/bugzilla/show_bug.cgi?id=47554 Mark Thomas ma...@apache.org changed: What|Removed |Added Component|Cluster |Catalina:Cluster Version|6.0.20 |5.5.28 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #6 from Mark Thomas ma...@apache.org 2009-12-16 08:45:44 GMT --- The patch has been applied to 6.0.x and will be included in 6.0.21 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 47495] provide meaningful error message also to stdout if server.xml is not readable
https://issues.apache.org/bugzilla/show_bug.cgi?id=47495 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas ma...@apache.org 2009-12-16 08:50:58 GMT --- Konstantin's additional patch has also been applied to 6.0.x and will be included in 6.0.21 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: r891308 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml
Author: markt Date: Wed Dec 16 16:52:54 2009 New Revision: 891308 URL: http://svn.apache.org/viewvc?rev=891308view=rev Log: Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47495 Exit immediately if Catalina.load() failed to create a server instance. Patch by kkolinko Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 16:52:54 2009 @@ -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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,883130,883177,885038,886019,889363,890349,890417 +/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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,836405,883130,883177,885038,886019,889363,890349,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891308r1=891307r2=891308view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 16:52:54 2009 @@ -274,12 +274,6 @@ +1: kkolinko -1: -* Additional fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47495 - Exit immediately if Catalina.load() failed to create a server instance. - http://svn.apache.org/viewvc?rev=836405view=rev - +1:
svn commit: r891310 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Wed Dec 16 16:56:22 2009
New Revision: 891310
URL: http://svn.apache.org/viewvc?rev=891310view=rev
Log:
* Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
1) Code cleanup: Remove use of WebappClassLoader$PrivilegedFindResource,
because all findResourceInternal(String,String) calls are now already
wrapped with AccessController.doPrivileged, so additional wrapping is not
needed.
2) Add preloading of WebappClassLoader$PrivilegedFindResourceByName,
to fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c13
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891310r1=891309r2=891310view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 16:56:22 2009
@@ -285,17 +285,6 @@
-1:
+0: markt Combined patch needs to have 834047 removed and 881765 added
-* Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
- 1) Code cleanup: Remove use of WebappClassLoader$PrivilegedFindResource,
- because all findResourceInternal(String,String) calls are now already
- wrapped with AccessController.doPrivileged, so additional wrapping is not
- needed.
- 2) Add preloading of WebappClassLoader$PrivilegedFindResourceByName,
- to fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c13
-
http://people.apache.org/~kkolinko/patches/2009-11-12_PrivilegedFindResource_tc6.patch
- +1: kkolinko, markt, jim
- -1:
-
* Update to commons-pool 1.5.4
http://svn.apache.org/viewvc?rev=881412view=rev
+1: markt, jim
@@ -420,7 +409,6 @@
http://svn.apache.org/viewvc?rev=891185view=rev (better log messages)
+1: markt
-1:
-
* Add support for a connectionTimeout attribute to the JNDIRealm
http://svn.apache.org/viewvc?rev=891186view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=891310r1=891309r2=891310view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Wed Dec 16 16:56:22 2009
@@ -111,7 +111,10 @@
public static final boolean ENABLE_CLEAR_REFERENCES =
Boolean.valueOf(System.getProperty(org.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES,
true)).booleanValue();
-
+
+/**
+ * @deprecated Not used
+ */
protected class PrivilegedFindResource
implements PrivilegedAction {
@@ -1977,8 +1980,7 @@
}
/**
- * Find specified resource in local repositories. This block
- * will execute under an AccessControl.doPrivilege block.
+ * Find specified resource in local repositories.
*
* @return the loaded resource, or null if the resource isn't found
*/
@@ -2037,13 +2039,7 @@
// Note : Not getting an exception here means the resource was
// found
- if (securityManager != null) {
-PrivilegedAction dp =
-new PrivilegedFindResource(files[i], path);
-entry = (ResourceEntry)AccessController.doPrivileged(dp);
- } else {
-entry = findResourceInternal(files[i], path);
- }
+entry = findResourceInternal(files[i], path);
ResourceAttributes attributes =
(ResourceAttributes) resources.getAttributes(fullPath);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=891310r1=891309r2=891310view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Wed Dec 16 16:56:22 2009
@@ -77,7 +77,7 @@
String basePackage = org.apache.catalina.;
loader.loadClass
(basePackage +
- loader.WebappClassLoader$PrivilegedFindResource);
+ loader.WebappClassLoader$PrivilegedFindResourceByName);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
DO NOT REPLY [Bug 48097] NoClassDefFoundError on first access of first jsp
https://issues.apache.org/bugzilla/show_bug.cgi?id=48097 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #14 from Mark Thomas ma...@apache.org 2009-12-16 08:56:55 GMT --- The back port was proposed and has been applied to 6.0.x. It will be included in 6.0.21 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: r891312 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/IntrospectionUtils.java java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: markt
Date: Wed Dec 16 17:02:01 2009
New Revision: 891312
URL: http://svn.apache.org/viewvc?rev=891312view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48252
Prevent stack overflow when setting jkHome on NIO connector
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.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=891312r1=891311r2=891312view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 17:02:01 2009
@@ -290,11 +290,6 @@
+1: markt, jim
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48252
- Patch attached to BZ
- +1: fhanik, markt, jim
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
Implment fail-safe EOL conversion for source disributions
Based on a patch provided by sebb
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=891312r1=891311r2=891312view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
Wed Dec 16 17:02:01 2009
@@ -259,6 +259,9 @@
* you can have setDebug(1).
*/
public static boolean setProperty(Object o, String name, String value) {
+ return setProperty(o,name,value,true);
+}
+public static boolean setProperty(Object o, String name, String
value,boolean invokeSetProperty) {
if (dbg 1)
d(setProperty( + o.getClass() + + name + = + value + ));
@@ -345,7 +348,7 @@
}
// Ok, no setXXX found, try a setProperty(name, value)
-if (setPropertyMethodBool != null || setPropertyMethodVoid !=
null) {
+if (invokeSetProperty (setPropertyMethodBool != null ||
setPropertyMethodVoid != null)) {
Object params[] = new Object[2];
params[0] = name;
params[1] = value;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=891312r1=891311r2=891312view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed
Dec 16 17:02:01 2009
@@ -545,7 +545,7 @@
} else if (name.startsWith(socketName)) {
return IntrospectionUtils.setProperty(socketProperties,
name.substring(socketName.length()), value);
} else {
-return IntrospectionUtils.setProperty(this,name,value);
+return IntrospectionUtils.setProperty(this,name,value,false);
}
}catch ( Exception x ) {
log.error(Unable to set attribute \+name+\ to
\+value+\,x);
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=891312r1=891311r2=891312view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 16 17:02:01 2009
@@ -358,6 +358,10 @@
the default Blocking IO Java connector.
/fix
fix
+bug48252/bug: Fix stack overflow exception when setting jkHome on
+NIO connector. (fhanik)
+ /fix
+ fix
bug48311/bug: Only the APR lifecycle listener should try and
initialise APR. (markt)
/fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48252] StackOverflowError in NioEndpoint.setProperty when setting jkHome
https://issues.apache.org/bugzilla/show_bug.cgi?id=48252 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas ma...@apache.org 2009-12-16 09:02:08 GMT --- The patch has been applied to 6.0.x and will be included in 6.0.21 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: r891310 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java java/org/apache/catalina/security/SecurityClassLoad.java
On 16/12/2009, ma...@apache.org ma...@apache.org wrote:
Author: markt
Date: Wed Dec 16 16:56:22 2009
New Revision: 891310
URL: http://svn.apache.org/viewvc?rev=891310view=rev
...
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Wed Dec 16 16:56:22 2009
@@ -111,7 +111,10 @@
public static final boolean ENABLE_CLEAR_REFERENCES =
Boolean.valueOf(System.getProperty(org.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES,
true)).booleanValue();
-
+
+/**
+ * @deprecated Not used
+ */
Doesn't this need the annotation:
@Deprecated ?
protected class PrivilegedFindResource
implements PrivilegedAction {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891323 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml
Author: markt Date: Wed Dec 16 17:14:37 2009 New Revision: 891323 URL: http://svn.apache.org/viewvc?rev=891323view=rev Log: Make JULI FileHandler thread safe Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 17:14:37 2009 @@ -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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,836405,883130,883177,885038,886019,889363,890349,890417 +/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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,836405,881396,883130,883177,885038,886019,889363,890349,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891323r1=891322r2=891323view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 17:14:37 2009 @@ -96,11 +96,6 @@ Is it still relevant? I do not see any waiting there. ) -* Make JULI FileHandler thread safe - http://svn.apache.org/viewvc?rev=881396view=rev - +1: fhanik, markt, jfclere, jim - -1: - * Allow to disable buffering in JULI FileHandler This allows to configure immediate publishing of log records, like it was before rev.814876. Modified:
svn commit: r891328 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml
Author: markt Date: Wed Dec 16 17:17:40 2009 New Revision: 891328 URL: http://svn.apache.org/viewvc?rev=891328view=rev Log: Allow to disable buffering in JULI FileHandler. This allows to configure immediate publishing of log records, like it was before rev.814876. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 17:17:40 2009 @@ -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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,836405,881396,883130,883177,885038,886019,889363,890349,890417 +/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,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,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,832218,833121,833545,834047,835036,835336,836405,881396,883130,883177,885038,886019,889363,890349,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891328r1=891327r2=891328view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 17:17:40 2009 @@ -96,14 +96,6 @@ Is it still relevant? I do not see any waiting there. ) -* Allow to disable buffering in JULI FileHandler - This allows to configure immediate publishing of log - records, like it was before rev.814876. - It depends on the above
Unexpected Basic authentication dialog popping up
Hi, I am adding some code in Basic Authenticator to set up a negotiate header. Before this negotiate code is completed, one unexpected basic authentication(username/password) dialog box is popping up. This however does not happen when I run in debug mode. This seems to be a thread synchronization issue. Can some please advice on what might be going wrong? Thanks Ashish
svn commit: r891351 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Dec 16 17:58:20 2009 New Revision: 891351 URL: http://svn.apache.org/viewvc?rev=891351view=rev Log: votes 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=891351r1=891350r2=891351view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Dec 16 17:58:20 2009 @@ -172,7 +172,7 @@ * Update to commons-pool 1.5.4 http://svn.apache.org/viewvc?rev=881412view=rev - +1: markt + +1: markt, kkolinko -1: * Provide new option to allow = in cookie values Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891351r1=891350r2=891351view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 16 17:58:20 2009 @@ -274,7 +274,7 @@ * Update to commons-pool 1.5.4 http://svn.apache.org/viewvc?rev=881412view=rev - +1: markt, jim + +1: markt, jim, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48392] jdbc-pool is not returning the proxied connection in resultSet and statement
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392 --- Comment #2 from gfernandes gsfernan...@gmail.com 2009-12-16 11:26:26 UTC --- Created an attachment (id=24713) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24713) JdbcInterceptor to proxy resultSets and statements Implemented a JdbcInterceptor to proxy resultSets and statements. -- 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
[Tomcat6] Eclipse warnings
Eclipse generates many thousands of warnings for the Tomcat6 code. For example, over 2000 missing @Override markers, over 3000 raw type warnings. Is it the intention to fix these (eventually)? If so, I can provide some patches to start fixing these. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Access GlobalNamingResources using javax.naming
Is there a way to get hold of the GlobalNamingResources JNDI tree directly using the InitialContext? I see that components like DataSourceRealm go to ServerFactory.getServer().getGlobalNamingResources(), but I would like a way to do it using standard JNDI APIs best Filip - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Tomcat6] Eclipse warnings
2009/12/16 sebb seb...@gmail.com: Eclipse generates many thousands of warnings for the Tomcat6 code. For example, over 2000 missing @Override markers, over 3000 raw type warnings. Is it the intention to fix these (eventually)? If so, I can provide some patches to start fixing these. Mark worked to fix those warnings in Tomcat 7, so if you see anything there, you are welcome. I am sure that there is no intention to fix those in TC 6. I think that adding @Override or generics to the existing API is, at least formally, an API change, and thus TC 7 is the right place to fix it. Also, see the votes for the StringBuilder patches in STATUS. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Access GlobalNamingResources using javax.naming
2009/12/17 Filip Hanik - Dev Lists devli...@hanik.com: Is there a way to get hold of the GlobalNamingResources JNDI tree directly using the InitialContext? I see that components like DataSourceRealm go to ServerFactory.getServer().getGlobalNamingResources(), but I would like a way to do it using standard JNDI APIs I think, that in JNDI there is no such way, unless you have ResourceLink in your context.xml file for the name that you are trying to access. Regarding ResourceLink implementation, I do not know whether you would be interested how it works, but as I've spent some time reviewing it, here is a quick summary 1. ResourceLink element - ContextRuleSet rules create a ContextResourceLink class instance from it 2. ContextRuleSet is placed into NamingResources class instance 3. NamingContextListener class is where JNDI context is created and populated. It acts as a listener for the NamingContext. See NamingContextListener#addResourceLink() - ResourceLinkRef class instance is created there and is bound to the JNDI context. 4. ResourceLinkRef is an instance of javax.naming.Reference, so o.a.naming.NamingContext.lookup() uses NamingManager.getObjectInstance() to resolve a NamingEntry.REFERENCE. 5. The ObjectFactory used to resolve the reference is actually the o.a.naming.factory.ResourceLinkFactory. (as ResourceLinkRef#getFactoryClassName() returns that name). 6. ResourceLinkFactory holds a static reference to the global context and looks the name there. The global context reference is passed there by NamingContextListener when it initializes the global context. I see that components like DataSourceRealm go to ServerFactory.getServer().getGlobalNamingResources(), but I would like a way to do it using standard JNDI APIs I think that ContextBindings.getClassLoader().lookup(comp/env) that DataSourceRealm does is effectively the same as (new InitialContext()).lookup(comp/env). I see ServerFactory.getServer().getGlobalNamingContext() call there, but do you need to be able to configure your component in the same way as you do for DataSourceRealm? I mean, using DataSourceRealm.localDataSource=false is a bit of a trick. I think that you can either require that ResourceLink be created by a user, or use RealmBase#container to access the Server. The latter is how TC 7 DataSourceRealm does it, as there is no ServerFactory in TC 7. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Tomcat6] Eclipse warnings
On 17/12/2009, Konstantin Kolinko knst.koli...@gmail.com wrote: 2009/12/16 sebb seb...@gmail.com: Eclipse generates many thousands of warnings for the Tomcat6 code. For example, over 2000 missing @Override markers, over 3000 raw type warnings. Is it the intention to fix these (eventually)? If so, I can provide some patches to start fixing these. Mark worked to fix those warnings in Tomcat 7, so if you see anything there, you are welcome. Thanks, I've already provided quite a few such patches for TC7 ... I am sure that there is no intention to fix those in TC 6. I think that adding @Override or generics to the existing API is, at least formally, an API change, and thus TC 7 is the right place to fix it. @Override has RetentionPolicy.SOURCE so cannot affect the API. As to applying generics to java/javax classes, I agree that the public API must have the same signature as the specification, so I was thinking of using @SuppressWarnings (again, retention source) to suppress complaints about the raw types. As has been done in TC7. However the implementation and private fields etc. could use generics without changing the API. Also, see the votes for the StringBuilder patches in STATUS. TC7 has yet to be released, and even once it is released, TC6 will be the dominant version for some while, so IMO considering treating TC6 as being in maintenance mode seems premature. If my vote counted, I would +1 the StringBuilder patches... Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r891310 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java java/org/apache/catalina/security/SecurityClassLoad.java
2009/12/16 sebb seb...@gmail.com:
On 16/12/2009, ma...@apache.org ma...@apache.org wrote:
Author: markt
Date: Wed Dec 16 16:56:22 2009
New Revision: 891310
URL: http://svn.apache.org/viewvc?rev=891310view=rev
+
+ /**
+ * @deprecated Not used
+ */
Doesn't this need the annotation:
@Deprecated ?
protected class PrivilegedFindResource
implements PrivilegedAction {
I think that nobody cares.
In TC 6 there are 6 occurrences of @Deprecated and 150+ of /* @deprecated */.
When preparing the patch, that Mark applied, I went for the most
frequent option. I do not think that this inner class needs any
emphasis, as it is not some public API.
If anyone wants to add @Deprecated there, here is my +1 for that, but
I do not really care.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48392] jdbc-pool is not returning the proxied connection in resultSet and statement
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com 2009-12-16 19:10:14 UTC --- For reference: link to the discussion thread on users@: http://markmail.org/thread/lf4l3tjy5eev5kxo http://marc.info/?t=12608985304r=1w=2 -- 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 48398] New: Lock fields should be final
https://issues.apache.org/bugzilla/show_bug.cgi?id=48398 Summary: Lock fields should be final Product: Tomcat 6 Version: unspecified 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=24714) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24714) Patch to make lock fields final A field that is used as a lock should be final. The following classes have mutable locks: org.apache.jasper.compiler.AntCompiler.javacLock org.apache.catalina.ha.session.DeltaSession.diffLock -- 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
The time to call populateSessionTrackingModes() in ApplicationContext
Hi, Currently, the populateSessionTrackingModes() method is called in the constructor of ApplicationContext, but the codes in the populateSessionTrackingModes() would check the parent of StandardContext. I wonder whether it would be more reasonable to add an init method for the ApplicationContext, and call the ApplicationContext.init while starting StandardContext. For while the ApplicationContext is created via StandardContext.getServletConext() method, the StandardContext may not be added to the whole Tomcat tree. Any comment ? Thanks ! -- Ivan
DO NOT REPLY [Bug 48399] New: Lock fields should be final
https://issues.apache.org/bugzilla/show_bug.cgi?id=48399 Summary: Lock fields should be final 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=24715) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24715) Patch lock field that should be final A field that is used as a lock should be final. org.apache.catalina.ha.session.DeltaSession.diffLock is protected and mutable. -- 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 48399] Lock fields should be final
https://issues.apache.org/bugzilla/show_bug.cgi?id=48399 --- Comment #1 from Sebb s...@apache.org 2009-12-16 19:36:16 UTC --- Created an attachment (id=24716) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24716) Patch fields that should be final Two more locks that need protection. In the case of MultiLockFairBlockingQueue, the array was final, but needs to be private to prevent accidental or malicious changes. -- 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 48398] Lock fields should be final
https://issues.apache.org/bugzilla/show_bug.cgi?id=48398 --- Comment #1 from Sebb s...@apache.org 2009-12-16 19:40:25 UTC --- Created an attachment (id=24717) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24717) Patch fields that should be final Found more locks; fields could probably also be made private -- 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: r891529 - /tomcat/trunk/dist.xml
Author: kkolinko Date: Thu Dec 17 04:05:24 2009 New Revision: 891529 URL: http://svn.apache.org/viewvc?rev=891529view=rev Log: Followup to rev.883125 Additional fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 Add patterns for textual files without extension Remove an extra comma Modified: tomcat/trunk/dist.xml Modified: tomcat/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=891529r1=891528r2=891529view=diff == --- tomcat/trunk/dist.xml (original) +++ tomcat/trunk/dist.xml Thu Dec 17 04:05:24 2009 @@ -79,13 +79,15 @@ !-- Files that need to have their line endings changed for src distros -- patternset id=src.files +include name=**/INSTALLLICENSE,**/KEYS,**/LICENSE,**/NOTICE +include name=**/RELEASE-NOTES/ include name=**/*.MF,**/*.TXT/ include name=**/*.am,**/*.amd64,**/*.autoconf,**/*.awk,**/*.bat/ include name=**/*.c,**/*.classpath,**/*.conf,**/*.css/ include name=**/*.def,**/*.default,**/*.dsp,**/*.dsw,**/*.dtd/ include name=**/*.exp,**/*.h,**/*.html,**/*.hw/ include name=**/*.ia64,**/*.in,**/*.ini,**/*.ism/ -include name=,**/*.java,**/*.jsp,**/*.jspf,**/*.jspx/ +include name=**/*.java,**/*.jsp,**/*.jspf,**/*.jspx/ include name=**/*.launch,**/*.layout,**/*.lib,**/*.libdir,**/*.linux/ include name=**/*.m4,**/*.mak,**/*.manifest,**/*.mc/ include name=**/*.mdl,**/*.minimal,**/*.mk,**/*.module/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Tomcat6] Eclipse warnings
On Thu, Dec 17, 2009 at 03:23:14AM +0300, Konstantin Kolinko wrote: I think that adding @Override or generics to the existing API is, at least formally, an API change, and thus TC 7 is the right place to fix it. @Override is just a compile time annotation to check the override status, so I'm not sure why you think it's an API change. The generics, I suppose, could be considered so. Ian - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891531 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Dec 17 04:34:44 2009 New Revision: 891531 URL: http://svn.apache.org/viewvc?rev=891531view=rev Log: vote 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=891531r1=891530r2=891531view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 17 04:34:44 2009 @@ -283,6 +283,22 @@ http://svn.apache.org/viewvc?rev=883125view=rev +1: markt, jim -1: + -0: kkolinko: +1) The following additional patch is needed, because the list did not +include the files without extension + http://svn.apache.org/viewvc?rev=891529view=rev + +I see that sebb's attachment in Comment 1 of the issue mentions +a lot more of extensionless files in TC 5.5. Need to check that. + +2) I do not like such patterns as *.amd64, *.ia64. There is no +guarantee that those are not binary, as those extensions do not +specify file types. We would better use full names +of those files, e.g. **/Makefile.amd64. Actually those *.amd64 +files are in connectors/jk/native of TC 5.5.28. Do we still ship +them after repository reorganization? Also, native sources included +in TC 6.0.20 release to not have any *.amd64 files. + * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997 Process changes for all naming contexts, not just the global one - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891533 - /tomcat/trunk/dist.xml
Author: kkolinko Date: Thu Dec 17 04:38:25 2009 New Revision: 891533 URL: http://svn.apache.org/viewvc?rev=891533view=rev Log: Fix unclosed tag. Modified: tomcat/trunk/dist.xml Modified: tomcat/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=891533r1=891532r2=891533view=diff == --- tomcat/trunk/dist.xml (original) +++ tomcat/trunk/dist.xml Thu Dec 17 04:38:25 2009 @@ -79,7 +79,7 @@ !-- Files that need to have their line endings changed for src distros -- patternset id=src.files -include name=**/INSTALLLICENSE,**/KEYS,**/LICENSE,**/NOTICE +include name=**/INSTALLLICENSE,**/KEYS,**/LICENSE,**/NOTICE/ include name=**/RELEASE-NOTES/ include name=**/*.MF,**/*.TXT/ include name=**/*.am,**/*.amd64,**/*.autoconf,**/*.awk,**/*.bat/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47714] Reponse mixed between users
https://issues.apache.org/bugzilla/show_bug.cgi?id=47714 Sudhir Reddy discoversud...@gmail.com changed: What|Removed |Added CC||discoversud...@gmail.com --- Comment #5 from Sudhir Reddy discoversud...@gmail.com 2009-12-16 20:38:24 UTC --- I too happen to notice the same issue on our production boxes with mod_jk-1.2.28, DisableReuse fixed this issue. We are using apache --- mod_jk-1.2.28 ---AJP13--- tomcat-5.5.23 tomcat logs shows HTTP 302 being returned and apache logs shows HTTP 200 I am trying to reproduce the same on our non-production boxes. The only possible scenario I can think of is the following: * mod_jk: Request 1 sent to tomcat got timeout after 2 mins while waiting for a response * mod_jk : Request 2 reuses the socket of the Request 1 and reads the response of the Request 1 from tomcat. Please let me know if you think the above scenario is not possible. We do have timeouts configured for 2 mins and retries not set(defaults to 2). We did see lots of HTTP 400 error messages(Bad Requests) also caused due to mod_jk and got fixed when we used DisableReuse -- 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: r891534 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Dec 17 04:42:19 2009 New Revision: 891534 URL: http://svn.apache.org/viewvc?rev=891534view=rev Log: correction 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=891534r1=891533r2=891534view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 17 04:42:19 2009 @@ -284,9 +284,10 @@ +1: markt, jim -1: -0: kkolinko: -1) The following additional patch is needed, because the list did not +1) The following additional patches are needed, because the list did not include the files without extension http://svn.apache.org/viewvc?rev=891529view=rev + http://svn.apache.org/viewvc?rev=891533view=rev I see that sebb's attachment in Comment 1 of the issue mentions a lot more of extensionless files in TC 5.5. Need to check that. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48400] New: HTTP Post Request is set to recoverable on timeout waiting for response from tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=48400 Summary: HTTP Post Request is set to recoverable on timeout waiting for response from tomcat Product: Tomcat Connectors Version: 1.2.28 Platform: PC OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: discoversud...@gmail.com mod_jk retries http post requests in case of timeout in getting response from tomcat with default configurations(no retries or recovery_options specified). AFAIK HTTP Get and Head requests are only considered idempotent, shouldn't post requests be non-recoverable ? We are using apache -- mod_jk-1.2.28 --AJP13-- tomcat We also are using DisableReuse flag in mod_jk config I understand this can be fixed with disabling the recovery option. Wondering if its a default config issue or a bug in mod_jk. If it is intentional can someone please explain the intention ? mod_jk logs : [Tue Dec 15 05:53:50 2009] [13935:0] [debug] init_ws_service::mod_jk.c (935): Service protocol=HTTP/1.1 method=POST ssl=true host=(null) addr= name=X port= auth=(null) user=(null) laddr= raddr= uri=/-MASKING-- [Tue Dec 15 05:53:50 2009] [13935:0] [debug] jk_open_socket::jk_connect.c (541): timeout 120 set for socket=43 [Tue Dec 15 05:53:50 2009] [13935:0] [debug] jk_open_socket::jk_connect.c (576): trying to connect socket 43 to 127.0.0.1:8009 [Tue Dec 15 05:53:50 2009] [13935:0] [debug] jk_open_socket::jk_connect.c (602): socket 43 connected to 127.0.0.1:8009 [Tue Dec 15 05:53:50 2009] [13935:0] [debug] ajp_connection_tcp_send_message::jk_ajp_common.c (1070): sending to ajp13 pos=4 len=2495 max=8192 After 2 mins [Tue Dec 15 05:55:50 2009] [13935:0] [debug] jk_shutdown_socket::jk_connect.c (681): About to shutdown socket 43 [Tue Dec 15 05:55:52 2009] [13935:0] [debug] jk_shutdown_socket::jk_connect.c (732): Shutdown socket 43 and read 0 lingering bytes [Tue Dec 15 05:55:52 2009] [13935:0] [info] ajp_connection_tcp_get_message::jk_ajp_common.c (1150): (consWorker) can't receive the response header message from tomcat, network problems or tomcat (127.0.0.1:8009) is down (errno=11) [Tue Dec 15 05:55:52 2009] [13935:0] [error] ajp_get_reply::jk_ajp_common.c (1962): (consWorker) Tomcat is down or refused connection. No response has been sent to the client (yet) [Tue Dec 15 05:55:52 2009] [13935:0] [info] ajp_service::jk_ajp_common.c (2447): (consWorker) sending request to tomcat failed (recoverable), (attempt=1) [Tue Dec 15 05:55:52 2009] [13935:0] [debug] ajp_service::jk_ajp_common.c (2304): retry 1, sleeping for 100 ms before retrying [Tue Dec 15 05:55:53 2009] [13935:0] [debug] ajp_send_request::jk_ajp_common.c (1501): (consWorker) all endpoints are disconnected. [Tue Dec 15 05:55:53 2009] [13935:0] [debug] jk_open_socket::jk_connect.c (452): socket TCP_NODELAY set to On [Tue Dec 15 05:55:53 2009] [13935:0] [debug] jk_open_socket::jk_connect.c (541): timeout 120 set for socket=43 [Tue Dec 15 05:55:53 2009] [13935:0] [debug] jk_open_socket::jk_connect.c (576): trying to connect socket 43 to 127.0.0.1:8009 [Tue Dec 15 05:55:53 2009] [13935:0] [debug] jk_open_socket::jk_connect.c (602): socket 43 connected to 127.0.0.1:8009 [Tue Dec 15 05:55:53 2009] [13935:0] [debug] ajp_connect_to_endpoint::jk_ajp_common.c (931): Connected socket 43 to (127.0.0.1:8009) [Tue Dec 15 05:55:53 2009] [13935:0] [debug] ajp_connection_tcp_send_message::jk_ajp_common.c (1070): sending to ajp13 pos=4 len=2495 max=8192 -- 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 propchange: r883146 - svn:log
Author: kkolinko Revision: 883146 Modified property: svn:log Modified: svn:log at Thu Dec 17 06:24:45 2009 -- --- svn:log (original) +++ svn:log Thu Dec 17 06:24:45 2009 @@ -1,3 +1,3 @@ -Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47453 +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47462 Need to be able to override metadata complete if set in the global web.xml Patch provided by Keiichi Fujino - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r891554 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Dec 17 06:32:13 2009 New Revision: 891554 URL: http://svn.apache.org/viewvc?rev=891554view=rev Log: Correct the issue number 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=891554r1=891553r2=891554view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 17 06:32:13 2009 @@ -208,7 +208,7 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47453 +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47462 Need to be able to override metadata complete if set in the global web.xml Patch provided by Keiichi Fujino http://svn.apache.org/viewvc?rev=883146view=rev Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=891554r1=891553r2=891554view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 17 06:32:13 2009 @@ -307,7 +307,7 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47453 +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47462 Need to be able to override metadata complete if set in the global web.xml Patch provided by Keiichi Fujino http://svn.apache.org/viewvc?rev=883146view=rev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47462] The annotation doesn't become effective.(metadata-complete=false is not effective.)
https://issues.apache.org/bugzilla/show_bug.cgi?id=47462 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com 2009-12-16 23:45:57 UTC --- SRV.14.5 of Servlet 2.5 says that if “metadata-complete” attribute is absent, it must be treated the same way as having the value of false. Thus, if we allow to specify it in global conf/web.xml, setting it to true there will result in violation of the spec. -- 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
