svn commit: r932866 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties container/webapps/docs/changelog.xml
Author: markt
Date: Sun Apr 11 11:19:49 2010
New Revision: 932866
URL: http://svn.apache.org/viewvc?rev=932866&view=rev
Log:
Backport AprLifecycleListener messages from TC 6.0. It fixes "Cannot find
message" messages that are printed to the log when Tomcat is being started and
Tomcat-Native library is present (kkolinko)
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932866&r1=932865&r2=932866&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Apr 11 11:19:49 2010
@@ -134,13 +134,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt
-1:
-* Backport AprLifecycleListener messages from TC 6.0
- It fixes "Cannot find message" messages that are printed to the log when
- Tomcat is being started and Tomcat-Native library is present
-
http://people.apache.org/~kkolinko/patches/2010-04-07_tc55_AprLifecycleListener_messages.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Use chunked encoding for http 1.1 requests with no content-length (regardless
of keep-alive) so client can differentiate between complete and partial
responses.
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties?rev=932866&r1=932865&r2=932866&view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Sun Apr 11 11:19:49 2010
@@ -31,10 +31,13 @@ applicationRequest.badParent=Cannot loca
applicationRequest.badRequest=Request is not a
javax.servlet.ServletRequestWrapper
applicationResponse.badParent=Cannot locate parent Response implementation
applicationResponse.badResponse=Response is not a
javax.servlet.ServletResponseWrapper
-aprListener.aprInit=The Apache Tomcat Native library which allows optimal
performance in production environments was not found on the java.library.path:
{0}
-aprListener.tcnInvalid=An incompatible version {0} of the Apache Tomcat Native
library is installed, while Tomcat requires version {1}
-aprListener.tcnVersion=An older version {0} of the Apache Tomcat Native
library is installed, while Tomcat recommends version greater than {1}
-aprListener.aprDestroy=Failed shutdown of Apache Portable Runtime
+aprListener.aprInit=The APR based Apache Tomcat Native library which allows
optimal performance in production environments was not found on the
java.library.path: {0}
+aprListener.tcnInvalid=An incompatible version {0} of the APR based Apache
Tomcat Native library is installed, while Tomcat requires version {1}
+aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat
Native library is installed, while Tomcat recommends version greater than {1}
+aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native
library
+aprListener.sslInit=Failed to initialize the SSLEngine.
+aprListener.tcnValid=Loaded APR based Apache Tomcat Native library {0}.
+aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters
[{2}], random [{3}].
containerBase.addDefaultMapper=Exception configuring default mapper of class
{0}
containerBase.alreadyStarted=Container {0} has already been started
containerBase.notConfigured=No basic Valve has been configured
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=932866&r1=932865&r2=932866&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Apr 11
11:19:49 2010
@@ -50,6 +50,10 @@
47774: Ensure web application class loader is used when
calling session listeners. (kfujino)
+
+Ensure all required i18n messages are present for the APR/native
+Listener. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932867 - in /tomcat/tc5.5.x/trunk: STATUS.txt connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java connectors/http11/src/java/org/apache/coyote/http11/Http11Process
Author: markt
Date: Sun Apr 11 11:23:38 2010
New Revision: 932867
URL: http://svn.apache.org/viewvc?rev=932867&view=rev
Log:
Use chunked encoding for http 1.1 requests with no content-length (regardless
of keep-alive) so client can differentiate between complete and partial
responses.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932867&r1=932866&r2=932867&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Apr 11 11:23:38 2010
@@ -133,10 +133,3 @@ PATCHES PROPOSED TO BACKPORT:
https://issues.apache.org/bugzilla/attachment.cgi?id=25226
+1: kkolinko, markt
-1:
-
-* Use chunked encoding for http 1.1 requests with no content-length (regardless
- of keep-alive) so client can differentiate between complete and partial
- responses.
- http://svn.apache.org/viewvc?rev=931709&view=rev (less NIO)
- +1: markt, kkolinko, rjung
- -1:
Modified:
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=932867&r1=932866&r2=932867&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Sun Apr 11 11:23:38 2010
@@ -1603,7 +1603,7 @@ public class Http11AprProcessor implemen
(outputFilters[Constants.IDENTITY_FILTER]);
contentDelimitation = true;
} else {
-if (entityBody && http11 && keepAlive) {
+if (entityBody && http11) {
outputBuffer.addActiveFilter
(outputFilters[Constants.CHUNKED_FILTER]);
contentDelimitation = true;
Modified:
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java?rev=932867&r1=932866&r2=932867&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Sun Apr 11 11:23:38 2010
@@ -1562,7 +1562,7 @@ public class Http11Processor implements
(outputFilters[Constants.IDENTITY_FILTER]);
contentDelimitation = true;
} else {
-if (entityBody && http11 && keepAlive) {
+if (entityBody && http11) {
outputBuffer.addActiveFilter
(outputFilters[Constants.CHUNKED_FILTER]);
contentDelimitation = true;
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=932867&r1=932866&r2=932867&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Apr 11
11:23:38 2010
@@ -62,6 +62,11 @@
48613: Only attempt APR/native connector initialization if
the Listener element has been specified in server.xml.
(fhanik/kkolinko)
+
+Use chunked encoding for http 1.1 responses with no content-length
+(regardless of keep-alive) so client can differentiate between complete
+and partial responses. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932869 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/webapps/docs/changelog.xml jasper/src/share/org/apache/jasper/security/SecurityClassLoad.java
Author: markt
Date: Sun Apr 11 11:32:26 2010
New Revision: 932869
URL: http://svn.apache.org/viewvc?rev=932869&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48580
Prevent AccessControlException if first access is to a JSP that uses a
FunctionMapper
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/security/SecurityClassLoad.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932869&r1=932868&r2=932869&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Apr 11 11:32:26 2010
@@ -78,13 +78,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48580
- Prevent AccessControlException if first access is to a JSP that uses a
FunctionMapper
- https://issues.apache.org/bugzilla/attachment.cgi?id=25094
- (it is markt's r915070)
- +1: kkolinko, markt, kfujino
- -1:
-
* Remove JSSE13Factory, JSSE13SocketFactory classes,
because
- TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=932869&r1=932868&r2=932869&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Apr 11
11:32:26 2010
@@ -76,6 +76,11 @@
of JSP.5.3. The specification recommends, but does not require, this
enforcement. (kkolinko)
+
+48580: Prevent AccessControlException when running under a
+security manager if the first access is to a JSP that uses a
+FunctionMapper. (markt/kkolinko)
+
Modified:
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/security/SecurityClassLoad.java?rev=932869&r1=932868&r2=932869&view=diff
==
---
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/security/SecurityClassLoad.java
(original)
+++
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/security/SecurityClassLoad.java
Sun Apr 11 11:32:26 2010
@@ -99,6 +99,9 @@ public final class SecurityClassLoad {
loader.loadClass( basePackage +
"runtime.JspContextWrapper");
+// Trigger loading of class and reading of property (BZ48580)
+SecurityUtil.isPackageProtectionEnabled();
+
loader.loadClass( basePackage +
"servlet.JspServletWrapper");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48580] 6.0.24: AccessControlException in ProtectedFunctionMapper on first access to certain JSP
https://issues.apache.org/bugzilla/show_bug.cgi?id=48580 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #9 from Mark Thomas 2010-04-11 08:30:30 EDT --- This has been fixed in 5.5.x and will be included in 5.5.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932884 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml webapps/docs/realm-howto.xml
Author: markt
Date: Sun Apr 11 12:51:40 2010
New Revision: 932884
URL: http://svn.apache.org/viewvc?rev=932884&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
Allow user names as well as DNs to be used with the nested role search
Add roleNested to the docs
Patch provided by Felix Schumacher
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=932884&r1=932883&r2=932884&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 12:51:40 2010
@@ -99,14 +99,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
- Allow user names as well as DNs to be used with the nested role search
- Add roleNested to the docs
- Patch provided by Felix Schumacher
- http://svn.apache.org/viewvc?rev=920422&view=rev
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
Return roles defined by both userRoleName and roleName mechanisms
Patch provided by 'eric'
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=932884&r1=932883&r2=932884&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Sun Apr
11 12:51:40 2010
@@ -29,7 +29,9 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.Map.Entry;
import javax.naming.Context;
import javax.naming.CommunicationException;
@@ -1679,12 +1681,12 @@ public class JNDIRealm extends RealmBase
// Directory Groups". It avoids group slurping and handles cyclic
group memberships as well.
// See http://middleware.internet2.edu/dir/ for details
-Set newGroupDNs = new HashSet(groupMap.keySet());
-while (!newGroupDNs.isEmpty()) {
-Set newThisRound = new HashSet(); // Stores
the groups we find in this iteration
+Map newGroups = new
HashMap(groupMap);
+while (!newGroups.isEmpty()) {
+Map newThisRound = new HashMap(); // Stores the groups we find in this iteration
-for (String groupDN : newGroupDNs) {
-filter = roleFormat.format(new String[] { groupDN });
+for (Entry group : newGroups.entrySet()) {
+filter = roleFormat.format(new String[] { group.getKey(),
group.getValue() });
if (containerLog.isTraceEnabled()) {
containerLog.trace("Perform a nested group search with
base "+ roleBase + " and filter " + filter);
@@ -1702,7 +1704,7 @@ public class JNDIRealm extends RealmBase
String name = getAttributeValue(roleName, attrs);
if (name != null && dname != null &&
!groupMap.keySet().contains(dname)) {
groupMap.put(dname, name);
-newThisRound.add(dname);
+newThisRound.put(dname, name);
if (containerLog.isTraceEnabled()) {
containerLog.trace(" Found nested role "
+ dname + " -> " + name);
@@ -1716,7 +1718,7 @@ public class JNDIRealm extends RealmBase
}
}
-newGroupDNs = newThisRound;
+newGroups = newThisRound;
}
}
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=932884&r1=932883&r2=932884&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 12:51:40 2010
@@ -46,6 +46,11 @@
identification. (markt)
+48629: Allow user names as well as DNs to be used with the
+nested role search. Add roleNested to the documentation. Patch provided
+by Felix Schumacher. (markt)
+
+
48661: Make error page behavior consistent, regardless of
how
the error page is defined. If a response has been committed, always
include the error page. (mar
DO NOT REPLY [Bug 48629] JNDIRealm and roleNested doesn't work with roleSearch="(member={1})"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48629 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #7 from Mark Thomas 2010-04-11 08:51:36 EDT --- Thanks again for the patch. It has been applied to 6.0.x and will be includedin 6.0.27 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932896 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/naming/resources/FileDirContext.java java/org/apache/naming/resources/WARDirContext.java webapps/docs/changelog.xml
Author: markt
Date: Sun Apr 11 13:37:51 2010
New Revision: 932896
URL: http://svn.apache.org/viewvc?rev=932896&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
Ensure multiple threads do not end up with the same InputStream
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.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=932896&r1=932895&r2=932896&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 13:37:51 2010
@@ -113,12 +113,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
- Ensure multiple threads do not end up with the same InputStream
- http://svn.apache.org/viewvc?rev=920858&view=rev
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Add system property to allow disabling enforcement of JSP.5.3
The spec recommends, but does not require this enforcement.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=932896&r1=932895&r2=932896&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Sun Apr 11 13:37:51 2010
@@ -884,7 +884,7 @@ public class FileDirContext extends Base
/**
- * This specialized resource implementation avoids opening the IputStream
+ * This specialized resource implementation avoids opening the InputStream
* to the file right away (which would put a lock on the file).
*/
protected class FileResource extends Resource {
@@ -924,7 +924,9 @@ public class FileDirContext extends Base
public InputStream streamContent()
throws IOException {
if (binaryContent == null) {
-inputStream = new FileInputStream(file);
+FileInputStream fis = new FileInputStream(file);
+inputStream = fis;
+return fis;
}
return super.streamContent();
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=932896&r1=932895&r2=932896&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
Sun Apr 11 13:37:51 2010
@@ -938,7 +938,9 @@ public class WARDirContext extends BaseD
throws IOException {
try {
if (binaryContent == null) {
-inputStream = base.getInputStream(entry);
+InputStream is = base.getInputStream(entry);
+inputStream = is;
+return is;
}
} catch (ZipException e) {
throw new IOException(e.getMessage());
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=932896&r1=932895&r2=932896&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 13:37:51 2010
@@ -55,6 +55,11 @@
the error page is defined. If a response has been committed, always
include the error page. (markt)
+
+48760: Fix potential multi-threading issue in static
resource
+serving where multiple threads could try to use the the same
+InputStream. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48760] Tomcat breaks in serving large files (>=1.8MB) under high load and high threading.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48760 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #20 from Mark Thomas 2010-04-11 09:32:24 EDT --- This has been fixed in 6.0.x and will be included in 6.0.27 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932898 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml webapps/docs/config/systemprops.xml
Author: markt
Date: Sun Apr 11 13:44:50 2010
New Revision: 932898
URL: http://svn.apache.org/viewvc?rev=932898&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Add system property to allow disabling enforcement of JSP.5.3. The spec
recommends, but does not require this enforcement. (kkolinko)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.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=932898&r1=932897&r2=932898&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 13:44:50 2010
@@ -113,13 +113,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
- Add system property to allow disabling enforcement of JSP.5.3
- The spec recommends, but does not require this enforcement.
- http://svn.apache.org/viewvc?rev=920880&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
Improve exception processing in CustomObjectInputStream#resolveClass(),
to help find the cause behind BZ 48007.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=932898&r1=932897&r2=932898&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Sun Apr
11 13:44:50 2010
@@ -78,6 +78,15 @@ class Generator {
private static final String VAR_ANNOTATIONPROCESSOR =
System.getProperty("org.apache.jasper.compiler.Generator.VAR_ANNOTATIONPROCESSOR",
"_jsp_annotationprocessor");
+/* System property that controls if the requirement to have the object
+ * used in jsp:getProperty action to be previously "introduced"
+ * to the JSP processor (see JSP.5.3) is enforced.
+ */
+private static final boolean STRICT_GET_PROPERTY = Boolean.valueOf(
+System.getProperty(
+"org.apache.jasper.compiler.Generator.STRICT_GET_PROPERTY",
+"true")).booleanValue();
+
private ServletWriter out;
private ArrayList methodsBuffered;
@@ -1064,7 +1073,7 @@ class Generator {
+ ")_jspx_page_context.findAttribute("
+ "\""
+ name + "\"))." + methodName + "(;");
-} else if (varInfoNames.contains(name)) {
+} else if (!STRICT_GET_PROPERTY || varInfoNames.contains(name)) {
// The object is a custom action with an associated
// VariableInfo entry for this name.
// Get the class name and then introspect at runtime.
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=932898&r1=932897&r2=932898&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 13:44:50 2010
@@ -78,6 +78,15 @@
+
+
+
+48701: Add a system property to allow disabling enforcement
+of JSP.5.3. The specification recommends, but does not require, this
+enforcement. (kkolinko)
+
+
+
Update to Commons Daemon 1.0.2. Use service launcher (procrun)
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml?rev=932898&r1=932897&r2=932898&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml Sun Apr 11
13:44:50 2010
@@ -80,6 +80,14 @@
be used.
+
+ If true, the requirement to have the object referenced in
+ jsp:getProperty action to be previously "introduced"
+ to the JSP processor, as specified in the chapter JSP.5.3 of JSP 2.0 and
+ later specifications, is enforced. If not specified, the specification
+ compliant default of true will be used.
+
+
If false the requirements for escaping quotes in JSP
attributes will be relaxed so that an unescaped quote will not
-
DO NOT REPLY [Bug 48701] jsp:getProperty broken for certain cases
https://issues.apache.org/bugzilla/show_bug.cgi?id=48701 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #11 from Mark Thomas 2010-04-11 09:39:38 EDT --- The patch has been applied to 6.0.x and will be included in 6.0.27 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932901 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/util/CustomObjectInputStream.java webapps/docs/changelog.xml
Author: markt
Date: Sun Apr 11 13:50:12 2010
New Revision: 932901
URL: http://svn.apache.org/viewvc?rev=932901&view=rev
Log:
Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
Improve exception processing in CustomObjectInputStream#resolveClass(), to help
find the cause behind BZ 48007.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.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=932901&r1=932900&r2=932901&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 13:50:12 2010
@@ -113,13 +113,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
- Improve exception processing in CustomObjectInputStream#resolveClass(),
- to help find the cause behind BZ 48007.
- http://svn.apache.org/viewvc?rev=920912&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Take account of TagVariableInfo when implementing the rules of JSP.5.3
http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java?rev=932901&r1=932900&r2=932901&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
Sun Apr 11 13:50:12 2010
@@ -74,8 +74,14 @@ public final class CustomObjectInputStre
try {
return Class.forName(classDesc.getName(), false, classLoader);
} catch (ClassNotFoundException e) {
-// Try also the superclass because of primitive types
-return super.resolveClass(classDesc);
+try {
+// Try also the superclass because of primitive types
+return super.resolveClass(classDesc);
+} catch (ClassNotFoundException e2) {
+// Rethrow original exception, as it can have more information
+// about why the class was not found. BZ 48007
+throw e;
+}
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=932901&r1=932900&r2=932901&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 13:50:12 2010
@@ -46,6 +46,10 @@
identification. (markt)
+Improve exception handling on session de-serialization to assist in
+identifying the root cause of 48007. (kkolinko)
+
+
48629: Allow user names as well as DNs to be used with the
nested role search. Add roleNested to the documentation. Patch provided
by Felix Schumacher. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932904 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/DeltaManager.java java/org/apache/catalina/session/ManagerBase.java webapps/docs/changelog.xml
Author: markt
Date: Sun Apr 11 13:54:51 2010
New Revision: 932904
URL: http://svn.apache.org/viewvc?rev=932904&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48790
Make maxActive thread safe. I almost marked this as WONTFIX. Only the fact that
it is, technically, a bug stopped me.
Simplified patch based on kkolinko's patch
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.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=932904&r1=932903&r2=932904&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 13:54:51 2010
@@ -119,20 +119,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48790
- Make maxActive thread safe. I almost marked this as WONTFIX. Only the fact
- that it is, technically, a bug stopped me.
- Simplified patch based on kkolinko's patch below
- http://svn.apache.org/viewvc?view=revision&revision=927037
- +1: markt, kkolinko, rjung
- -1:
-
- I think it can be done more simply:
- http://people.apache.org/~kkolinko/patches/2010-03-16_tc6_bug48790.patch
- +1: kkolinko
- -1: markt - setMaxActive() also needs to use the update lock
- I'll revert my patch above and propose a new one based on this
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48793
Make catalina.sh more robust to different return values on different
platforms
Patch provided by Thomas GL
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=932904&r1=932903&r2=932904&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Sun Apr 11 13:54:51 2010
@@ -1204,7 +1204,7 @@ public class DeltaManager extends Cluste
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
counterNoStateTransfered = 0 ;
-maxActive = getActiveSessions() ;
+setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
counterReceive_EVT_GET_ALL_SESSIONS = 0;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=932904&r1=932903&r2=932904&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Sun
Apr 11 13:54:51 2010
@@ -180,7 +180,9 @@ public abstract class ManagerBase implem
// Number of sessions created by this manager
protected int sessionCounter=0;
-protected int maxActive=0;
+protected volatile int maxActive=0;
+
+private final Object maxActiveUpdateLock = new Object();
// number of duplicated session ids - anything >0 means we have problems
protected int duplicates=0;
@@ -765,7 +767,11 @@ public abstract class ManagerBase implem
sessions.put(session.getIdInternal(), session);
int size = sessions.size();
if( size > maxActive ) {
-maxActive = size;
+synchronized(maxActiveUpdateLock) {
+if( size > maxActive ) {
+maxActive = size;
+}
+}
}
}
@@ -1107,7 +1113,9 @@ public abstract class ManagerBase implem
public void setMaxActive(int maxActive) {
-this.maxActive = maxActive;
+synchronized (maxActiveUpdateLock) {
+this.maxActive = maxActive;
+}
}
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=932904&r1=932903&r2=932904&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 13:54:51 2010
@@ -64,6 +64,10 @@
serving where multiple threads could try to use the the same
InputStream. (markt)
+
+48790: Fix thread safety issue in the count of the maximum
+number of active session. (markt/kkolinko)
+
DO NOT REPLY [Bug 48790] Race condition in org.apache.catalina.session.ManagerBase:maxActive
https://issues.apache.org/bugzilla/show_bug.cgi?id=48790 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-04-11 09:49:24 EDT --- This has been fixed in 6.0.x and will be included in 6.0.27 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Patch suggestion
On 11 April 2010 00:17, Konstantin Kolinko wrote:
> 2010/4/10 Pid :
> > In lieu of of a Bugzilla enhancement (and hoping that I have the right
> end
> > of the stick).
> >
>
> If I guess your intention correctly,
> you want to prevent deployment of a war file that is still open for
> writing?
>
Yes. I should have been more explicit. The patch was prompted by a message
to the User list a little while ago.
The user uploaded a .war directly to the webapps directory and was surprised
to discover Tomcat throwing exceptions when it tried to deploy the
incomplete file.
> If that is the case, then asking for modification time probably will
> not work. The file properties in the file system are usually not
> updated that frequently. Though that might differ between OSes. Also,
> if the file is being transmitted over network, the update frequency
> depends on how fast is the connection that is used to upload the file.
>
> As far as I remember my experience, I think that a file that is still
> being written can be detected by asking its length. Such files can be
> listed by shell to be of length 0.
>
> Needs more research and some summary across OSes though.
>
I will test Linux, OSX.
> At least, if the war file is of length 0 it can be safely skipped for
> obvious reasons.
>
> >try {
> >Thread.sleep(500);
> >}
>
> I do not like unconditionally sleeping for every file. 20 wars = 10
> seconds to sleep, even if none of them is going to be deployed
>
Fair enough. If the file size detectably zero, then calling continue would
be sufficient to prevent the attempt at deploying the war. I think it would
be good to log a warning here too.
p
> Time could be compared against the interval between autoDeploy cycle
> runs, if it is enabled, but there are also explicit calls from the
> manager web application that must not be broken.
>
> The above is from my mind/memory. I have not researched it for this case.
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
--
--
pidster.com
svn commit: r932905 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Sun Apr 11 13:57:10 2010
New Revision: 932905
URL: http://svn.apache.org/viewvc?rev=932905&view=rev
Log:
Update to NSIS 2.46
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
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=932905&r1=932904&r2=932905&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 13:57:10 2010
@@ -126,12 +126,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Update to NSIS 2.46
- NSIS changelog: http://nsis.sourceforge.net/Docs/AppendixF.html#F.1.1
- http://svn.apache.org/viewvc?rev=921630&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48795
Provide an option to allow recompilation on the next request following a JSP
compilation error rather than waiting modifcationTestInterval before the next
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=932905&r1=932904&r2=932905&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Sun Apr 11 13:57:10 2010
@@ -78,12 +78,12 @@ commons-pool.home=${base.path}/commons-p
commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
# - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.45
+nsis.home=${base.path}/nsis-2.46
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
# - Commons Daemon, version 1.0-Alpha or later -
commons-daemon.version=1.0.2
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=932905&r1=932904&r2=932905&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 13:57:10 2010
@@ -100,6 +100,9 @@
Update to Commons Daemon 1.0.2. Use service launcher (procrun)
from the Commons Daemon release. Do not keep a copy of it in our source
tree. (mturk/kkolinko)
+
+Update to NSIS 2.46. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932909 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Author: markt
Date: Sun Apr 11 14:15:40 2010
New Revision: 932909
URL: http://svn.apache.org/viewvc?rev=932909&view=rev
Log:
Fix cluster regression, previous incorrect patch (fhanik)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.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=932909&r1=932908&r2=932909&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 14:15:40 2010
@@ -157,12 +157,6 @@ PATCHES PROPOSED TO BACKPORT:
one is already documented as "sessionTimeout" in config/http.xml, though,
still, renaming might break someone's configurations.
-* Fix cluster regression, previous incorrect patch
- http://svn.apache.org/viewvc?rev=924776&view=rev
- https://issues.apache.org/bugzilla/show_bug.cgi?id=48934
- +1: fhanik, markt, kkolinko
- -1:
-
* Fix cross-context session expiration
http://svn.apache.org/viewvc?rev=926716&view=rev
+1: markt
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=932909&r1=932908&r2=932909&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
Sun Apr 11 14:15:40 2010
@@ -77,12 +77,7 @@ public class ReplicationTransmitter impl
*/
public void sendMessage(ChannelMessage message, Member[] destination)
throws ChannelException {
MultiPointSender sender = getTransport();
-try {
-sender.sendMessage(destination,message);
-}catch (ChannelException x) {
-sender.disconnect();
-throw x;
-}
+sender.sendMessage(destination,message);
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=932909&r1=932908&r2=932909&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Sun Apr 11 14:15:40 2010
@@ -52,9 +52,12 @@ public class PooledParallelSender extend
try {
sender.sendMessage(destination, message);
sender.keepalive();
+} catch (ChannelException x) {
+sender.disconnect();
+throw x;
} finally {
-if (!connected) disconnect();
returnSender(sender);
+if (!connected) disconnect();
}
}
}
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=932909&r1=932908&r2=932909&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 14:15:40 2010
@@ -78,20 +78,24 @@
-
+
-49051: memberAlive is not called if member has not already
-existed in membership. (kfujino)
+48701: Add a system property to allow disabling enforcement
+of JSP.5.3. The specification recommends, but does not require, this
+enforcement. (kkolinko)
-
+
-48701: Add a system property to allow disabling enforcement
-of JSP.5.3. The specification recommends, but does not require, this
-enforcement. (kkolinko)
+49051: memberAlive is not called if member has not already
+existed in membership. (kfujino)
+
+
+48934: Previous fix to handle dropped connections
incorrectly
+permanently disabled session replication. (fhanik)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48934] Cluster's regression. When replication fails once, replication can be never done again.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48934 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-04-11 10:11:49 EDT --- This has been fixed in 6.0.x and will be included in 6.0.27 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932912 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/manager/ webapps/docs/
Author: markt
Date: Sun Apr 11 14:25:21 2010
New Revision: 932912
URL: http://svn.apache.org/viewvc?rev=932912&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49018
Fix processing of time argument in the "Expire sessions" action in the Manager
web application.
The patch also provides separate templates for different variants of a message,
printed by that action. That is to allow proper translation of those messages,
though I cannot provide such translation by myself. (kkolinko)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.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=932912&r1=932911&r2=932912&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 14:25:21 2010
@@ -243,16 +243,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49018
- Fix processing of time argument in the "Expire sessions" action in the
- Manager web application.
- The patch also provides separate templates for different variants of a
- message, printed by that action. That is to allow proper translation of
- those messages, though I cannot provide such translation by myself.
- http://svn.apache.org/viewvc?rev=931415&view=rev
- +1: kkolinko, markt, kfujino
- -1:
-
* Use chunked encoding for http 1.1 requests with no content-length (regardless
of keep-alive) so client can differentiate between complete and partial
responses.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=932912&r1=932911&r2=932912&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Sun Apr 11 14:25:21 2010
@@ -98,7 +98,9 @@ managerServlet.saveFail=FAIL - Configura
managerServlet.saved=OK - Server configuration saved
managerServlet.savedContext=OK - Context {0} configuration saved
managerServlet.sessiondefaultmax=Default maximum session inactive interval {0}
minutes
-managerServlet.sessiontimeout={0} minutes:{1} sessions
+managerServlet.sessiontimeout={0} minutes: {1} sessions
+managerServlet.sessiontimeout.unlimited=unlimited time: {0} sessions
+managerServlet.sessiontimeout.expired={0} minutes: {1} sessions were expired
managerServlet.sessions=OK - Session information for application at context
path {0}
managerServlet.started=OK - Started application at context path {0}
managerServlet.startFailed=FAIL - Application at context path {0} could not be
started
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties?rev=932912&r1=932911&r2=932912&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
Sun Apr 11 14:25:21 2010
@@ -80,7 +80,10 @@ managerServlet.resourcesType=OK - Auflis
managerServlet.rolesList=OK - Auflistung der Sicherheits-Rollen
managerServlet.saveFail=FEHLER - Speichern der Konfiguration fehlgeschlagen:
{0}
managerServlet.sessiondefaultmax=Voreingestellter Sitzungsablauf nach maximal
{0} Minuten Inaktivit\u00e4t
+#TODO: Please review the following three messages. These are displayed when
"Expire sessions" button is pressed in the Manager webapp:
managerServlet.sessiontimeout={0} Minuten: {1} Sitzungen
+managerServlet.sessiontimeout.unlimited=unlimited Minuten: {0} Sitzungen
+managerServlet.sessiontimeout.expired={0} Minuten: expired {1} Sitzungen
managerServlet.sessions=OK - Sitzungs-Informationen f\u00fcr Anwendung mit
Kontext Pfad {0}
managerServlet.started=OK - Anwendung mit Kontext Pfad {0} gestartet
managerServlet.startFailed=FEHLER - Anwendung mit Kontext Pfad {0} konnte
nicht gestartet werden
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/cata
DO NOT REPLY [Bug 49018] Timeout argument misprocessed when expiring sessions from Tomcat Manager
https://issues.apache.org/bugzilla/show_bug.cgi?id=49018 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-04-11 10:19:43 EDT --- This has been fixed in 6.0.x and will be included in 6.0.26 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: r932913 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/coyote/http11/Http11AprProcessor.java java/org/apache/coyote/http11/Http11NioProcessor.java java/org/apache/coyote/http11/
Author: markt Date: Sun Apr 11 14:30:22 2010 New Revision: 932913 URL: http://svn.apache.org/viewvc?rev=932913&view=rev Log: Use chunked encoding for http 1.1 requests with no content-length (regardless of keep-alive) so client can differentiate between complete and partial responses. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Apr 11 14:30:22 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918594,918684,918787,918792,918799,918885,919851,919914,920025,920055,920298,920449,920596 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,7
svn commit: r932916 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Apr 11 14:34:11 2010 New Revision: 932916 URL: http://svn.apache.org/viewvc?rev=932916&view=rev Log: Add another patch to the JNDI proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=932916&r1=932915&r2=932916&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 14:34:11 2010 @@ -91,12 +91,13 @@ PATCHES PROPOSED TO BACKPORT: Based on a patch by Candid Dauth http://svn.apache.org/viewvc?rev=910485&view=rev http://svn.apache.org/viewvc?rev=918489&view=rev (review feedback) + http://svn.apache.org/viewvc?rev=918803&view=rev (additional patch) +1: markt, kkolinko, rjung -1: Additional patch: - http://svn.apache.org/viewvc?rev=918803&view=rev - +1: kkolinko, markt, rjung + http://svn.apache.org/viewvc?view=revision&revision=932357 + +1: markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932926 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Author: rjung
Date: Sun Apr 11 15:53:07 2010
New Revision: 932926
URL: http://svn.apache.org/viewvc?rev=932926&view=rev
Log:
Ignore request handling time in session lastAccessedTime
when acting servlet spec compliant.
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=932926&r1=932925&r2=932926&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Apr
11 15:53:07 2010
@@ -643,8 +643,18 @@ public class StandardSession
public void endAccess() {
isNew = false;
-this.thisAccessedTime = System.currentTimeMillis();
-this.lastAccessedTime = this.thisAccessedTime;
+
+/**
+ * The servlet spec mandates to ignore request handling time
+ * in lastAccessedTime.
+ */
+if (Globals.STRICT_SERVLET_COMPLIANCE) {
+this.lastAccessedTime = this.thisAccessedTime;
+this.thisAccessedTime = System.currentTimeMillis();
+} else {
+this.thisAccessedTime = System.currentTimeMillis();
+this.lastAccessedTime = this.thisAccessedTime;
+}
if (ACTIVITY_CHECK) {
accessCount.decrementAndGet();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932953 - in /tomcat/trunk/java/org/apache: catalina/security/SecurityClassLoad.java tomcat/util/net/JIoEndpoint.java
Author: rjung
Date: Sun Apr 11 17:47:00 2010
New Revision: 932953
URL: http://svn.apache.org/viewvc?rev=932953&view=rev
Log:
Allow JioEndpoint to switch context class loader
under security manager. Code copied from standard session.
Add two more classes to class pre-loading to improve
security manager interoperability.
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=932953&r1=932952&r2=932953&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Sun
Apr 11 17:47:00 2010
@@ -131,6 +131,7 @@ public final class SecurityClassLoad {
throws Exception {
String basePackage = "org.apache.catalina.";
loader.loadClass(basePackage + "util.Enumerator");
+loader.loadClass(basePackage + "util.ParameterMap");
}
@@ -234,6 +235,8 @@ public final class SecurityClassLoad {
throws Exception {
String basePackage = "org.apache.tomcat.";
loader.loadClass(basePackage + "util.net.SSLSupport$CipherData");
+loader.loadClass
+(basePackage + "util.net.JIoEndpoint$PrivilegedSetTccl");
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=932953&r1=932952&r2=932953&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sun Apr 11
17:47:00 2010
@@ -22,10 +22,13 @@ import java.net.BindException;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Iterator;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.RejectedExecutionException;
+import org.apache.catalina.Globals;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -507,10 +510,22 @@ public class JIoEndpoint extends Abstrac
ClassLoader loader =
Thread.currentThread().getContextClassLoader();
try {
//threads should not be created by the webapp
classloader
-
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedSetTccl(
+getClass().getClassLoader());
+AccessController.doPrivileged(pa);
+} else {
+Thread.currentThread().setContextClassLoader(
+getClass().getClassLoader());
+}
getExecutor().execute(proc);
}finally {
-Thread.currentThread().setContextClassLoader(loader);
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new
PrivilegedSetTccl(loader);
+AccessController.doPrivileged(pa);
+} else {
+
Thread.currentThread().setContextClassLoader(loader);
+}
}
}
}
@@ -524,5 +539,20 @@ public class JIoEndpoint extends Abstrac
}
protected ConcurrentLinkedQueue waitingRequests = new
ConcurrentLinkedQueue();
+
+private static class PrivilegedSetTccl
+implements PrivilegedAction {
+
+private ClassLoader cl;
+
+PrivilegedSetTccl(ClassLoader cl) {
+this.cl = cl;
+}
+
+public Void run() {
+Thread.currentThread().setContextClassLoader(cl);
+return null;
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932965 - in /tomcat/trunk/test/org/apache: el/parser/ el/parser/TestELParser.java jasper/compiler/TestAttributeParser.java
Author: markt
Date: Sun Apr 11 18:09:16 2010
New Revision: 932965
URL: http://svn.apache.org/viewvc?rev=932965&view=rev
Log:
Add test cases for https://issues.apache.org/bugzilla/show_bug.cgi?id=49081
"#${1+1}" should evaluate to "#2"
Added:
tomcat/trunk/test/org/apache/el/parser/
tomcat/trunk/test/org/apache/el/parser/TestELParser.java (with props)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
Added: tomcat/trunk/test/org/apache/el/parser/TestELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/parser/TestELParser.java?rev=932965&view=auto
==
--- tomcat/trunk/test/org/apache/el/parser/TestELParser.java (added)
+++ tomcat/trunk/test/org/apache/el/parser/TestELParser.java Sun Apr 11
18:09:16 2010
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.el.parser;
+
+import javax.el.ELContext;
+import javax.el.ExpressionFactory;
+import javax.el.ValueExpression;
+
+import org.apache.jasper.el.ELContextImpl;
+
+import junit.framework.TestCase;
+
+public class TestELParser extends TestCase {
+
+public void testBug49081() {
+ExpressionFactory factory = ExpressionFactory.newInstance();
+ELContext context = new ELContextImpl();
+
+ValueExpression ve = factory.createValueExpression(
+context, "#${1+1}", String.class);
+
+// First check the basics work
+String result = (String) ve.getValue(context);
+assertEquals("#2", result);
+}
+
+}
Propchange: tomcat/trunk/test/org/apache/el/parser/TestELParser.java
--
svn:eol-style = native
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java?rev=932965&r1=932964&r2=932965&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java Sun
Apr 11 18:09:16 2010
@@ -113,6 +113,10 @@ public class TestAttributeParser extends
assertEquals("\\2", evalAttr("${1+1}", '\"'));
}
+public void testBug49081() {
+assertEquals("#2", evalAttr("#${1+1}", '\"'));
+}
+
public void testLiteral() {
// Inspired by work on bug 45451, comments from kkolinko on the dev
// list and looking at the spec to find some edge cases
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r932967 - in /tomcat/trunk/java/org/apache/el/parser: ELParser.jjt ELParserTokenManager.java ELParserTreeConstants.java JJTELParserState.java ParseException.java SimpleCharStream.java Toke
Author: markt
Date: Sun Apr 11 18:15:02 2010
New Revision: 932967
URL: http://svn.apache.org/viewvc?rev=932967&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49081
"#${1+1}" should evaluate to "#2"
Note that all files apart from ELParser.jjt are generated by javacc from the
changes to ELParser.jjt
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java
tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java
tomcat/trunk/java/org/apache/el/parser/ParseException.java
tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java
tomcat/trunk/java/org/apache/el/parser/Token.java
tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?rev=932967&r1=932966&r2=932967&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Sun Apr 11 18:15:02 2010
@@ -368,7 +368,7 @@ void Null() #Null : {}
*/
< LITERAL_EXPRESSION:
( (~["$", "#", "\\"])* "\\" (["$", "#"])?
- | (~["$", "#"])* (["$", "#"] ~["{"])
+ | (~["$", "#"])* (["$", "#"] ~["{", "$", "#"])
| (~["$", "#"])+
)+
| "$"
Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=932967&r1=932966&r2=932967&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Sun Apr 11
18:15:02 2010
@@ -128,6 +128,8 @@ private int jjMoveNfa_0(int startState,
jjCheckNAdd(5);
break;
case 5:
+ if ((0xffe7L & l) == 0L)
+ break;
if (kind > 1)
kind = 1;
jjCheckNAddStates(5, 8);
Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java?rev=932967&r1=932966&r2=932967&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java Sun Apr
11 18:15:02 2010
@@ -76,4 +76,4 @@ public interface ELParserTreeConstants
"Null",
};
}
-/* JavaCC - OriginalChecksum=57a11486271882e4bdcb1543fa567329 (do not edit
this line) */
+/* JavaCC - OriginalChecksum=437008e736f149e8fa6712fb36d831a1 (do not edit
this line) */
Modified: tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java?rev=932967&r1=932966&r2=932967&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java Sun Apr 11
18:15:02 2010
@@ -120,4 +120,4 @@ public class JJTELParserState {
}
}
}
-/* JavaCC - OriginalChecksum=9ea5296a2e1d85c8100fe40283f86cfd (do not edit
this line) */
+/* JavaCC - OriginalChecksum=70ac39f1e0e1eed7476e1dae2dfa25fa (do not edit
this line) */
Modified: tomcat/trunk/java/org/apache/el/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ParseException.java?rev=932967&r1=932966&r2=932967&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ParseException.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ParseException.java Sun Apr 11
18:15:02 2010
@@ -184,4 +184,4 @@ public class ParseException extends Exce
}
}
-/* JavaCC - OriginalChecksum=275dbff1ac8d899b542b475adbf177f7 (do not edit
this line) */
+/* JavaCC - OriginalChecksum=87586a39aa89f164889cc59bc6a7e7ad (do not edit
this line) */
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java?rev=932967&r1=932966&r2=932967&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java Sun Apr 11
18:15:02 2010
@@ -468,4 +468,4 @@ public class SimpleCharStream
}
}
-/* Java
svn commit: r932969 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Author: rjung
Date: Sun Apr 11 18:26:20 2010
New Revision: 932969
URL: http://svn.apache.org/viewvc?rev=932969&view=rev
Log:
Reduce failures of new API when running under security manager.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=932969&r1=932968&r2=932969&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Sun Apr 11 18:26:20 2010
@@ -103,6 +103,15 @@ public final class ApplicationContextFac
classCache.put("getRequestDispatcher", clazz);
classCache.put("getNamedDispatcher", clazz);
classCache.put("getServlet", clazz);
+classCache.put("setInitParameter", new Class[]{String.class,
String.class});
+classCache.put("createServlet", new Class[]{Class.class});
+classCache.put("addServlet", new Class[]{String.class, String.class});
+classCache.put("createFilter", new Class[]{Class.class});
+classCache.put("addFilter", new Class[]{String.class, String.class});
+classCache.put("createListener", new Class[]{Class.class});
+classCache.put("addListener", clazz);
+classCache.put("getFilterRegistration", clazz);
+classCache.put("getServletRegistration", clazz);
classCache.put("getInitParameter", clazz);
classCache.put("setAttribute", new Class[]{String.class,
Object.class});
classCache.put("removeAttribute", clazz);
@@ -110,8 +119,6 @@ public final class ApplicationContextFac
classCache.put("getAttribute", clazz);
classCache.put("log", clazz);
classCache.put("setSessionTrackingModes", new Class[]{EnumSet.class} );
-classCache.put("setSessionCookieConfig",
-new Class[]{SessionCookieConfig.class});
}
@@ -414,7 +421,7 @@ public final class ApplicationContextFac
Filter filter) {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (FilterRegistration.Dynamic) doPrivileged(
-"addFilter", new Object[]{filterName, filter});
+"addFilter", new Class[]{String.class, Filter.class}, new
Object[]{filterName, filter});
} else {
return context.addFilter(filterName, filter);
}
@@ -425,7 +432,7 @@ public final class ApplicationContextFac
Class filterClass) {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (FilterRegistration.Dynamic) doPrivileged(
-"addFilter", new Object[]{filterName, filterClass});
+"addFilter", new Object[]{filterName,
filterClass.getName()});
} else {
return context.addFilter(filterName, filterClass);
}
@@ -435,8 +442,15 @@ public final class ApplicationContextFac
public T createFilter(Class c)
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
-return (T) doPrivileged(
-"createFilter", new Object[]{c});
+try {
+return (T) invokeMethod(context, "createFilter",
+ new Object[]{c});
+} catch (Throwable t) {
+if (t instanceof ServletException) {
+throw (ServletException) t;
+}
+return null;
+}
} else {
return context.createFilter(c);
}
@@ -446,7 +460,7 @@ public final class ApplicationContextFac
public FilterRegistration getFilterRegistration(String filterName) {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (FilterRegistration) doPrivileged(
-"findFilterRegistration", new Object[]{filterName});
+"getFilterRegistration", new Object[]{filterName});
} else {
return context.getFilterRegistration(filterName);
}
@@ -468,7 +482,7 @@ public final class ApplicationContextFac
Servlet servlet) {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (ServletRegistration.Dynamic) doPrivileged(
-"addServlet", new Object[]{servletName, servlet});
+"addServlet", new Class[]{String.class, Servlet.class},
new Object[]{servletName, servlet});
} else {
return context.addServlet(servletName, servlet);
}
@@ -479,7 +493,7 @@ public final class ApplicationContextFac
Class servletClass) {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (ServletRegistration.Dynamic) doPrivile
DO NOT REPLY [Bug 49086] New: Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 Summary: Addition of Javadoc for Servlet 3.0 annotations Product: Tomcat 7 Version: trunk Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: bugzi...@pidster.com Created an attachment (id=25252) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25252) Javadoc patch for WebServlet annotation Addition of Javadoc for Servlet 3.0 javax.servlet.annotation package. Several patches to follow. -- 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 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 --- Comment #1 from Pid 2010-04-11 16:46:32 EDT --- Created an attachment (id=25253) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25253) Javadoc patch for WebListener annotation -- 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 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 Pid changed: What|Removed |Added Attachment #25252|application/octet-stream|text/plain mime type|| Attachment #25252|0 |1 is patch|| -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 --- Comment #2 from Pid 2010-04-11 16:47:58 EDT --- Created an attachment (id=25254) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25254) Javadoc patch for WebInitParam annotation -- 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 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 --- Comment #3 from Pid 2010-04-11 16:48:32 EDT --- Created an attachment (id=25255) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25255) Javadoc patch for WebFilter annotation -- 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 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 --- Comment #4 from Pid 2010-04-11 16:49:32 EDT --- Created an attachment (id=25256) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25256) Javadoc patch for ServletSecurity annotation -- 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 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 --- Comment #5 from Pid 2010-04-11 16:50:18 EDT --- Created an attachment (id=25257) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25257) Javadoc patch for MultipartConfig annotation -- 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: r932989 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Author: rjung
Date: Sun Apr 11 20:51:16 2010
New Revision: 932989
URL: http://svn.apache.org/viewvc?rev=932989&view=rev
Log:
Use spec compliant session expiration in STRICT_SERVLET_COMPLIANCE mode.
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=932989&r1=932988&r2=932989&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Apr
11 20:51:16 2010
@@ -598,7 +598,12 @@ public class StandardSession
if (maxInactiveInterval >= 0) {
long timeNow = System.currentTimeMillis();
-int timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L);
+int timeIdle;
+if (Globals.STRICT_SERVLET_COMPLIANCE) {
+timeIdle = (int) ((timeNow - lastAccessedTime) / 1000L);
+} else {
+timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L);
+}
if (timeIdle >= maxInactiveInterval) {
expire(true);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 --- Comment #6 from Pid 2010-04-11 16:51:17 EDT --- Created an attachment (id=25258) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25258) Javadoc patch for HttpMethodConstraint annotation -- 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 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 --- Comment #7 from Pid 2010-04-11 16:51:54 EDT --- Created an attachment (id=25259) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25259) Javadoc patch for HttpConstraint annotation -- 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 49086] Addition of Javadoc for Servlet 3.0 annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49086 --- Comment #8 from Pid 2010-04-11 16:52:41 EDT --- Created an attachment (id=25260) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25260) Javadoc patch for HandlesTypes annotation -- 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: r933007 - in /tomcat/trunk/java: javax/el/ExpressionFactory.java org/apache/el/parser/AstValue.java
Author: markt
Date: Sun Apr 11 22:43:09 2010
New Revision: 933007
URL: http://svn.apache.org/viewvc?rev=933007&view=rev
Log:
TCK failures: EL TCK with security manager
Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=933007&r1=933006&r2=933007&view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Sun Apr 11 22:43:09 2010
@@ -27,6 +27,8 @@ import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Properties;
/**
@@ -34,15 +36,46 @@ import java.util.Properties;
* @since 2.1
*/
public abstract class ExpressionFactory {
+
+private static final boolean IS_SECURITY_ENABLED =
+(System.getSecurityManager() != null);
private static final String SERVICE_RESOURCE_NAME =
"META-INF/services/javax.el.ExpressionFactory";
-private static final String SEP = System.getProperty("file.separator");
-private static final String PROPERTY_FILE =
-System.getProperty("java.home") + "lib" + SEP + "el.properties";
private static final String PROPERTY_NAME = "javax.el.ExpressionFactory";
+private static final String SEP;
+private static final String PROPERTY_FILE;
+
+static {
+if (IS_SECURITY_ENABLED) {
+SEP = AccessController.doPrivileged(
+new PrivilegedAction(){
+@Override
+public String run() {
+return System.getProperty("file.separator");
+}
+
+}
+);
+PROPERTY_FILE = AccessController.doPrivileged(
+new PrivilegedAction(){
+@Override
+public String run() {
+return System.getProperty("java.home") + "lib" +
+SEP + "el.properties";
+}
+
+}
+);
+} else {
+SEP = System.getProperty("file.separator");
+PROPERTY_FILE = System.getProperty("java.home") + "lib" + SEP +
+"el.properties";
+}
+}
+
public abstract Object coerceToType(Object obj, Class expectedType)
throws ELException;
@@ -90,12 +123,34 @@ public abstract class ExpressionFactory
// First services API
className = getClassNameServices(tccl);
if (className == null) {
-// Second el.properties file
-className = getClassNameJreDir();
+if (IS_SECURITY_ENABLED) {
+className = AccessController.doPrivileged(
+new PrivilegedAction() {
+@Override
+public String run() {
+return getClassNameJreDir();
+}
+}
+);
+} else {
+// Second el.properties file
+className = getClassNameJreDir();
+}
}
if (className == null) {
-// Third system property
-className = getClassNameSysProp();
+if (IS_SECURITY_ENABLED) {
+className = AccessController.doPrivileged(
+new PrivilegedAction() {
+@Override
+public String run() {
+return getClassNameSysProp();
+}
+}
+);
+} else {
+// Third system property
+className = getClassNameSysProp();
+}
}
if (className == null) {
// Fourth - default
@@ -225,4 +280,5 @@ public abstract class ExpressionFactory
}
return null;
}
+
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=933007&r1=933006&r2=933007&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Sun Apr 11 22:43:09
2010
@@ -20,6 +20,8 @@ package org.apache.el.parser;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.security.AccessContro
svn commit: r933012 - /tomcat/trunk/build.properties.default
Author: markt Date: Sun Apr 11 22:52:44 2010 New Revision: 933012 URL: http://svn.apache.org/viewvc?rev=933012&view=rev Log: Prepare for RC1 release Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=933012&r1=933011&r2=933012&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Sun Apr 11 22:52:44 2010 @@ -29,7 +29,7 @@ version.major=7 version.minor=0 version.build=0 version.patch=0 -version.suffix=-dev +version.suffix=-RC1 # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r933020 - /tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC1/
Author: markt Date: Sun Apr 11 23:01:37 2010 New Revision: 933020 URL: http://svn.apache.org/viewvc?rev=933020&view=rev Log: Tag 7.0.0-RC1 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC1/ (props changed) - copied from r933019, tomcat/trunk/ Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC1/ -- --- svn:ignore (added) +++ svn:ignore Sun Apr 11 23:01:37 2010 @@ -0,0 +1,3 @@ +output +.settings +build.properties Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC1/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk:742915 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r933021 - /tomcat/trunk/build.properties.default
Author: markt Date: Sun Apr 11 23:02:13 2010 New Revision: 933021 URL: http://svn.apache.org/viewvc?rev=933021&view=rev Log: Back to -dev Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=933021&r1=933020&r2=933021&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Sun Apr 11 23:02:13 2010 @@ -29,7 +29,7 @@ version.major=7 version.minor=0 version.build=0 version.patch=0 -version.suffix=-RC1 +version.suffix=-dev # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Taglibs [2010/04/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27717|New|Maj|2004-03-16| very slow in JSTL 1.1 | |33934|New|Cri|2005-03-09|[standard] memory leak in jstl c:set tag | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Nor|2007-05-14|[PATCH] Log Taglib enhancements | |43640|New|Nor|2007-10-16|Move the tests package to JUnit | |45197|Ass|Nor|2008-06-12|Need to support the JSTL 1.2 specification| |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Nor|2009-12-02|TLD generator | |48773|New|Nor|2010-02-19|DataSourceWrapper and DriverManager problems | +-+---+---+--+--+ | Total 10 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 5 [2010/04/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat| |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi| |33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis| |33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps| |33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na| |34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a| |34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern| |34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that| |35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc| |36133|Inf|Enh|2005-08-10|Support JSS SSL implementation| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's | |36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re| |36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing | |37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis| |37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user | |37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre| |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti| |38360|Inf|Enh|2006-01-24|Domain for session cookies| |38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, | |38577|Inf|Enh|2006-02-08|Enhance logging of security failures | |38743|New|Min|2006-02-21|when using APR, JKS options are silently ignored | |38916|Inf|Enh|2006-03-10|HttpServletRequest cannot handle multipart request| |39053|Inf|Enh|2006-03-21|include Tomcat embedded sample| |39740|New|Enh|2006-06-07|semi-colon ; isn't allowed as a query argument sep| |39862|Inf|Enh|2006-06-22|provide support for protocol-independent GenericSe| |40211|Inf|Enh|2006-08-08|Compiled JSP don't indent HTML code | |40222|Inf|Enh|2006-08-09|Default Tomcat configuration alows easy session hi| |40402|New|Enh|2006-09-03|Manager should display Exceptions | |40510|New|Enh|2006-09-14|installer does not create shortcuts for all users | |40712|New|Enh|2006-10-10|Realm admin error.| |40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes | |40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov| |40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |41179|New|Enh|2006-12-15|400 Bad Request response during auto re-deployment| |41227|Opn|Enh|2006-12-21|When the jasper compiler fails to compile a JSP, i| |41337|Opn|Enh|2007-01-10|Display an error page if no cert is available on C| |41496|New|Enh|2007-01-30|set a security provider for jsse in a connector co| |41498|New|Enh|2007-01-30|allRolesMode Realm configuration option not docume| |41539|Inf|Enh|2007-02-05|NullPointerException during Embedded tomcat restar| |41673|New|Enh|2007-02-21|Jasper output the message of compiling error using| |41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows| |41709|Inf|Enh|2007-02-26|When calling the API that relates to the buffer af| |41718|New|Enh|2007-02-27|Status 302 response to GET request has no body whe| |42390|New|Maj|2007-05-11|JSP compilation error with nested tagfile tags wit| |42416|New|Enh|2007-05-14|Tomcat startup hangs and AJP13 connector port 8009| |43423|New|Enh|2007-09-18|catalina.sh -force too fast | |43538|
Bug report for Tomcat 7 [2010/04/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48222|New|Enh|2009-11-18|Source JARs empty in maven central| |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48297|New|Nor|2009-11-28|webservices.ServiceRefFactory.initHandlerChain add| |48358|New|Enh|2009-12-09|JSP-unloading reloaded| |48550|New|Enh|2010-01-14|Update examples and default server.xml to use UTF-| |48644|New|Nor|2010-01-30|Code should never ignore throwable| |48648|New|Nor|2010-01-31|Blank page (dropped connection) when running TC7 w| |48689|New|Enh|2010-02-05|Jar abstraction for Jasper| |48692|New|Enh|2010-02-07|Provide option to parse application/x-www-form-url| |48817|New|Nor|2010-02-25|Skip validation query and use JDBC API for validat| |48837|New|Enh|2010-03-01|Memory leaks protection does not cure leaks trigge| |48861|New|Nor|2010-03-04|Files without AL headers | |48870|New|Enh|2010-03-08|avoid parallel arrays of base types | |48891|New|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk | |48892|New|Enh|2010-03-11|Use URIEncoding from server.xml for decoding post | |48998|New|Enh|2010-03-26|Proposal : port mod_expires in java as ExpiresFilt| |49000|New|Enh|2010-03-26|Cookie parsing bug when an empty value has an equa| |49024|New|Enh|2010-03-30|Enhance RemoteIpFilter docs | |49045|New|Nor|2010-04-04|JMX Enhancement- Provision of MBeanFactory createS| |49082|New|Nor|2010-04-09|ExpressionFactory.newInstance needs to be privileg| +-+---+---+--+--+ | Total 21 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Connectors [2010/04/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |36155|Opn|Nor|2005-08-12|tomcat chooses wrong host if using mod_jk | |39967|Inf|Nor|2006-07-05|mod_jk gives segmentation fault when apache is sta| |40208|Inf|Nor|2006-08-08|Request-Dump when ErrorDocument in httpd.conf is a| |41170|Inf|Nor|2006-12-13|single crlf in header termination crashes app.| |41923|Opn|Nor|2007-03-21|Tomcat doesnt recognized client abort | |42366|Inf|Nor|2007-05-09|Memory leak in newer mod_jk version when connectio| |42554|Opn|Nor|2007-05-31|mod_ssl + mod_jk with status_worker does not work | |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|New|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|New|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|New|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s| |44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 | |44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc| |44571|New|Enh|2008-03-10|Limits busy per worker to a threshold | |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |45395|New|Min|2008-07-14|MsgAjp dump method does not dump packet when being| |46337|New|Nor|2008-12-04|real worker name is wrong | |46406|New|Enh|2008-12-16|Supporting relative paths in isapi_redirect.proper| |46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47038|New|Enh|2009-04-15|USE_FLOCK_LK redefined compiler warning when using| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|New|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Nor|2009-08-11|Unable to allocate shared memory when using isapi_| |47679|New|Nor|2009-08-11|Not all headers get passed to Tomcat server from i| |47692|New|Reg|2009-08-12|Can not compile mod_jk with apache2.0.63 and tomca| |47714|New|Cri|2009-08-20|Reponse mixed between users | |47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |47840|Inf|Min|2009-09-14|A broken worker name is written in the log file. | |48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48501|New|Enh|2010-01-07|Log rotation for ISAPI Redirector | |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker | |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |48925|New|Maj|2010-03-16|((ServletRequest) request).getLocalAddr() returns | |48940|New|Maj|2010-03-18|IIS to Tomcat occasionally fails on POST with T-E | |49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form| |49048|New|Nor|2010-04-05|ACL not applied to redirect URLs | |49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work| +-+---+---+--+--+ | Total 44 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 6 [2010/04/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |39661|Opn|Enh|2006-05-25|Please document JULI FileHandler configuration pro| |41128|Inf|Enh|2006-12-07|Reference to java Thread name from RequestProcesso| |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |41791|New|Enh|2007-03-07|Tomcat behaves inconsistently concerning flush-pac| |41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific| |41944|New|Enh|2007-03-25|Start running the RAT tool to see where we're miss| |41992|New|Enh|2007-03-30|Need ability to set OS process title | |42463|New|Enh|2007-05-20|"crossContext" and classloader issues - pls amend | |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43003|New|Enh|2007-07-30|Separate dependent component download and build ta| |43400|New|Enh|2007-09-14|enum support for tag libs | |43497|New|Enh|2007-09-26|Add ability to escape rendered output of JSP expre| |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43642|New|Enh|2007-10-17|Add prestartminSpareThreads attribute for Executor| |43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor| |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43790|Ass|Enh|2007-11-03|concurrent access issue on TagHandlerPool | |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44047|New|Enh|2007-12-10|Provide a way for Tomcat to serve up error pages w| |44106|New|Enh|2007-12-19|autodeploy configures directories which do not con| |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an| |44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag | |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44299|New|Enh|2008-01-26|Provider manager app with a log out button| |44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host| |44598|New|Enh|2008-03-13|JAASRealm is suppressing Exceptions | |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45015|Opn|Nor|2008-05-16|Quoting in attributes | |45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets| |45283|Opn|Enh|2008-06-25|Allow multiple authenticators to be added to pipel| |45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete | |45654|New|Enh|2008-08-19|use static methods and attributes in a direct way!| |45731|New|Enh|2008-09-02|Enhancement request : pluggable httpsession cache | |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45871|New|Enh|2008-09-23|Support for salted and digested patches in DataSou| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive | |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex| |46264|New|Enh|2008-11-21|Shutting down tomcat with large number of contexts| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46451|New|Enh|2008-12-30|Configure svn:bugtraq properties | |46461|New|Enh|2009-01-01|fail graceful on dns changes for connectors/hosts | |46497|
Bug report for Tomcat Native [2010/04/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38372|Inf|Cri|2006-01-25|tcnative-1.dll response overflow corruption, parti| |41361|New|Nor|2007-01-14|Content lost when read by a slow client. | |42090|New|Cri|2007-04-11|tcnative badly handles some OpenSSL disconnections| |45392|New|Nor|2008-07-14|No OCSP support for client SSL verification | |46041|New|Cri|2008-10-20|Tomcat service is terminated unexpectedly (tcnativ| |46179|New|Maj|2008-11-10|apr ssl client authentication | |46571|New|Nor|2009-01-21|tcnative blocks in APR poll on Solaris| |47319|New|Nor|2009-06-05|With APR, getRemoteHost() returns NULL for unknown| |47851|New|Nor|2009-09-16|thread-safety issues in the TC native Java code | |48253|New|Min|2009-11-20|Tomcat Native patch - adding dynamic locking callb| |48655|New|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| +-+---+---+--+--+ | Total 11 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49089] New: ChannelData.USE_SECURE_RANDOM_FOR_UUID public static mutable field
https://issues.apache.org/bugzilla/show_bug.cgi?id=49089 Summary: ChannelData.USE_SECURE_RANDOM_FOR_UUID public static mutable field 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 catalina.tribes.io.ChannelData.USE_SECURE_RANDOM_FOR_UUID is a mutable public static field. It's only used by an instance method, so there's no need for it to be static. Probably no need for it to be public either; it could be a private field with a setter - or better a final field set by the constructor. -- 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 49091] New: Util.specialCharactersRepresentation should be private
https://issues.apache.org/bugzilla/show_bug.cgi?id=49091 Summary: Util.specialCharactersRepresentation should be private Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org jasper.tagplugins.jstl.Util.specialCharactersRepresentation is a mutable public static array; it is not used outside the class as far as I can tell and so should 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
DO NOT REPLY [Bug 49092] New: util.IntrospectionUtils.PATH_SEPARATOR should be final
https://issues.apache.org/bugzilla/show_bug.cgi?id=49092 Summary: util.IntrospectionUtils.PATH_SEPARATOR 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 The field org.apache.tomcat.util.IntrospectionUtils.PATH_SEPARATOR should be final. -- 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
