[Tomcat Wiki] Update of www.aol.com by christinaslay
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The www.aol.com page has been changed by christinaslay: http://wiki.apache.org/tomcat/www.aol.com New page: Describe www.aol.com here. Web email - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1346794 - in /tomcat/trunk/java/org/apache/catalina/ha/session: ClusterManagerBase.java mbeans-descriptors.xml
Author: kfujino Date: Wed Jun 6 09:06:36 2012 New Revision: 1346794 URL: http://svn.apache.org/viewvc?rev=1346794view=rev Log: Add support for SecureRandom to cluster manager template. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1346794r1=1346793r2=1346794view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Wed Jun 6 09:06:36 2012 @@ -189,6 +189,9 @@ public abstract class ClusterManagerBase copy.setProcessExpiresFrequency(getProcessExpiresFrequency()); copy.setNotifyListenersOnReplication(isNotifyListenersOnReplication()); copy.setSessionAttributeFilter(getSessionAttributeFilter()); +copy.setSecureRandomClass(getSecureRandomClass()); +copy.setSecureRandomProvider(getSecureRandomProvider()); +copy.setSecureRandomAlgorithm(getSecureRandomAlgorithm()); } } Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1346794r1=1346793r2=1346794view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Wed Jun 6 09:06:36 2012 @@ -87,10 +87,6 @@ type=int writeable=false/ attribute - name=algorithm - description=The message digest algorithm to be used when generating session identifiers - type=java.lang.String/ -attribute name=className description=Fully qualified class name of the managed object type=java.lang.String @@ -194,10 +190,6 @@ description=Number of duplicated session ids generated type=int/ attribute - name=entropy - description=A String initialization parameter used to increase the entropy of the initialization of our random number generator - type=java.lang.String/ -attribute name=expiredSessions description=Number of sessions that expired ( doesn't include explicit invalidations ) type=long/ @@ -313,6 +305,18 @@ is=true description=Is no context manager message received? type=boolean/ +attribute + name=secureRandomAlgorithm + description=The secure random number generator algorithm name + type=java.lang.String/ +attribute + name=secureRandomClass + description=The secure random number generator class name + type=java.lang.String/ +attribute + name=secureRandomProvider + description=The secure random number generator provider name + type=java.lang.String/ operation name=expireSession description=Expired the given session @@ -426,10 +430,6 @@ type=int writeable=false/ attribute - name=algorithm - description=The message digest algorithm to be used when generating session identifiers - type=java.lang.String/ -attribute name=className description=Fully qualified class name of the managed object type=java.lang.String @@ -443,10 +443,6 @@ description=Number of duplicated session ids generated type=int/ attribute - name=entropy - description=A String initialization parameter used to increase the entropy of the initialization of our random number generator - type=java.lang.String/ -attribute name=expiredSessions description=Number of sessions that expired ( doesn't include explicit invalidations ) type=long/ @@ -530,6 +526,18 @@ name=rpcTimeout description=Timeout for RPC messages, how long we will wait for a reply type=long/ +attribute + name=secureRandomAlgorithm + description=The secure random number generator algorithm name + type=java.lang.String/ +attribute + name=secureRandomClass + description=The secure random number generator class name + type=java.lang.String/ +attribute + name=secureRandomProvider + description=The secure random number generator provider name + type=java.lang.String/ operation name=expireSession description=Expired the given session - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 47612] [PATCH] fix unsafe public string array in AbstractCreateStatementInterceptor
https://issues.apache.org/bugzilla/show_bug.cgi?id=47612 Zbigniew lis...@wp.pl changed: What|Removed |Added CC||lis...@wp.pl -- 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: r1346795 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/session/ClusterManagerBase.java java/org/apache/catalina/ha/session/mbeans-descriptors.xml webapps/docs/changelog.xml
Author: kfujino Date: Wed Jun 6 09:08:36 2012 New Revision: 1346795 URL: http://svn.apache.org/viewvc?rev=1346795view=rev Log: Add support for SecureRandom to cluster manager template. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1346795r1=1346794r2=1346795view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Wed Jun 6 09:08:36 2012 @@ -189,6 +189,9 @@ public abstract class ClusterManagerBase copy.setProcessExpiresFrequency(getProcessExpiresFrequency()); copy.setNotifyListenersOnReplication(isNotifyListenersOnReplication()); copy.setSessionAttributeFilter(getSessionAttributeFilter()); +copy.setSecureRandomClass(getSecureRandomClass()); +copy.setSecureRandomProvider(getSecureRandomProvider()); +copy.setSecureRandomAlgorithm(getSecureRandomAlgorithm()); } } Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1346795r1=1346794r2=1346795view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Wed Jun 6 09:08:36 2012 @@ -97,10 +97,6 @@ type=int writeable=false/ attribute - name=algorithm - description=The message digest algorithm to be used when generating session identifiers - type=java.lang.String/ -attribute name=className description=Fully qualified class name of the managed object type=java.lang.String @@ -204,10 +200,6 @@ description=Number of duplicated session ids generated type=int/ attribute - name=entropy - description=A String initialization parameter used to increase the entropy of the initialization of our random number generator - type=java.lang.String/ -attribute name=expiredSessions description=Number of sessions that expired ( doesn't include explicit invalidations ) type=long/ @@ -328,6 +320,18 @@ is=true description=Is no context manager message received? type=boolean/ +attribute + name=secureRandomAlgorithm + description=The secure random number generator algorithm name + type=java.lang.String/ +attribute + name=secureRandomClass + description=The secure random number generator class name + type=java.lang.String/ +attribute + name=secureRandomProvider + description=The secure random number generator provider name + type=java.lang.String/ operation name=expireSession description=Expired the given session @@ -441,10 +445,6 @@ type=int writeable=false/ attribute - name=algorithm - description=The message digest algorithm to be used when generating session identifiers - type=java.lang.String/ -attribute name=className description=Fully qualified class name of the managed object type=java.lang.String @@ -458,10 +458,6 @@ description=Number of duplicated session ids generated type=int/ attribute - name=entropy - description=A String initialization parameter used to increase the entropy of the initialization of our random number generator - type=java.lang.String/ -attribute name=expiredSessions description=Number of sessions that expired ( doesn't include explicit invalidations ) type=long/ @@ -545,6 +541,18 @@ name=rpcTimeout description=Timeout for RPC messages, how long we will wait for a reply type=long/ +attribute + name=secureRandomAlgorithm + description=The secure random number generator algorithm name + type=java.lang.String/ +attribute + name=secureRandomClass + description=The secure random number generator class name + type=java.lang.String/ +attribute + name=secureRandomProvider + description=The secure random number generator provider name + type=java.lang.String/ operation name=expireSession description=Expired the given session Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL:
[jira] [Commented] (MTOMCAT-158) WAR Overlay Does Not Include Resources
[
https://issues.apache.org/jira/browse/MTOMCAT-158?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13290042#comment-13290042
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-158:
So applying and quickly testing the patch, it cause issue (no backward
compatible change) on a project I work (sorry I didn't get time to investigate
more).
The project is located @ http://svn.apache.org/repos/asf/archiva/trunk/.
To reproduce just use :
{code}
svn co http://svn.apache.org/repos/asf/archiva/trunk/ archiva-trunk
cd archiva-trunk
mvn tomcat6:run -Pdev -Ptomcat -pl :archiva-webapp -am
{code}
WAR Overlay Does Not Include Resources
--
Key: MTOMCAT-158
URL: https://issues.apache.org/jira/browse/MTOMCAT-158
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6, tomcat7
Affects Versions: 2.0
Reporter: Robert Hollencamp
Assignee: Olivier Lamy (*$^¨%`£)
Attachments: MTOMCAT-158-1.diff
When running tomcat[67]:run on a web application that includes WAR overlays,
static resources in those WAR overlays are not seen by the spawned tomcat
server.
Currently, WAR overlays are extracted (to target/apache-tomcat-maven-plugin)
and CLASS files are added to the classpath.
WAR overlays can also contain static resources, like JSP, CSS, JS, etc.
Tomcat needs to be aware of these resources
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1346844 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Wed Jun 6 12:13:41 2012
New Revision: 1346844
URL: http://svn.apache.org/viewvc?rev=1346844view=rev
Log:
votes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1346844r1=1346843r2=1346844view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 6 12:13:41 2012
@@ -99,10 +99,14 @@ PATCHES PROPOSED TO BACKPORT:
(=r1300157+r1300161 in TC7)
+1: markt
0: fhanik - introducing a new parser this late into a release seems too
risky for 6
- +1: kkolinko: With followups (in trunk: r1304275,1304895; in 7.0.x:
r1304897).
-The fix affects response.contentType parsing only. So I think it is
-acceptable. I'd be more concerned if it affected request.contentType
-processing.
+ +0: kkolinko:
+1. It needs followups (in trunk: r1304275,1304895; in 7.0.x: r1304897).
+2. It needs fix for BZ 53353 (trunk: r1345752,1345754; 7.0: 1345755)
+Maybe there can be a simpler, not spec-imposing solution for 6.0?
+E.g. disable parsing and appending of charset if
+contentType.indexOf('\') = 0.
+A good note about original proposal is that it does not affect
+request parsing, so only broken webapps may break, not broken clients.
-1:
* Fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=52858
@@ -191,14 +195,14 @@ PATCHES PROPOSED TO BACKPORT:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53032
Make JspC extend o.a.tools.ant.Task so it works with namespaces
http://svn.apache.org/viewvc?rev=1346644view=rev
- +1: markt, schultz
+ +1: markt, schultz, kkolinko
-1:
* Backport fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=53230
Change ManagerBase to throw TooManyActiveSessionsException instead of
IllegalStateException to allow for custom error page.
http://svn.apache.org/viewvc?view=revisionrevision=1346675
- +1: schultz
+ +1: schultz, kkolinko
-1:
PATCHES/ISSUES THAT ARE STALLED
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1346845 - /tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
Author: kkolinko
Date: Wed Jun 6 12:18:15 2012
New Revision: 1346845
URL: http://svn.apache.org/viewvc?rev=1346845view=rev
Log:
Remove trailing whitespace, as nagged by Checkstyle.
Modified:
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
Modified:
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java?rev=1346845r1=1346844r2=1346845view=diff
==
---
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
Wed Jun 6 12:18:15 2012
@@ -32,7 +32,7 @@ public class TooManyActiveSessionsExcept
/**
* Creates a new TooManyActiveSessionsException.
- *
+ *
* @param message A description for the exception.
* @param maxActive The maximum number of active sessions allowed by the
* session manager.
@@ -41,10 +41,10 @@ public class TooManyActiveSessionsExcept
int maxActive)
{
super(message);
-
+
maxActiveSessions = maxActive;
}
-
+
/**
* Gets the maximum number of sessions allowed by the session manager.
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1346847 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/util/buf/TestCharChunk.java
Author: kkolinko Date: Wed Jun 6 12:27:01 2012 New Revision: 1346847 URL: http://svn.apache.org/viewvc?rev=1346847view=rev Log: Merged revision r1346404 from tomcat/trunk: Add a test for CharChunk.indexOf(). Added: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java - copied unchanged from r1346404, tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1346404 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1346851 - /tomcat/tc7.0.x/trunk/
Author: kkolinko Date: Wed Jun 6 12:35:27 2012 New Revision: 1346851 URL: http://svn.apache.org/viewvc?rev=1346851view=rev Log: Re-merge r1346683, r1346794 This only updates svn:merge-info, marking those revisions as merged. Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1346683,1346794 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1346864 - /tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
Author: kkolinko
Date: Wed Jun 6 12:52:20 2012
New Revision: 1346864
URL: http://svn.apache.org/viewvc?rev=1346864view=rev
Log:
Remove svn:merge-info property on EchoMessage.java, that was added in r1346684
Note: Merges should be started from project root - tc7.0.x/trunk, and project
root has
to be included in subsequent commit. That way svn:merge-info will be present
only on the project root directory.
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
(props changed)
Propchange:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
('svn:mergeinfo' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53281] Tomcat returns garbage data with HTTP/0.9 200 OK header when SSL port is accessed using http
https://issues.apache.org/bugzilla/show_bug.cgi?id=53281 --- Comment #4 from Christopher Schultz ch...@christopherschultz.net --- My question isn't whether Tomcat can be configured to do that (it cannot currently do it), but if JSSE will even allow that handling to occur. If JSSE can't do it, Tomcat certainly can't do it using JSSE. -- 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: r1346885 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Author: kkolinko
Date: Wed Jun 6 13:34:54 2012
New Revision: 1346885
URL: http://svn.apache.org/viewvc?rev=1346885view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c7
https://issues.apache.org/bugzilla/show_bug.cgi?id=53366#c1
If _jspService() cannot properly handle an exception because _jspx_page_context
initialization failed,
write it to the logs instead of silent swallowing.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1346885r1=1346884r2=1346885view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed Jun 6
13:34:54 2012
@@ -3395,6 +3395,7 @@ class Generator {
out.printil(try { out.clearBuffer(); } catch (java.io.IOException e)
{});
out.popIndent();
out.printil(if (_jspx_page_context != null)
_jspx_page_context.handlePageException(t););
+out.printil(else log(t.getMessage(), t););
out.popIndent();
out.printil(});
out.popIndent();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53281] Tomcat returns garbage data with HTTP/0.9 200 OK header when SSL port is accessed using http
https://issues.apache.org/bugzilla/show_bug.cgi?id=53281 --- Comment #5 from saurabh saurabhsul...@yahoo.co.in --- @Christopher Schultz - So if I understand you correctly, the issues lies with JSSE and not Tomcat, may I right? And that, there is no way we can change the behavior using Tomcat Configuration ? -- 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
[Bug 53366] Running with SecurityManager: protected/index.jsp returns blank page when it is the first page accessed
https://issues.apache.org/bugzilla/show_bug.cgi?id=53366 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- I improved logging in r1346885 Stacktrace: [[[ 06-Jun-2012 17:28:01.640 SEVERE [http-bio-8080-exec-1] org.apache.catalina.core.ApplicationContext.log jsp: access denied (java.lang.RuntimePermission accessClassInPackage.org.apache.tomcat.util.http.parser) java.security.AccessControlException: access denied (java.lang.RuntimePermission accessClassInPackage.org.apache.tomcat.util.http.parser) at java.security.AccessControlContext.checkPermission(AccessControlContext.java:374) at java.security.AccessController.checkPermission(AccessController.java:546) at java.lang.SecurityManager.checkPermission(SecurityManager.java:532) at java.lang.SecurityManager.checkPackageAccess(SecurityManager.java:1512) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:298) at java.lang.ClassLoader.loadClass(ClassLoader.java:295) at java.lang.ClassLoader.loadClass(ClassLoader.java:247) at org.apache.catalina.connector.Response.setContentType(Response.java:708) at org.apache.jsp.jsp.security.protected_.login_jsp._jspService(login_jsp.java:52) at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70) at javax.servlet.http.HttpServlet.service(HttpServlet.java:722) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:432) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:390) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:334) at javax.servlet.http.HttpServlet.service(HttpServlet.java:722) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.catalina.security.SecurityUtil$1.run(SecurityUtil.java:274) at org.apache.catalina.security.SecurityUtil$1.run(SecurityUtil.java:271) at java.security.AccessController.doPrivileged(Native Method) at javax.security.auth.Subject.doAsPrivileged(Subject.java:517) at org.apache.catalina.security.SecurityUtil.execute(SecurityUtil.java:306) at org.apache.catalina.security.SecurityUtil.doAsPrivilege(SecurityUtil.java:166) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:299) at org.apache.catalina.core.ApplicationFilterChain.access$000(ApplicationFilterChain.java:57) at org.apache.catalina.core.ApplicationFilterChain$1.run(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain$1.run(ApplicationFilterChain.java:189) at java.security.AccessController.doPrivileged(Native Method) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:670) at org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:457) at org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:382) at org.apache.catalina.core.ApplicationDispatcher.access$000(ApplicationDispatcher.java:67) at org.apache.catalina.core.ApplicationDispatcher$PrivilegedForward.run(ApplicationDispatcher.java:102) at org.apache.catalina.core.ApplicationDispatcher$PrivilegedForward.run(ApplicationDispatcher.java:89) at java.security.AccessController.doPrivileged(Native Method) at org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:301) at org.apache.catalina.authenticator.FormAuthenticator.forwardToLoginPage(FormAuthenticator.java:390) at org.apache.catalina.authenticator.FormAuthenticator.authenticate(FormAuthenticator.java:256) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:546) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:146) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:74) at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:911) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:90) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:407) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:995) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:573) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:145) at org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:311) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at
[Bug 53370] Tomcat site - fix date in vulnerability pages for CVE-2009-0781
https://issues.apache.org/bugzilla/show_bug.cgi?id=53370 --- Comment #1 from Christopher Schultz ch...@christopherschultz.net --- http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0781 says CVS was assigned 2009-03-04. http://www.securityfocus.com/archive/1/501538/100/0/threaded is markt's post from 2009-03-06 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2009-0781 says release date was 2009-03-09 Tomcat's security pages currently say first reported to the Tomcat security team on 5 Mar 2009 and made public on 3 Jun 2009. It looks like the intended date was that of markt's post to BugTraq on 2009-03-06 but it got confused with 2009-06-03. -- 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: r1346904 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html xdocs/security-5.xml xdocs/security-6.xml
Author: schultz Date: Wed Jun 6 14:17:47 2012 New Revision: 1346904 URL: http://svn.apache.org/viewvc?rev=1346904view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53370 Update publication date for CVE-2009-0781. Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-6.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1346904r1=1346903r2=1346904view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Wed Jun 6 14:17:47 2012 @@ -1002,7 +1002,7 @@ pThis was first reported to the Tomcat security team on 5 Mar 2009 and - made public on 3 Jun 2009./p + made public on 6 Mar 2009./p pAffects: 5.5.0-5.5.27/p Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1346904r1=1346903r2=1346904view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Wed Jun 6 14:17:47 2012 @@ -1110,7 +1110,7 @@ pThis was first reported to the Tomcat security team on 5 Mar 2009 and - made public on 3 Jun 2009./p + made public on 6 Mar 2009./p pAffects: 6.0.0-6.0.18/p Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1346904r1=1346903r2=1346904view=diff == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Wed Jun 6 14:17:47 2012 @@ -472,7 +472,7 @@ pThis was fixed in revlink rev=750928revision 750928/revlink./p pThis was first reported to the Tomcat security team on 5 Mar 2009 and - made public on 3 Jun 2009./p + made public on 6 Mar 2009./p pAffects: 5.5.0-5.5.27/p Modified: tomcat/site/trunk/xdocs/security-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1346904r1=1346903r2=1346904view=diff == --- tomcat/site/trunk/xdocs/security-6.xml (original) +++ tomcat/site/trunk/xdocs/security-6.xml Wed Jun 6 14:17:47 2012 @@ -537,7 +537,7 @@ pThis was fixed in revlink rev=750924revision 750924/revlink./p pThis was first reported to the Tomcat security team on 5 Mar 2009 and - made public on 3 Jun 2009./p + made public on 6 Mar 2009./p pAffects: 6.0.0-6.0.18/p - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Problem updating TC site
All, I just made an update to the Tomcat site project and was trying to publish it live following the instructions in README.txt. As such, I ssh'd to people.apache.org, cd /www/tomcat.apache.org and tried to do an 'svn up'. I got an invalid certificate error from svn.apache.org: schultz@minotaur:/www/tomcat.apache.org$ svn up Error validating server certificate for 'https://svn.apache.org:443': - The certificate is not issued by a trusted authority. Use the fingerprint to validate the certificate manually! Certificate information: - Hostname: *.apache.org - Valid: from Tue, 20 Dec 2011 00:00:00 GMT until Mon, 17 Feb 2014 23:59:59 GMT - Issuer: Thawte, Inc., US - Fingerprint: bc:5f:40:92:fd:6a:49:aa:f8:b8:35:0d:ed:27:5e:a6:64:c1:7a:1b (R)eject, accept (t)emporarily or accept (p)ermanently? R svn: OPTIONS of 'https://svn.apache.org/repos/asf/tomcat/site/trunk/docs': Server certificate verification failed: issuer is not trusted (https://svn.apache.org) I stopped the connection in case something was amiss. Any ideas what might be going on? Thanks, -chris signature.asc Description: OpenPGP digital signature
svn commit: r1346932 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Wed Jun 6 15:10:59 2012
New Revision: 1346932
URL: http://svn.apache.org/viewvc?rev=1346932view=rev
Log:
Fix (hopefully) persistent failure of Comet unit test for connector stop when
the END event is not received
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1346932r1=1346931r2=1346932view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jun 6
15:10:59 2012
@@ -1427,8 +1427,12 @@ public class NioEndpoint extends Abstrac
cancelledKey(key, SocketStatus.TIMEOUT);
}
} else if (ka.isAsync() || ka.getComet()) {
-// Async requests with a timeout of 0 or less never
timeout
-if (!ka.isAsync() || ka.getTimeout() 0) {
+if (close) {
+key.interestOps(0);
+ka.interestOps(0); //avoid duplicate stop calls
+processKey(key,ka);
+} else if (!ka.isAsync() || ka.getTimeout() 0) {
+// Async requests with a timeout of 0 or less
never timeout
long delta = now - ka.getLastAccess();
long timeout = (ka.getTimeout()==-1)?((long)
socketProperties.getSoTimeout()):(ka.getTimeout());
boolean isTimedout = delta timeout;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53370] Tomcat site - fix date in vulnerability pages for CVE-2009-0781
https://issues.apache.org/bugzilla/show_bug.cgi?id=53370 --- Comment #2 from Mark Thomas ma...@apache.org --- The dates from my personal mail archive are: - date notified 5th March 2009 - date CVE requested 6th March 2009 - date CVE assigned 6th Match 2009 - date published 6th March 2009 -- 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: Problem updating TC site
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06/06/2012 15:20, Christopher Schultz wrote: All, I just made an update to the Tomcat site project and was trying to publish it live following the instructions in README.txt. As such, I ssh'd to people.apache.org, cd /www/tomcat.apache.org and tried to do an 'svn up'. I got an invalid certificate error from svn.apache.org: schultz@minotaur:/www/tomcat.apache.org$ svn up Error validating server certificate for 'https://svn.apache.org:443': - The certificate is not issued by a trusted authority. Use the fingerprint to validate the certificate manually! Certificate information: - Hostname: *.apache.org - Valid: from Tue, 20 Dec 2011 00:00:00 GMT until Mon, 17 Feb 2014 23:59:59 GMT - Issuer: Thawte, Inc., US - Fingerprint: bc:5f:40:92:fd:6a:49:aa:f8:b8:35:0d:ed:27:5e:a6:64:c1:7a:1b (R)eject, accept (t)emporarily or accept (p)ermanently? R svn: OPTIONS of 'https://svn.apache.org/repos/asf/tomcat/site/trunk/docs': Server certificate verification failed: issuer is not trusted (https://svn.apache.org) I stopped the connection in case something was amiss. Any ideas what might be going on? The cert is valid. See [1]. Either the svn client is having trouble traversing the certificate chain or the CA cert is missing. Either way, p is an acceptable choice above. Mark [1] http://www.apache.org/dev/version-control.html#cert -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJPz3UvAAoJEBDAHFovYFnnaBwQALikkuGN5a7xdm1oFV+IoPQy xw8gdw+hm4cGgN9nSdw5Rrxz5t5I61nOLMjLtYjQu3r0nwoFm9/yEKHyt2by0bI4 MwI6ld5eTR5sQ36dvWalL2wO++loZnaZWna9yIXXFF/G3FZCD9ioDztKVZj5plhw tzBWDWrxsPsg2AmCaa7HsQUVUgyukDWSqa3BX3HwoqVSHru5o5FyTuwKjQjxqzSr 3lcLM90Mya5Xk0AxrLWBFnE/VjFr1OP6gMPEgTDAHsNfAwLRaaT/WSJwTo3JgNAd mWU05ITKHU2kmG4htxXofIrf7sRJJq8ZlM18Ax+tjpDdWhkVoabE+4oBARf/bNII dTA+q27wsTQRnpCdhuyXnRFsN750QWoC8XDlJrY4CDorsQjVM3D+3BQIMPy2yaGQ VqUClZdn/OsiGhWY667OiSw1tuvuB2b21WYIU5CU+JBM7T8jFlVOg/aWDA78wUnT St+C5E0ny9ThsCloY/EuYV8yF+kurU50Y6ZuyWicqWz+Jtw5SzhYhPERwYk5XjlB g4r7xmFd2CzhAA6mSNdFbBVSFJOCcV/LW4HYLToQCtGmmKEK8NfDta/da8MKL7GR 31gMsYnHKw3VwE8Elj1nbLGYy5uSMHhm31RVi2QrE2Fj8fV5uXWb5K2Ts7/yBwJg yXSijX3ICgQsm3AOAXCG =hlxJ -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
On 06/06/2012 00:58, Mark Thomas wrote: On 05/06/2012 22:37, build...@apache.org wrote: The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3039 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1346581 Blamelist: markt I now have access to the host where this build runs and can repeat the failure easily. I intend to investigate further over the next few days with a view to identifying the root cause and hopefully fixing it. I think I have found the problem and fixed it. The short version was that we weren't handling close properly if a connection wasn't registered for read or write at the time the close is processed. This is unlikely but seems to happen consistently on the CI server. Final proof will be the CI results for the next few commits. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1346947 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jun 6 15:31:14 2012
New Revision: 1346947
URL: http://svn.apache.org/viewvc?rev=1346947view=rev
Log:
Fix (hopefully) persistent failure of Comet unit test for connector stop when
the END event is not received
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1346932
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1346947r1=1346946r2=1346947view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed
Jun 6 15:31:14 2012
@@ -1437,8 +1437,12 @@ public class NioEndpoint extends Abstrac
cancelledKey(key, SocketStatus.TIMEOUT,true);
}
} else if (ka.isAsync() || ka.getComet()) {
-// Async requests with a timeout of 0 or less never
timeout
-if (!ka.isAsync() || ka.getTimeout() 0) {
+if (close) {
+key.interestOps(0);
+ka.interestOps(0); //avoid duplicate stop calls
+processKey(key,ka);
+} else if (!ka.isAsync() || ka.getTimeout() 0) {
+// Async requests with a timeout of 0 or less
never timeout
long delta = now - ka.getLastAccess();
long timeout = (ka.getTimeout()==-1)?((long)
socketProperties.getSoTimeout()):(ka.getTimeout());
boolean isTimedout = delta timeout;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1346947r1=1346946r2=1346947view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 6 15:31:14 2012
@@ -266,6 +266,10 @@
via getter from the endpoint and as JMX attribute of the ThreadPool
mbean. (rjung)
/add
+ fix
+Correct an edge case where Comet END events were not send to connected
+clients when the Tomcat connector was stopped. (markt)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3048 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1346932 Blamelist: markt Build succeeded! sincerely, -The Buildbot
Re: Problem updating TC site
2012/6/6 Christopher Schultz ch...@christopherschultz.net: All, I just made an update to the Tomcat site project and was trying to publish it live following the instructions in README.txt. As such, I ssh'd to people.apache.org, cd /www/tomcat.apache.org and tried to do an 'svn up'. I got an invalid certificate error from svn.apache.org: schultz@minotaur:/www/tomcat.apache.org$ svn up Error validating server certificate for 'https://svn.apache.org:443': - The certificate is not issued by a trusted authority. Use the fingerprint to validate the certificate manually! Certificate information: - Hostname: *.apache.org - Valid: from Tue, 20 Dec 2011 00:00:00 GMT until Mon, 17 Feb 2014 23:59:59 GMT - Issuer: Thawte, Inc., US - Fingerprint: bc:5f:40:92:fd:6a:49:aa:f8:b8:35:0d:ed:27:5e:a6:64:c1:7a:1b (R)eject, accept (t)emporarily or accept (p)ermanently? R svn: OPTIONS of 'https://svn.apache.org/repos/asf/tomcat/site/trunk/docs': Server certificate verification failed: issuer is not trusted (https://svn.apache.org) I stopped the connection in case something was amiss. Any ideas what might be going on? The cert was changed some time ago. (in January 2012) https://twitter.com/infrabot/statuses/155072112128831488 So the last time you used svn client on p.a.o should have been before that date. BTW, you can see the same certificate if you open https://svn.apache.org/repos/asf/ in a web browser Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/636 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1346947 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[Bug 53359] Request for Aliases or Alias as element inside Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=53359 --- Comment #5 from Christopher Schultz ch...@christopherschultz.net --- I'm prepared to make this fix, but I want to be sure I can do it all in one place. Mark, could you comment? It looks like BaseDirContext.java:237 could just change from String[] kvps = theAliases.split(,); to String[] kvps = theAliases.split(\\s*,\\s*); I've read-through the rest of the code and it appears that this is all that is required, but there may be other places where similar splits are happening. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1346864 - /tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
Konstantin, On 6/6/12 8:52 AM, kkoli...@apache.org wrote: Author: kkolinko Date: Wed Jun 6 12:52:20 2012 New Revision: 1346864 URL: http://svn.apache.org/viewvc?rev=1346864view=rev Log: Remove svn:merge-info property on EchoMessage.java, that was added in r1346684 Note: Merges should be started from project root - tc7.0.x/trunk, and project root has to be included in subsequent commit. That way svn:merge-info will be present only on the project root directory. Sorry about that. I use Eclipse: what is the best way to do and commit a proper merge? Should I be committing not only the changed files but also the project-root as a directory? If I do that, I think Eclipse (or even svn) would force me to commit every change all at once -- i.e. I can't work on multiple patches at the same time. I'm sure that's not true, so I'm certainly open to some education. Thanks, -chris signature.asc Description: OpenPGP digital signature
[Bug 53281] Tomcat returns garbage data with HTTP/0.9 200 OK header when SSL port is accessed using http
https://issues.apache.org/bugzilla/show_bug.cgi?id=53281 --- Comment #6 from Christopher Schultz ch...@christopherschultz.net --- No, I'm not saying that the issue is JSSE (though it may be). What I'm saying is that responding to an HTTP request over HTTPS is not impossible under all circumstances: httpd is an example of how it is possible. -- 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
[Bug 53370] Tomcat site - fix date in vulnerability pages for CVE-2009-0781
https://issues.apache.org/bugzilla/show_bug.cgi?id=53370 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Christopher Schultz ch...@christopherschultz.net --- Fixed and published. -- 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
[Bug 53359] Request for Aliases or Alias as element inside Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=53359 --- Comment #6 from Mark Thomas ma...@apache.org --- That is the only place this gets processed but you'll need to do the same with the split(=) two lines as well for completeness. A test case would be nice too as would an update to the docs on hoe white space will be handled :) -- 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
[Bug 53359] Request for Aliases or Alias as element inside Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=53359 --- Comment #7 from Konstantin Kolinko knst.koli...@gmail.com --- I think you should also beware of empty strings (produced by ',,' or by an extra ',' at the end of values) and ignore them. -- 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
[Bug 53359] Request for Aliases or Alias as element inside Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=53359 --- Comment #8 from Christopher Schultz ch...@christopherschultz.net --- (In reply to comment #6) That is the only place this gets processed but you'll need to do the same with the split(=) two lines as well for completeness. I'm happy to do that, but didn't want the patch to grow bigger than the original requirements. It makes perfect sense to me to trim whitespace around the '='. A test case would be nice too as would an update to the docs on hoe white space will be handled :) Of course. I mainly wanted to verify that this was the only place a functional change needed to be made. (In reply to comment #7) I think you should also beware of empty strings (produced by ',,' or by an extra ',' at the end of values) and ignore them. Noted. -- 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: r1347034 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Wed Jun 6 18:29:53 2012
New Revision: 1347034
URL: http://svn.apache.org/viewvc?rev=1347034view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53366
New http header parser needs to be pre-loaded when running under a security
manager
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1347034r1=1347033r2=1347034view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Wed
Jun 6 18:29:53 2012
@@ -238,16 +238,36 @@ public final class SecurityClassLoad {
private static final void loadTomcatPackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.tomcat.;
+// buf
loader.loadClass(basePackage + util.buf.HexUtils);
loader.loadClass(basePackage + util.buf.StringCache);
loader.loadClass(basePackage + util.buf.StringCache$ByteEntry);
loader.loadClass(basePackage + util.buf.StringCache$CharEntry);
+// http
loader.loadClass(basePackage + util.http.HttpMessages);
// Make sure system property is read at this point
Class? clazz = loader.loadClass(
basePackage + util.http.FastHttpDateFormat);
clazz.newInstance();
loader.loadClass(basePackage + util.http.HttpMessages);
+loader.loadClass(basePackage + util.http.parser.AstAttribute);
+loader.loadClass(basePackage + util.http.parser.AstMediaType);
+loader.loadClass(basePackage + util.http.parser.AstParameter);
+loader.loadClass(basePackage + util.http.parser.AstSubType);
+loader.loadClass(basePackage + util.http.parser.AstType);
+loader.loadClass(basePackage + util.http.parser.AstValue);
+loader.loadClass(basePackage + util.http.parser.HttpParser);
+loader.loadClass(basePackage + util.http.parser.HttpParserConstants);
+loader.loadClass(basePackage +
util.http.parser.HttpParserTokenManager);
+loader.loadClass(basePackage +
util.http.parser.HttpParserTreeConstants);
+loader.loadClass(basePackage + util.http.parser.JJTHttpParserState);
+loader.loadClass(basePackage + util.http.parser.Node);
+loader.loadClass(basePackage + util.http.parser.ParseException);
+loader.loadClass(basePackage + util.http.parser.SimpleCharStream);
+loader.loadClass(basePackage + util.http.parser.SimpleNode);
+loader.loadClass(basePackage + util.http.parser.Token);
+loader.loadClass(basePackage + util.http.parser.TokenMgrError);
+// net
loader.loadClass(basePackage + util.net.Constants);
loader.loadClass(basePackage +
util.net.NioBlockingSelector$BlockPoller$1);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53366] Running with SecurityManager: protected/index.jsp returns blank page when it is the first page accessed
https://issues.apache.org/bugzilla/show_bug.cgi?id=53366 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas ma...@apache.org --- Fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. -- 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: r1347036 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/security/SecurityClassLoad.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jun 6 18:32:43 2012
New Revision: 1347036
URL: http://svn.apache.org/viewvc?rev=1347036view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53366
New http header parser needs to be pre-loaded when running under a security
manager
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1347034
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1347036r1=1347035r2=1347036view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Wed Jun 6 18:32:43 2012
@@ -239,16 +239,36 @@ public final class SecurityClassLoad {
private static final void loadTomcatPackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.tomcat.;
+// buf
loader.loadClass(basePackage + util.buf.HexUtils);
loader.loadClass(basePackage + util.buf.StringCache);
loader.loadClass(basePackage + util.buf.StringCache$ByteEntry);
loader.loadClass(basePackage + util.buf.StringCache$CharEntry);
+// http
loader.loadClass(basePackage + util.http.HttpMessages);
// Make sure system property is read at this point
Class? clazz = loader.loadClass(
basePackage + util.http.FastHttpDateFormat);
clazz.newInstance();
loader.loadClass(basePackage + util.http.HttpMessages);
+loader.loadClass(basePackage + util.http.parser.AstAttribute);
+loader.loadClass(basePackage + util.http.parser.AstMediaType);
+loader.loadClass(basePackage + util.http.parser.AstParameter);
+loader.loadClass(basePackage + util.http.parser.AstSubType);
+loader.loadClass(basePackage + util.http.parser.AstType);
+loader.loadClass(basePackage + util.http.parser.AstValue);
+loader.loadClass(basePackage + util.http.parser.HttpParser);
+loader.loadClass(basePackage + util.http.parser.HttpParserConstants);
+loader.loadClass(basePackage +
util.http.parser.HttpParserTokenManager);
+loader.loadClass(basePackage +
util.http.parser.HttpParserTreeConstants);
+loader.loadClass(basePackage + util.http.parser.JJTHttpParserState);
+loader.loadClass(basePackage + util.http.parser.Node);
+loader.loadClass(basePackage + util.http.parser.ParseException);
+loader.loadClass(basePackage + util.http.parser.SimpleCharStream);
+loader.loadClass(basePackage + util.http.parser.SimpleNode);
+loader.loadClass(basePackage + util.http.parser.Token);
+loader.loadClass(basePackage + util.http.parser.TokenMgrError);
+// net
loader.loadClass(basePackage + util.net.Constants);
loader.loadClass(basePackage +
util.net.NioBlockingSelector$BlockPoller$1);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1347036r1=1347035r2=1347036view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 6 18:32:43 2012
@@ -211,6 +211,10 @@
context root of a web application. (markt)
/fix
fix
+bug53366/bug: Ensure new HTTP header parser works correctly when
+running Tomcat under a security manager. (markt/kkolinko)
+ /fix
+ fix
bug53230/bug: Changed ManagerBase to throw
TooManyActiveSessionsException instead of IllegalStateException
when the maximum number of sessions has been exceeded and a new
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1347043 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Jun 6 18:33:35 2012 New Revision: 1347043 URL: http://svn.apache.org/viewvc?rev=1347043view=rev Log: Bugs should be in numerical order (as per the comment at the start of the changelog). Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1347043r1=1347042r2=1347043view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 6 18:33:35 2012 @@ -150,6 +150,12 @@ codeJreMemoryLeakPreventionListener/code. (markt) /fix fix +bug53230/bug: Changed ManagerBase to throw +TooManyActiveSessionsException instead of IllegalStateException +when the maximum number of sessions has been exceeded and a new +session will not be created. (schultz) + /fix + fix bug53257/bug: Ensure that resources, including JSP files, that have names that include characters with special meanings in URLs (such as ampersand, semicolon, plus, hash and percent) are correctly handled. @@ -214,12 +220,6 @@ bug53366/bug: Ensure new HTTP header parser works correctly when running Tomcat under a security manager. (markt/kkolinko) /fix - fix -bug53230/bug: Changed ManagerBase to throw -TooManyActiveSessionsException instead of IllegalStateException -when the maximum number of sessions has been exceeded and a new -session will not be created. (schultz) - /fix /changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1346864 - /tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
2012/6/6 Christopher Schultz ch...@christopherschultz.net: Konstantin, On 6/6/12 8:52 AM, kkoli...@apache.org wrote: Author: kkolinko Date: Wed Jun 6 12:52:20 2012 New Revision: 1346864 URL: http://svn.apache.org/viewvc?rev=1346864view=rev Log: Remove svn:merge-info property on EchoMessage.java, that was added in r1346684 Note: Merges should be started from project root - tc7.0.x/trunk, and project root has to be included in subsequent commit. That way svn:merge-info will be present only on the project root directory. Sorry about that. I use Eclipse: what is the best way to do and commit a proper merge? Should I be committing not only the changed files but also the project-root as a directory? If I do that, I think Eclipse (or even svn) would force me to commit every change all at once -- i.e. I can't work on multiple patches at the same time. I'm sure that's not true, so I'm certainly open to some education. I am using TortoiseSVN and svn command line client (both version 1.7). I do not know Eclipse SVN GUI, but the recommendations below are generic ones. I would recommend the following: # Merging: 1. Run update before merge. Check for uncommitted changes. Both should make the merge run faster and be more smooth. 2. Invoke merge from the root of the project, so that svn:merge-info on the project root directory is updated. Otherwise svn:mergeinfo will be set on the node where you started the merge from. # Reverting after a merge: If you need to revert after a merge (e.g. to rerun it), you should revert the root of the project, so that svn:mergeinfo property change on it is reverted. # Committing after a merge: 1. Start commit from the root of the project. This is so that svn:mergeinfo property change on that directory is committed as well. (I revert all local changes from 6.0.x or 7.0.x branch before merging a backport there, so I do not have the need to exclude some files from commit.) The internal API, I think, allows to distinguish recursive commits and non-recursive ones. Command line has --depth argument to many svn commands, but I do not know how well the GUI works in your case. When in doubt, it is better to prioritize the actual changes over mergeinfo management. This start from root recommendation is needed after a merge only and only to commit mergeinfo update. E.g. - it is not needed on trunk where most development takes place, - it is not needed if you ported the change manually (though you can run a record-only merge if you want to mark original revision as merged) svn merge --record-only - If you ported only a part of the original change, do not commit mergeinfo update, because it will prevent from rerunning the merge. Revert property change on the root directory (after committing the rest). 2. I usually review the diff before committing. TortoiseSVN has Show changes as unified diff command. Command-line has svn diff command. Eclipse probably has something like that. I hope this will be useful. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1347047 - /tomcat/trunk/conf/catalina.policy
Author: markt
Date: Wed Jun 6 18:45:50 2012
New Revision: 1347047
URL: http://svn.apache.org/viewvc?rev=1347047view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53368
Make WebSocket play nicely with a security manager (kkolinko)
Modified:
tomcat/trunk/conf/catalina.policy
Modified: tomcat/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=1347047r1=1347046r2=1347047view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Wed Jun 6 18:45:50 2012
@@ -188,6 +188,9 @@ grant {
// Applications using Comet need to be able to access this package
permission java.lang.RuntimePermission
accessClassInPackage.org.apache.catalina.comet;
+
+// Applications using WebSocket need to be able to access this package
+permission java.lang.RuntimePermission
accessClassInPackage.org.apache.catalina.websocket;
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1347048 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.policy webapps/docs/changelog.xml
Author: markt
Date: Wed Jun 6 18:47:00 2012
New Revision: 1347048
URL: http://svn.apache.org/viewvc?rev=1347048view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53368
Make WebSocket play nicely with a security manager (kkolinko)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/conf/catalina.policy
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1347047
Modified: tomcat/tc7.0.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.policy?rev=1347048r1=1347047r2=1347048view=diff
==
--- tomcat/tc7.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.policy Wed Jun 6 18:47:00 2012
@@ -188,6 +188,9 @@ grant {
// Applications using Comet need to be able to access this package
permission java.lang.RuntimePermission
accessClassInPackage.org.apache.catalina.comet;
+
+// Applications using WebSocket need to be able to access this package
+permission java.lang.RuntimePermission
accessClassInPackage.org.apache.catalina.websocket;
};
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1347048r1=1347047r2=1347048view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 6 18:47:00 2012
@@ -220,6 +220,11 @@
bug53366/bug: Ensure new HTTP header parser works correctly when
running Tomcat under a security manager. (markt/kkolinko)
/fix
+ fix
+bug53368/bug: Configure the default security policy to allow web
+applications to use WebSocket when running under a security manager.
+(markt/kkolinko)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53368] Running with SecurityManager: WebSocket examples need accessClassInPackage permission
https://issues.apache.org/bugzilla/show_bug.cgi?id=53368 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. -- 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
[Bug 53047] JDBCRealm allRolesMode=authOnly still needs role table
https://issues.apache.org/bugzilla/show_bug.cgi?id=53047 --- Comment #8 from Mark Thomas ma...@apache.org --- (In reply to comment #7) I suggest we define the result of that call as: AUTH_ONLY_MODE = true The use of AUTH_ONLY mode doe snot preclude the user from being assigned a role and/or the web application testing for it. STRICT_AUTH_ONLY_MODE = false While it is less likely, the same applies here too. - AUTH_ONLY_MODE or STRICT_AUTH_ONLY_MODE - the Realm uses separate attributes to define the role store - the role store attributes are undefined Huh? #3 conflicts with #2. No they do. #2 means the Realm has the capability to define a separate role store. Not all realms do. #3 means that the above separate role store has not been defined. Why create log messages if it is configured not to use the roles table? Because it is sufficiently unusual that it is worth flagging up to an admin to confirm what is going on. It is just a single log message on Realm start. -- 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
[Bug 53047] JDBCRealm allRolesMode=authOnly still needs role table
https://issues.apache.org/bugzilla/show_bug.cgi?id=53047 --- Comment #9 from Mark Thomas ma...@apache.org --- s/No they do./No they don't./ -- 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: r1347072 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Jun 6 19:40:04 2012
New Revision: 1347072
URL: http://svn.apache.org/viewvc?rev=1347072view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53267
Stop the JreMemoryLeakPreventionListener triggering a full GC every hour
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.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=1347072r1=1347071r2=1347072view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 6 19:40:04 2012
@@ -147,15 +147,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53267
- Ensure that using the GC Daemon Protection feature of
- the codeJreMemoryLeakPreventionListener/code does not trigger a
- full GC every hour.
- http://svn.apache.org/viewvc?view=revisionrevision=1343895
- (r1343897 in TC7)
- +1: kkolinko, kfujino, markt, schultz
- -1:
-
* For https://issues.apache.org/bugzilla/show_bug.cgi?id=52055
Ensure that filters are recycled.
Inspired by r1334790 (TC7), r565964 (TC6 Nio)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1347072r1=1347071r2=1347072view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Wed Jun 6 19:40:04 2012
@@ -249,14 +249,19 @@ public class JreMemoryLeakPreventionList
if(awtThreadProtection) {
java.awt.Toolkit.getDefaultToolkit();
}
-
+
/*
- * Several components end up calling:
- * sun.misc.GC.requestLatency(long)
+ * Several components end up calling
+ * sun.misc.GC.requestLatency(long) which creates a daemon
+ * thread without setting the TCCL.
*
* Those libraries / components known to trigger memory leaks
* due to eventual calls to requestLatency(long) are:
* - javax.management.remote.rmi.RMIConnectorServer.start()
+ *
+ * Note: Long.MAX_VALUE is a special case that causes the
thread
+ * to terminate
+ *
*/
if (gcDaemonProtection) {
try {
@@ -264,7 +269,7 @@ public class JreMemoryLeakPreventionList
Method method = clazz.getDeclaredMethod(
requestLatency,
new Class[] {long.class});
-method.invoke(null, Long.valueOf(360));
+method.invoke(null, Long.valueOf(Long.MAX_VALUE - 1));
} catch (ClassNotFoundException e) {
if (System.getProperty(java.vendor).startsWith(
Sun)) {
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=1347072r1=1347071r2=1347072view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jun 6 19:40:04 2012
@@ -126,6 +126,11 @@
bug53057/bug: Add OpenSSL version number INFO log message when
initializing. (schultz)
/fix
+ fix
+bug53267/bug: Ensure that using the GC Daemon Protection feature of
+the codeJreMemoryLeakPreventionListener/code does not trigger a
+full GC every hour. (markt/kkolinko)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53267] The JreMemoryLeakPreventionListener causes a full GC every hour when gcDaemonProtection=true
https://issues.apache.org/bugzilla/show_bug.cgi?id=53267 --- Comment #9 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in 6.0 in r1347072 and will be in 6.0.36. -- 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
[Bug 53359] Request for Aliases or Alias as element inside Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=53359 --- Comment #9 from Christopher Schultz ch...@christopherschultz.net --- Looks like I can't avoid using String.trim() anyway, so I'm just going to use that instead of modifying the regex. -- 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
[Bug 53359] Request for Aliases or Alias as element inside Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=53359 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #10 from Christopher Schultz ch...@christopherschultz.net --- Okay, I'm going to close this as WONTFIX and create a new bug for trimming whitespace. I'm doing this so that this bug can be REOPENED in the future if there is sufficient demand for Alias subelements within Context. -- 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
[Bug 53373] New: Allow whitespace around delimiters in Context aliases for readability
https://issues.apache.org/bugzilla/show_bug.cgi?id=53373 Priority: P2 Bug ID: 53373 Assignee: dev@tomcat.apache.org Summary: Allow whitespace around delimiters in Context aliases for readability Severity: enhancement Classification: Unclassified OS: Mac OS X 10.4 Reporter: ch...@christopherschultz.net Hardware: PC Status: NEW Version: unspecified Component: Catalina Product: Tomcat 7 See bug 53359: Request for Aliases or Alias as element inside Context Context aliases attribute should allow whitespace to surround both the , and = delimiters. For example: Context aliases=/EDSILabCatalog= c:/xampp/htdocs/cLabs/EDSILabCatalog, /EDSILabs = c:/xampp/htdocs/cLabs/EDSILabs, /Global= c:/xampp/htdocs/cLabs/Global, /Skyline = c:/xampp/htdocs/cLabs/Skyline, /Sun = c:/xampp/htdocs/cLabs/Sun, /Sunset= c:/xampp/htdocs/cLabs/Sunset, /Tech2000 = c:/xampp/htdocs/cLabs/Tech2000 / -- 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
[Bug 53359] Request for Aliases or Alias as element inside Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=53359 --- Comment #11 from Christopher Schultz ch...@christopherschultz.net --- Replacement is bug 53373. -- 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
[Bug 53373] Allow whitespace around delimiters in Context aliases for readability
https://issues.apache.org/bugzilla/show_bug.cgi?id=53373 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added CC||esmond.p...@bigpond.com -- 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: r1347087 - in /tomcat/trunk: java/org/apache/naming/resources/BaseDirContext.java test/org/apache/naming/resources/TestNamingContext.java webapps/docs/config/context.xml
Author: schultz
Date: Wed Jun 6 20:05:05 2012
New Revision: 1347087
URL: http://svn.apache.org/viewvc?rev=1347087view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53373
Trim whitespace from around Context aliases delimiters (,=) to improve
readability of many aliases.
Modified:
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
tomcat/trunk/webapps/docs/config/context.xml
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1347087r1=1347086r2=1347087view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Wed Jun
6 20:05:05 2012
@@ -236,8 +236,21 @@ public abstract class BaseDirContext imp
String[] kvps = theAliases.split(,);
for (String kvp : kvps) {
+// Skip blanks introduced by regexp split and/or poor input
+kvp = kvp.trim();
+if(0 == kvp.length())
+continue;
+
String[] kv = kvp.split(=);
-if (kv.length != 2 || kv[0].length() == 0 || kv[1].length() == 0)
+if (kv.length != 2)
+throw new IllegalArgumentException(
+sm.getString(resources.invalidAliasMapping, kvp));
+
+// Trim whitespace from key and value
+kv[0] = kv[0].trim();
+kv[1] = kv[1].trim();
+
+if(kv[0].length() == 0 || kv[1].length() == 0)
throw new IllegalArgumentException(
sm.getString(resources.invalidAliasMapping, kvp));
Modified: tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1347087r1=1347086r2=1347087view=diff
==
--- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Wed
Jun 6 20:05:05 2012
@@ -16,6 +16,8 @@
*/
package org.apache.naming.resources;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,6 +32,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import junit.framework.Assert;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -89,6 +93,142 @@ public class TestNamingContext extends T
}
+// Recursively deletes a directory and its contents
+private boolean rmdir(File dir)
+{
+if(!dir.exists()) return false;
+if(!dir.isDirectory()) return false;
+
+File[] files = dir.listFiles();
+if(null != files) {
+for(int i=0; ifiles.length; ++i) {
+if(files[i].isDirectory())
+{
+if(!rmdir(files[i])) {
+return false;
+}
+} else {
+if(!files[i].delete()) {
+return false;
+}
+}
+}
+}
+return dir.delete();
+}
+
+@Test
+public void testAliases() throws Exception
+{
+// Some sample text
+String foxText = The quick brown fox jumps over the lazy dog;
+String loremIpsum = Lorem ipsum dolor sit amet, consectetur
adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
aliqua.;
+
+// Set up a temporary docBase and some alternates that we can
+// set up as aliases.
+File tmpDir = new File(System.getProperty(java.io.tmpdir),
+ tomcat-unit-test. +
TestNamingContext.class.getName());
+
+if(tmpDir.exists())
+{
+// Remove any old test files
+if(tmpDir.isDirectory()) {
+if(!rmdir(tmpDir))
+throw new IOException(Could not delete old temp
directory: + tmpDir);
+} else {
+if(!tmpDir.delete())
+throw new IOException(Could not delete old temp file: +
tmpDir);
+}
+}
+File docBase = new File(tmpDir, docBase);
+File alternate1 = new File(tmpDir, alternate1);
+File alternate2 = new File(tmpDir, alternate2);
+
+if(!tmpDir.mkdirs())
+throw new IOException(Could not create temp directory + tmpDir);
+if(!docBase.mkdir())
+throw new IOException(Could not create temp directory +
svn commit: r1347095 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/resources/BaseDirContext.java test/org/apache/naming/resources/TestNamingContext.java webapps/docs/changelog.xml webapps/docs
Author: schultz
Date: Wed Jun 6 20:17:43 2012
New Revision: 1347095
URL: http://svn.apache.org/viewvc?rev=1347095view=rev
Log:
Back-port of r1347087 from trunk.
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53373
Trim whitespace from around Context aliases delimiters (,=) to improve
readability of many aliases.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1347087
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1347095r1=1347094r2=1347095view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
Wed Jun 6 20:17:43 2012
@@ -242,8 +242,21 @@ public abstract class BaseDirContext imp
String[] kvps = theAliases.split(,);
for (String kvp : kvps) {
+// Skip blanks introduced by regexp split and/or poor input
+kvp = kvp.trim();
+if(0 == kvp.length())
+continue;
+
String[] kv = kvp.split(=);
-if (kv.length != 2 || kv[0].length() == 0 || kv[1].length() == 0)
+if (kv.length != 2)
+throw new IllegalArgumentException(
+sm.getString(resources.invalidAliasMapping, kvp));
+
+// Trim whitespace from key and value
+kv[0] = kv[0].trim();
+kv[1] = kv[1].trim();
+
+if(kv[0].length() == 0 || kv[1].length() == 0)
throw new IllegalArgumentException(
sm.getString(resources.invalidAliasMapping, kvp));
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1347095r1=1347094r2=1347095view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
Wed Jun 6 20:17:43 2012
@@ -16,6 +16,8 @@
*/
package org.apache.naming.resources;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,6 +32,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import junit.framework.Assert;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -89,6 +93,142 @@ public class TestNamingContext extends T
}
+// Recursively deletes a directory and its contents
+private boolean rmdir(File dir)
+{
+if(!dir.exists()) return false;
+if(!dir.isDirectory()) return false;
+
+File[] files = dir.listFiles();
+if(null != files) {
+for(int i=0; ifiles.length; ++i) {
+if(files[i].isDirectory())
+{
+if(!rmdir(files[i])) {
+return false;
+}
+} else {
+if(!files[i].delete()) {
+return false;
+}
+}
+}
+}
+return dir.delete();
+}
+
+@Test
+public void testAliases() throws Exception
+{
+// Some sample text
+String foxText = The quick brown fox jumps over the lazy dog;
+String loremIpsum = Lorem ipsum dolor sit amet, consectetur
adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
aliqua.;
+
+// Set up a temporary docBase and some alternates that we can
+// set up as aliases.
+File tmpDir = new File(System.getProperty(java.io.tmpdir),
+ tomcat-unit-test. +
TestNamingContext.class.getName());
+
+if(tmpDir.exists())
+{
+// Remove any old test files
+if(tmpDir.isDirectory()) {
+if(!rmdir(tmpDir))
+throw new IOException(Could not delete old temp
directory: + tmpDir);
+} else {
+if(!tmpDir.delete())
+throw new IOException(Could not delete old temp file: +
tmpDir);
+}
+}
+File
svn commit: r1347100 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Jun 6 20:23:19 2012
New Revision: 1347100
URL: http://svn.apache.org/viewvc?rev=1347100view=rev
Log:
Merged revision 1346885 from tomcat/trunk:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c7
https://issues.apache.org/bugzilla/show_bug.cgi?id=53366#c1
If _jspService() in generated JSP page code unexpectedly cannot properly handle
an exception because _jspx_page_context initialization did not happen, log it
instead of silent swallowing.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1346885
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1347100r1=1347099r2=1347100view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Wed Jun
6 20:23:19 2012
@@ -3395,6 +3395,7 @@ class Generator {
out.printil(try { out.clearBuffer(); } catch (java.io.IOException e)
{});
out.popIndent();
out.printil(if (_jspx_page_context != null)
_jspx_page_context.handlePageException(t););
+out.printil(else log(t.getMessage(), t););
out.popIndent();
out.printil(});
out.popIndent();
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1347100r1=1347099r2=1347100view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 6 20:23:19 2012
@@ -288,6 +288,11 @@
subsection name=Jasper
changelog
fix
+bug48097#c7/bug, bug53366#c1/bug: If JSP page unexpectedly
+fails to initialize PageContext instance, write exception to the logs
+instead of silent swallowing. (kkolinko)
+ /fix
+ fix
bug53032/bug: Modify codeJspC/code so it extends
codeorg.apache.tools.ant.Task/code enabling it to work with
features
such as namespaces within build.xml files. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1346864 - /tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
Konstantin, On 6/6/12 2:45 PM, Konstantin Kolinko wrote: # Merging: 1. Run update before merge. Of course :) 2. Invoke merge from the root of the project, so that svn:merge-info on the project root directory is updated. I think this is what I failed to do with the EchoServlet: since there was only a single file changed, I did the merge on that file only. If you need to revert after a merge (e.g. to rerun it), you should revert the root of the project, so that svn:mergeinfo property change on it is reverted. Good to know. # Committing after a merge: 1. Start commit from the root of the project. This is so that svn:mergeinfo property change on that directory is committed as well. Gotcha. I checked, and using '--depth empty' will allow me to specify exactly which files to commit (including '.' at the project root) without svn performing any kind of recursion. So, I can work on multiple things at once as long as I only do a single merge at a time. Command line has --depth argument to many svn commands, but I do not know how well the GUI works in your case. I used the CLI with --depth first to ensure it did what I wanted. I'll see what Eclipse can do for me, now. When in doubt, it is better to prioritize the actual changes over mergeinfo management. ;) This start from root recommendation is needed after a merge only and only to commit mergeinfo update. Thanks. 2. I usually review the diff before committing. Always. TortoiseSVN has Show changes as unified diff command. Command-line has svn diff command. Eclipse probably has something like that. It does: you can compare the working copy (or a selection of files) against HEAD. Eclipse also helpfully gives you a quick-diff along with the list of files that have changed in the commit message dialog so you can record the commit message and browse the changes simultaneously. Thanks a lot, -chris signature.asc Description: OpenPGP digital signature
[Bug 53373] Allow whitespace around delimiters in Context aliases for readability
https://issues.apache.org/bugzilla/show_bug.cgi?id=53373 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Christopher Schultz ch...@christopherschultz.net --- Fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1347087 - in /tomcat/trunk: java/org/apache/naming/resources/BaseDirContext.java test/org/apache/naming/resources/TestNamingContext.java webapps/docs/config/context.xml
2012/6/7 schu...@apache.org:
Author: schultz
Date: Wed Jun 6 20:05:05 2012
New Revision: 1347087
URL: http://svn.apache.org/viewvc?rev=1347087view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53373
Trim whitespace from around Context aliases delimiters (,=) to improve
readability of many aliases.
Modified:
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
tomcat/trunk/webapps/docs/config/context.xml
--- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Wed
Jun 6 20:05:05 2012
@@ -16,6 +16,8 @@
*/
package org.apache.naming.resources;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,6 +32,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import junit.framework.Assert;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -89,6 +93,142 @@ public class TestNamingContext extends T
}
+ // Recursively deletes a directory and its contents
+ private boolean rmdir(File dir)
+ {
1. I usually write '{' on the same line, like in Java conventions.
Just personal preference. Not enforcing it, so no need to change.
2. Take a look at method
LoggingBaseTest#addDeleteOnTearDown(..)
That class is parent of TomcatBaseTest and method is specifically
designed to clean up temporary directories and files.
3. if(!mkdir() ) tests in the test method - I think if you rerun after
failed test those will return false, because directory already exists.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1347108 - /tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
Author: schultz
Date: Wed Jun 6 20:43:13 2012
New Revision: 1347108
URL: http://svn.apache.org/viewvc?rev=1347108view=rev
Log:
Simplified test case for BaseDirContext.setAliases
Modified:
tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
Modified: tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1347108r1=1347107r2=1347108view=diff
==
--- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Wed
Jun 6 20:43:13 2012
@@ -42,6 +42,7 @@ import org.junit.Test;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
+import org.apache.catalina.startup.ExpandWar;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -93,30 +94,6 @@ public class TestNamingContext extends T
}
-// Recursively deletes a directory and its contents
-private boolean rmdir(File dir)
-{
-if(!dir.exists()) return false;
-if(!dir.isDirectory()) return false;
-
-File[] files = dir.listFiles();
-if(null != files) {
-for(int i=0; ifiles.length; ++i) {
-if(files[i].isDirectory())
-{
-if(!rmdir(files[i])) {
-return false;
-}
-} else {
-if(!files[i].delete()) {
-return false;
-}
-}
-}
-}
-return dir.delete();
-}
-
@Test
public void testAliases() throws Exception
{
@@ -126,20 +103,12 @@ public class TestNamingContext extends T
// Set up a temporary docBase and some alternates that we can
// set up as aliases.
-File tmpDir = new File(System.getProperty(java.io.tmpdir),
+File tmpDir = new File(getTemporaryDirectory(),
tomcat-unit-test. +
TestNamingContext.class.getName());
-if(tmpDir.exists())
-{
-// Remove any old test files
-if(tmpDir.isDirectory()) {
-if(!rmdir(tmpDir))
-throw new IOException(Could not delete old temp
directory: + tmpDir);
-} else {
-if(!tmpDir.delete())
-throw new IOException(Could not delete old temp file: +
tmpDir);
-}
-}
+// Make sure we've got a clean slate
+ExpandWar.delete(tmpDir);
+
File docBase = new File(tmpDir, docBase);
File alternate1 = new File(tmpDir, alternate1);
File alternate2 = new File(tmpDir, alternate2);
@@ -225,8 +194,7 @@ public class TestNamingContext extends T
assertEquals(loremIpsum, contents);
// Clean-up
-if(!rmdir(tmpDir))
-throw new IOException(Could not clean-up temp directory +
tmpDir);
+addDeleteOnTearDown(tmpDir);
}
public static final class Bug49994Servlet extends HttpServlet {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1347109 - /tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
Author: schultz
Date: Wed Jun 6 20:44:00 2012
New Revision: 1347109
URL: http://svn.apache.org/viewvc?rev=1347109view=rev
Log:
Whitespace and curly-brace police.
Modified:
tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
Modified: tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1347109r1=1347108r2=1347109view=diff
==
--- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Wed
Jun 6 20:44:00 2012
@@ -95,8 +95,7 @@ public class TestNamingContext extends T
}
@Test
-public void testAliases() throws Exception
-{
+public void testAliases() throws Exception {
// Some sample text
String foxText = The quick brown fox jumps over the lazy dog;
String loremIpsum = Lorem ipsum dolor sit amet, consectetur
adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
aliqua.;
@@ -112,7 +111,7 @@ public class TestNamingContext extends T
File docBase = new File(tmpDir, docBase);
File alternate1 = new File(tmpDir, alternate1);
File alternate2 = new File(tmpDir, alternate2);
-
+
if(!tmpDir.mkdirs())
throw new IOException(Could not create temp directory + tmpDir);
if(!docBase.mkdir())
@@ -142,7 +141,7 @@ public class TestNamingContext extends T
Assert.assertNotNull(file);
Assert.assertTrue(file instanceof Resource);
-
+
byte[] buffer = new byte[4096];
Resource res = (Resource)file;
@@ -156,7 +155,7 @@ public class TestNamingContext extends T
Assert.assertNotNull(file);
Assert.assertTrue(file instanceof Resource);
-
+
res = (Resource)file;
len = res.streamContent().read(buffer);
contents = new String(buffer, 0, len, UTF-8);
@@ -186,7 +185,7 @@ public class TestNamingContext extends T
Assert.assertNotNull(file);
Assert.assertTrue(file instanceof Resource);
-
+
res = (Resource)file;
len = res.streamContent().read(buffer);
contents = new String(buffer, 0, len, UTF-8);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1347110 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Jun 6 20:45:37 2012 New Revision: 1347110 URL: http://svn.apache.org/viewvc?rev=1347110view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1347110r1=1347109r2=1347110view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 6 20:45:37 2012 @@ -196,6 +196,17 @@ PATCHES PROPOSED TO BACKPORT: +1: schultz, kkolinko -1: +* https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c7 + https://issues.apache.org/bugzilla/show_bug.cgi?id=53366#c1 + If JSP page unexpectedly fails to initialize PageContext instance, + write exception to the logs instead of silent swallowing. + Patch: + http://people.apache.org/~kkolinko/patches/2012-06-06_tc6_Generator.patch + (backport of r1347100 in Tomcat 7, r1346885 in trunk) + +1: kkolinko + -1: + + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1347111 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/naming/resources/TestNamingContext.java
Author: schultz
Date: Wed Jun 6 20:47:42 2012
New Revision: 1347111
URL: http://svn.apache.org/viewvc?rev=1347111view=rev
Log:
Backport of r1347108 and 1347109 from trunk: clean-up of test case.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1347108-1347109
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1347111r1=1347110r2=1347111view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
Wed Jun 6 20:47:42 2012
@@ -42,6 +42,7 @@ import org.junit.Test;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
+import org.apache.catalina.startup.ExpandWar;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -93,57 +94,24 @@ public class TestNamingContext extends T
}
-// Recursively deletes a directory and its contents
-private boolean rmdir(File dir)
-{
-if(!dir.exists()) return false;
-if(!dir.isDirectory()) return false;
-
-File[] files = dir.listFiles();
-if(null != files) {
-for(int i=0; ifiles.length; ++i) {
-if(files[i].isDirectory())
-{
-if(!rmdir(files[i])) {
-return false;
-}
-} else {
-if(!files[i].delete()) {
-return false;
-}
-}
-}
-}
-return dir.delete();
-}
-
@Test
-public void testAliases() throws Exception
-{
+public void testAliases() throws Exception {
// Some sample text
String foxText = The quick brown fox jumps over the lazy dog;
String loremIpsum = Lorem ipsum dolor sit amet, consectetur
adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
aliqua.;
// Set up a temporary docBase and some alternates that we can
// set up as aliases.
-File tmpDir = new File(System.getProperty(java.io.tmpdir),
+File tmpDir = new File(getTemporaryDirectory(),
tomcat-unit-test. +
TestNamingContext.class.getName());
-if(tmpDir.exists())
-{
-// Remove any old test files
-if(tmpDir.isDirectory()) {
-if(!rmdir(tmpDir))
-throw new IOException(Could not delete old temp
directory: + tmpDir);
-} else {
-if(!tmpDir.delete())
-throw new IOException(Could not delete old temp file: +
tmpDir);
-}
-}
+// Make sure we've got a clean slate
+ExpandWar.delete(tmpDir);
+
File docBase = new File(tmpDir, docBase);
File alternate1 = new File(tmpDir, alternate1);
File alternate2 = new File(tmpDir, alternate2);
-
+
if(!tmpDir.mkdirs())
throw new IOException(Could not create temp directory + tmpDir);
if(!docBase.mkdir())
@@ -173,7 +141,7 @@ public class TestNamingContext extends T
Assert.assertNotNull(file);
Assert.assertTrue(file instanceof Resource);
-
+
byte[] buffer = new byte[4096];
Resource res = (Resource)file;
@@ -187,7 +155,7 @@ public class TestNamingContext extends T
Assert.assertNotNull(file);
Assert.assertTrue(file instanceof Resource);
-
+
res = (Resource)file;
len = res.streamContent().read(buffer);
contents = new String(buffer, 0, len, UTF-8);
@@ -217,7 +185,7 @@ public class TestNamingContext extends T
Assert.assertNotNull(file);
Assert.assertTrue(file instanceof Resource);
-
+
res = (Resource)file;
len = res.streamContent().read(buffer);
contents = new String(buffer, 0, len, UTF-8);
@@ -225,8 +193,7 @@ public class TestNamingContext extends T
assertEquals(loremIpsum, contents);
// Clean-up
-if(!rmdir(tmpDir))
-throw new IOException(Could not clean-up temp directory +
tmpDir);
+addDeleteOnTearDown(tmpDir);
}
public static final class Bug49994Servlet extends HttpServlet {
-
To unsubscribe, e-mail:
svn commit: r1347113 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Wed Jun 6 20:50:31 2012 New Revision: 1347113 URL: http://svn.apache.org/viewvc?rev=1347113view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1347113r1=1347112r2=1347113view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 6 20:50:31 2012 @@ -203,7 +203,7 @@ PATCHES PROPOSED TO BACKPORT: Patch: http://people.apache.org/~kkolinko/patches/2012-06-06_tc6_Generator.patch (backport of r1347100 in Tomcat 7, r1346885 in trunk) - +1: kkolinko + +1: kkolinko, schultz -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53374] New: DataSourceFactory does not support commitOnReturn property
https://issues.apache.org/bugzilla/show_bug.cgi?id=53374 Priority: P2 Bug ID: 53374 Assignee: dev@tomcat.apache.org Summary: DataSourceFactory does not support commitOnReturn property Severity: normal Classification: Unclassified OS: Mac OS X 10.4 Reporter: avadhan...@gmail.com Hardware: PC Status: NEW Version: unspecified Component: jdbc-pool Product: Tomcat Modules DataSourceFactory does not support commitOnReturn property. DataSourceFactory.ALL_PROPERTIES and DataSourceFactory.parsePoolProperties() omit commitOnReturn property. -- 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
[Bug 53374] DataSourceFactory does not support commitOnReturn property
https://issues.apache.org/bugzilla/show_bug.cgi?id=53374 --- Comment #1 from Suresh Avadhanula avadhan...@gmail.com --- Created attachment 28897 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28897action=edit Patch for the fix. Attaching the patch for the fix to support commitOnReturn in DataSourceFactory. -- 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
[Bug 53374] DataSourceFactory does not support commitOnReturn property
https://issues.apache.org/bugzilla/show_bug.cgi?id=53374
Konstantin Kolinko knst.koli...@gmail.com changed:
What|Removed |Added
Attachment #28897|0 |1
is patch||
Attachment #28897|application/octet-stream|text/plain
mime type||
--- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com ---
Comment on attachment 28897
-- https://issues.apache.org/bugzilla/attachment.cgi?id=28897
Patch for the fix.
You patch includes a lot of formatting changes. This is a no-go. Please include
only changes relevant to your fix.
Those seem to be
-PROP_ALTERNATE_USERNAME_ALLOWED
+PROP_ALTERNATE_USERNAME_ALLOWED,
+PROP_COMMIT_ON_RETURN
and
+value = properties.getProperty(PROP_COMMIT_ON_RETURN);
+if (value != null) {
+poolProperties.setCommitOnReturn(Boolean.parseBoolean(value));
+}
+
--
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
[Bug 53374] DataSourceFactory does not support commitOnReturn property
https://issues.apache.org/bugzilla/show_bug.cgi?id=53374 --- Comment #3 from Suresh Avadhanula avadhan...@gmail.com --- Created attachment 28898 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28898action=edit Cleaned up Patch for the fix Cleaned up the formatting changes. Including only the relevant changes. -- 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
[Bug 53374] DataSourceFactory does not support commitOnReturn property
https://issues.apache.org/bugzilla/show_bug.cgi?id=53374 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Attachment #28898|0 |1 is patch|| Attachment #28898|application/octet-stream|text/plain mime type|| -- 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
[Bug 53374] DataSourceFactory does not support commitOnReturn property
https://issues.apache.org/bugzilla/show_bug.cgi?id=53374 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Attachment #28897|0 |1 is obsolete|| -- 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
[Bug 53376] New: Unable to load class for JSP - tomcat errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=53376 Priority: P2 Bug ID: 53376 Assignee: dev@tomcat.apache.org Summary: Unable to load class for JSP - tomcat errors Severity: major Classification: Unclassified OS: Linux Reporter: vamshi.x.tek...@ampf.com Hardware: All Status: NEW Version: 6.0.29 Component: Jasper Product: Tomcat 6 Tomcat is throwing errors when work folder is deleted while it is runing.Please let us know if this fixed in any of the newer versions. This prevents the ability to hot deploy the components. JspCompilationContext.java line 628: servletClass = jspLoader.loadClass(name); and before that, tomcat has successfully recompiled the jsp page at work folder, but it seems tomcat cannot find it when load it to memory. Error details: org.apache.jasper.JasperException: org.apache.jasper.JasperException: Unable to load class for JSP org.apache.jasper.JasperException: org.apache.jasper.JasperException: Unable to load class for JSP at org.apache.jasper.servlet.JspServletWrapper.getServlet(JspServletWrapper.java:156) Thanks, Vamsi Tekuru at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:329) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:313) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:260) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646) at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551) at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488) Caused by: org.apache.jasper.JasperException: Unable to load class for JSP at org.apache.jasper.JspCompilationContext.load(JspCompilationContext.java:630) at org.apache.jasper.servlet.JspServletWrapper.getServlet(JspServletWrapper.java:144) ... 176 more Caused by: java.lang.ClassNotFoundException: org.apache.jsp.view_jsp at java.net.URLClassLoader$1.run(URLClassLoader.java:202) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:190) at org.apache.jasper.servlet.JasperLoader.loadClass(JasperLoader.java:134) at org.apache.jasper.servlet.JasperLoader.loadClass(JasperLoader.java:66) at org.apache.jasper.JspCompilationContext.load(JspCompilationContext.java:628) ... 177 more -- 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
[Bug 53377] New: Cookie JSESSIONID is not secured
https://issues.apache.org/bugzilla/show_bug.cgi?id=53377 Priority: P2 Bug ID: 53377 Assignee: dev@tomcat.apache.org Summary: Cookie JSESSIONID is not secured Severity: major Classification: Unclassified OS: Linux Reporter: chinoise...@yahoo.com Hardware: All Status: NEW Version: 5.5.33 Component: Connector:HTTP Product: Tomcat 5 I happened to setup in tomcat Connector port=8443 maxHttpHeaderSize=8192 maxThreads=150 minSpareThreads=25 maxSpareThreads=75 enableLookups=false disableUploadTimeout=true acceptCount=100 scheme=https secure=true clientAuth=false sslProtocol=TLS SSLEnabled=true/ But when i request https://MyURL And from the firefox raw data, i still see JSESSION cookie is not secured. There is no secure word at the the Set-Cookie Set-Cookie: JSESSIONID=BAD4B8869D292DECECDA75863eCg; Path=/myApp -- 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
[Bug 53377] Cookie JSESSIONID is not secured in HTTPS
https://issues.apache.org/bugzilla/show_bug.cgi?id=53377 Alex Lee chinoise...@yahoo.com changed: What|Removed |Added Summary|Cookie JSESSIONID is not|Cookie JSESSIONID is not |secured |secured in HTTPS -- 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
[Bug 53377] Cookie JSESSIONID is not secured in HTTPS
https://issues.apache.org/bugzilla/show_bug.cgi?id=53377 Alex Lee chinoise...@yahoo.com changed: What|Removed |Added CC||chinoise...@yahoo.com -- 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
