svn commit: r1022068 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/startup/ test/org/apache/catalina/core/ test/org/apache/catalina/start
Author: markt
Date: Wed Oct 13 11:10:30 2010
New Revision: 1022068
URL: http://svn.apache.org/viewvc?rev=1022068&view=rev
Log:
Better fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49922
Revert my approach and go with patch suggested by heyoulin.
Extend test cases
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=1022068&r1=1022067&r2=1022068&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Wed
Oct 13 11:10:30 2010
@@ -525,6 +525,11 @@ final class ApplicationFilterChain imple
*/
void addFilter(ApplicationFilterConfig filterConfig) {
+// Prevent the same filter being added multiple times
+for(ApplicationFilterConfig filter:filters)
+if(filter==filterConfig)
+return;
+
if (n == filters.length) {
ApplicationFilterConfig[] newFilters =
new ApplicationFilterConfig[n + INCREMENT];
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1022068&r1=1022067&r2=1022068&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Wed Oct 13
11:10:30 2010
@@ -278,37 +278,13 @@ public class WebXml {
public Map getFilters() { return filters; }
// filter-mapping
-private Map filterMaps =
-new LinkedHashMap();
+private Set filterMaps = new LinkedHashSet();
+private Set filterMappingNames = new HashSet();
public void addFilterMapping(FilterMap filterMap) {
-FilterMap fm = filterMaps.get(filterMap.getFilterName());
-if (fm == null) {
-filterMaps.put(filterMap.getFilterName(), filterMap);
-} else {
-for (String dispatcher : filterMap.getDispatcherNames()) {
-fm.setDispatcher(dispatcher);
-}
-if (!fm.getMatchAllServletNames()) {
-if (filterMap.getMatchAllServletNames()) {
-fm.addServletName("*");
-} else {
-for (String servletName : filterMap.getServletNames()) {
-fm.addServletName(servletName);
-}
-}
-}
-if (!fm.getMatchAllUrlPatterns()) {
-if (filterMap.getMatchAllUrlPatterns()) {
-fm.addURLPattern("*");
-} else {
-for (String urlPattern : filterMap.getURLPatterns()) {
-fm.addURLPattern(urlPattern);
-}
-}
-}
-}
+filterMaps.add(filterMap);
+filterMappingNames.add(filterMap.getFilterName());
}
-public Map getFilterMappings() { return filterMaps; }
+public Set getFilterMappings() { return filterMaps; }
// listener
// TODO: description (multiple with language) is ignored
@@ -651,7 +627,7 @@ public class WebXml {
}
sb.append('\n');
-for (FilterMap filterMap : filterMaps.values()) {
+for (FilterMap filterMap : filterMaps) {
sb.append(" \n");
appendElement(sb, INDENT4, "filter-name",
filterMap.getFilterName());
@@ -1200,7 +1176,7 @@ public class WebXml {
}
context.addFilterDef(filter);
}
-for (FilterMap filterMap : filterMaps.values()) {
+for (FilterMap filterMap : filterMaps) {
context.addFilterMap(filterMap);
}
for (JspPropertyGroup jspPropertyGroup : jspPropertyGroups) {
@@ -1442,16 +1418,17 @@ public class WebXml {
// main web.xml override those in fragments and those in fragments
// override mappings in annotations
for (WebXml fragment : fragments) {
-Iterator iterFilterMaps =
-fragment.getFilterMappings().keySet().iterator();
+Iterator iterFilterMaps =
+fragment.getFilterMappings().iterator();
while (iterFilterMaps.hasNext()) {
-
DO NOT REPLY [Bug 50084] New: catalina.sh fix in #49728 breaks PID handling again
https://issues.apache.org/bugzilla/show_bug.cgi?id=50084 Summary: catalina.sh fix in #49728 breaks PID handling again Product: Tomcat 6 Version: unspecified Platform: PC Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: r...@symentis.com The pid handling fix in #49728 breaks PID handling again. The fix now removes empty PID files before start. This doesn't work on RHEL5/CentOS5 (and maybe others), where tomcat is started as non-root user. The pid files on these OS's are in /var/run, which is only writeable by root. Therefore, the init.d script creates the pid file and sets the permissions accordinghly. This is not working anymore, as catalina.sh tries to remove this empty file and skips filling the file as it cant remove it. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50084] catalina.sh fix in #49728 breaks PID handling again
https://issues.apache.org/bugzilla/show_bug.cgi?id=50084 r...@symentis.com changed: What|Removed |Added CC||r...@symentis.com OS/Version||All -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50084] catalina.sh fix in #49728 breaks PID handling again
https://issues.apache.org/bugzilla/show_bug.cgi?id=50084 --- Comment #1 from Konstantin Kolinko 2010-10-13 08:42:26 EDT --- What is your suggestion how to deal with it? I might think about truncating the stale PID file instead of deleting it. To truncate a file one might redirect empty output to it, as shown in [1], using the "colon" (no-op) command: :>"$CATALINA_PID" [1] http://linuxdemon.blogspot.com/2007/06/how-to-truncate-file-in-unixlinux.html The following also works: true>"$CATALINA_PID" -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50084] catalina.sh fix in #49728 breaks PID handling again
https://issues.apache.org/bugzilla/show_bug.cgi?id=50084 --- Comment #2 from r...@symentis.com 2010-10-13 08:48:16 EDT --- In my opinion, thats not necessary. I will add a patch to this ticket with my workaround to the problem. Basically, when an empty pid file exists, its' just filled by catalina.sh -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50084] catalina.sh fix in #49728 breaks PID handling again
https://issues.apache.org/bugzilla/show_bug.cgi?id=50084 --- Comment #3 from r...@symentis.com 2010-10-13 08:56:37 EDT --- Created an attachment (id=26167) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26167) Patch to fix existing, empty pid file handling Note: echo $! > "$CATALINA_PID" creates the file if not existent and fills existing files (overwrites existing content) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50072] Blank responses
https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 --- Comment #2 from p...@creactive.cz 2010-10-13 09:09:24 EDT --- Created an attachment (id=26168) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26168) tcpdump log - nio connector -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50072] Blank responses
https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 --- Comment #3 from p...@creactive.cz 2010-10-13 09:09:59 EDT --- Created an attachment (id=26169) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26169) tcpdump log - bio connector -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50072] Blank responses
https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 p...@creactive.cz changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #4 from p...@creactive.cz 2010-10-13 09:10:26 EDT --- This problem has tomcat 6.0.24 and all next releases. I tested it now with version 6.0.29 and php on one of our client servers where the problem was detected before. Problem is with http 1.0 requests from php (fopen, simplexml_load_file functions) and NIO connector. Same script works fine with BIO connector. Http 1.1 requests (curl, fsockopen php functions) works fine with both connectors. I attach bio.log and nio.log tcpdump logs. Top +- 10 requests are from simplexml_load_file and next are curl and fsockopen. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50087] New: When metadata-complete="false" throw illegal JVM_CONSTANT_Class name
https://issues.apache.org/bugzilla/show_bug.cgi?id=50087 Summary: When metadata-complete="false" throw illegal JVM_CONSTANT_Class name Product: Tomcat 7 Version: trunk Platform: PC OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: heyou...@hotmail.com When metadata-complete="false" and add groovy-all-1.7.2.jar to app lib throw java.lang.reflect.InvocationTargetException 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.startup.Bootstrap.start(Bootstrap.java:290) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:418) Caused by: java.lang.ClassFormatError: groovy/jmx/builder/package-info : illegal JVM_CONSTANT_Class name: groovy/jmx/builder/package-info at java.lang.ClassLoader.defineClass1(Native Method) at java.lang.ClassLoader.defineClassCond(ClassLoader.java:632) at java.lang.ClassLoader.defineClass(ClassLoader.java:616) at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:141) at org.apache.catalina.loader.WebappClassLoader.findClassInternal(WebappClassLoader.java:2804) at org.apache.catalina.loader.WebappClassLoader.findClass(WebappClassLoader.java:1144) at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1639) at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1517) at org.apache.catalina.startup.ContextConfig.checkHandlesTypes(ContextConfig.java:1952) at org.apache.catalina.startup.ContextConfig.processAnnotationsStream(ContextConfig.java:1915) at org.apache.catalina.startup.ContextConfig.processAnnotationsJar(ContextConfig.java:1802) at org.apache.catalina.startup.ContextConfig.processAnnotationsUrl(ContextConfig.java:1761) at org.apache.catalina.startup.ContextConfig.processAnnotations(ContextConfig.java:1747) at org.apache.catalina.startup.ContextConfig.webConfig(ContextConfig.java:1252) at org.apache.catalina.startup.ContextConfig.configureStart(ContextConfig.java:881) at org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:315) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:89) at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:4700) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:140) at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:1028) at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:773) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:140) at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:1028) at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:278) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:140) at org.apache.catalina.core.StandardService.startInternal(StandardService.java:429) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:140) at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:662) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:140) at org.apache.catalina.startup.Catalina.start(Catalina.java:592) ... 6 more -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022098 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 13 13:43:03 2010 New Revision: 1022098 URL: http://svn.apache.org/viewvc?rev=1022098&view=rev Log: vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1022098&r1=1022097&r2=1022098&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Oct 13 13:43:03 2010 @@ -70,5 +70,5 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49935 Handle compilation of recursive tag files. Port fix from tc6. http://people.apache.org/~markt/patches/2010-09-27-bug49935-tc5.patch - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50087] When metadata-complete="false" throw illegal JVM_CONSTANT_Class name
https://issues.apache.org/bugzilla/show_bug.cgi?id=50087 --- Comment #1 from Konstantin Kolinko 2010-10-13 09:49:47 EDT --- What is your JRE version? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022109 - /tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Author: kkolinko
Date: Wed Oct 13 14:03:23 2010
New Revision: 1022109
URL: http://svn.apache.org/viewvc?rev=1022109&view=rev
Log:
Revert r964780 that was a fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=49428
See Re:r964780 thread on dev@ or TC 6.0 STATUS file.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1022109&r1=1022108&r2=1022109&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed Oct
13 14:03:23 2010
@@ -548,7 +548,7 @@ public class WebdavServlet
if (type == FIND_BY_PROPERTY) {
properties = new Vector();
-// propNode must be non-null if type == FIND_BY_PROPERTY
+// propNode must be non-null if type == FIND_BY_PROPERTY
@SuppressWarnings("null")
NodeList childList = propNode.getChildNodes();
@@ -599,13 +599,13 @@ public class WebdavServlet
new XMLWriter(resp.getWriter());
generatedXML.writeXMLHeader();
generatedXML.writeElement
-(null, "D:multistatus"
+(null, "multistatus"
+ generateNamespaceDeclarations(),
XMLWriter.OPENING);
parseLockNullProperties
(req, generatedXML, lockNullPath, type,
properties);
-generatedXML.writeElement(null, "D:multistatus",
+generatedXML.writeElement(null, "multistatus",
XMLWriter.CLOSING);
generatedXML.sendData();
return;
@@ -628,7 +628,7 @@ public class WebdavServlet
XMLWriter generatedXML = new XMLWriter(resp.getWriter());
generatedXML.writeXMLHeader();
-generatedXML.writeElement(null, "D:multistatus"
+generatedXML.writeElement(null, "multistatus"
+ generateNamespaceDeclarations(),
XMLWriter.OPENING);
@@ -708,7 +708,7 @@ public class WebdavServlet
}
}
-generatedXML.writeElement(null, "D:multistatus",
+generatedXML.writeElement(null, "multistatus",
XMLWriter.CLOSING);
generatedXML.sendData();
@@ -1187,7 +1187,7 @@ public class WebdavServlet
generatedXML.writeXMLHeader();
generatedXML.writeElement
-(null, "D:multistatus" +
generateNamespaceDeclarations(),
+(null, "multistatus" + generateNamespaceDeclarations(),
XMLWriter.OPENING);
while (lockPathsList.hasMoreElements()) {
@@ -1358,19 +1358,19 @@ public class WebdavServlet
// the lock information
XMLWriter generatedXML = new XMLWriter();
generatedXML.writeXMLHeader();
-generatedXML.writeElement(null, "D:prop"
+generatedXML.writeElement(null, "prop"
+ generateNamespaceDeclarations(),
XMLWriter.OPENING);
-generatedXML.writeElement(null, "D:lockdiscovery",
+generatedXML.writeElement(null, "lockdiscovery",
XMLWriter.OPENING);
lock.toXML(generatedXML);
-generatedXML.writeElement(null, "D:lockdiscovery",
+generatedXML.writeElement(null, "lockdiscovery",
XMLWriter.CLOSING);
-generatedXML.writeElement(null, "D:prop", XMLWriter.CLOSING);
+generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
resp.setStatus(WebdavStatus.SC_OK);
resp.setContentType("text/xml; charset=UTF-8");
@@ -1462,7 +1462,7 @@ public class WebdavServlet
* Generate the namespace declarations.
*/
private String generateNamespaceDeclarations() {
-return " xmlns:D=\"" + DEFAULT_NAMESPACE + "\"";
+return " xmlns=\"" + DEFAULT_NAMESPACE + "\"";
}
@@ -2062,13 +2062,13 @@ public class WebdavServlet
return;
}
-generatedXML.writeElement(null, "D:response", XMLWriter.OPENING);
+generatedXML.writeElement(null, "response", XMLWriter.OPENING);
String status = new String("HTTP/1.1 " + WebdavStatus.SC_OK + " "
+ WebdavStatus.getStatusText
(WebdavStatus
svn commit: r1022114 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Oct 13 14:22:10 2010 New Revision: 1022114 URL: http://svn.apache.org/viewvc?rev=1022114&view=rev Log: Withdraw patch 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=1022114&r1=1022113&r2=1022114&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 13 14:22:10 2010 @@ -174,16 +174,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 - Add a work-around for the known namespace issues for some Microsoft WebDAV - clients. Patch provided by Panagiotis Astithas. - http://svn.apache.org/viewvc?view=revision&revision=964780 - +1: markt - -1: kkolinko: -See Re:r964780 on d...@. To summarize: -1) There are some elements where namespace prefix was not added -2) Our XMLWriter class has support for namespaces. I'd be better to use that. - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860 Add support for trailing headers. http://svn.apache.org/viewvc?rev=1003461&view=rev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49428] Fix WebDAV mounts from Windows Mini-Redirector clients
https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 --- Comment #10 from Mark Thomas 2010-10-13 10:23:56 EDT --- Patch has been withdrawn for 6.0.x and reverted for 7.0.x See http://tomcat.markmail.org/thread/u5i5blwrsxf2h3zv for reasoning. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022117 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/ApplicationContext.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: markt Date: Wed Oct 13 14:41:57 2010 New Revision: 1022117 URL: http://svn.apache.org/viewvc?rev=1022117&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49987 Thread safety issue with population of servlet context initialisation parameters. Back-port wasn't completely clean - please review. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 13 14:41:57 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178,966292,966692,981815,991837,993042,1001955,1002185,1002263,1002349,1002359,1002362,1002481,1002514,1003481,1003488,1003556,1003572,1003581,1003861 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,7635
DO NOT REPLY [Bug 49987] Data race in ApplicationContext
https://issues.apache.org/bugzilla/show_bug.cgi?id=49987 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-10-13 10:42:37 EDT --- Fixed in 6.0.x and will be included in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022120 - /tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Author: kkolinko
Date: Wed Oct 13 14:55:27 2010
New Revision: 1022120
URL: http://svn.apache.org/viewvc?rev=1022120&view=rev
Log:
Re-implement the fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=49428
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1022120&r1=1022119&r2=1022120&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed Oct
13 14:55:27 2010
@@ -548,7 +548,7 @@ public class WebdavServlet
if (type == FIND_BY_PROPERTY) {
properties = new Vector();
-// propNode must be non-null if type == FIND_BY_PROPERTY
+// propNode must be non-null if type == FIND_BY_PROPERTY
@SuppressWarnings("null")
NodeList childList = propNode.getChildNodes();
@@ -598,15 +598,13 @@ public class WebdavServlet
XMLWriter generatedXML =
new XMLWriter(resp.getWriter());
generatedXML.writeXMLHeader();
-generatedXML.writeElement
-(null, "multistatus"
- + generateNamespaceDeclarations(),
- XMLWriter.OPENING);
+generatedXML.writeElement("D", DEFAULT_NAMESPACE,
+"multistatus", XMLWriter.OPENING);
parseLockNullProperties
(req, generatedXML, lockNullPath, type,
properties);
-generatedXML.writeElement(null, "multistatus",
- XMLWriter.CLOSING);
+generatedXML.writeElement("D", "multistatus",
+XMLWriter.CLOSING);
generatedXML.sendData();
return;
}
@@ -628,9 +626,8 @@ public class WebdavServlet
XMLWriter generatedXML = new XMLWriter(resp.getWriter());
generatedXML.writeXMLHeader();
-generatedXML.writeElement(null, "multistatus"
- + generateNamespaceDeclarations(),
- XMLWriter.OPENING);
+generatedXML.writeElement("D", DEFAULT_NAMESPACE, "multistatus",
+XMLWriter.OPENING);
if (depth == 0) {
parseProperties(req, generatedXML, path, type,
@@ -708,8 +705,7 @@ public class WebdavServlet
}
}
-generatedXML.writeElement(null, "multistatus",
- XMLWriter.CLOSING);
+generatedXML.writeElement("D", "multistatus", XMLWriter.CLOSING);
generatedXML.sendData();
@@ -1186,34 +1182,32 @@ public class WebdavServlet
XMLWriter generatedXML = new XMLWriter();
generatedXML.writeXMLHeader();
-generatedXML.writeElement
-(null, "multistatus" + generateNamespaceDeclarations(),
- XMLWriter.OPENING);
+generatedXML.writeElement("D", DEFAULT_NAMESPACE,
+"multistatus", XMLWriter.OPENING);
while (lockPathsList.hasMoreElements()) {
-generatedXML.writeElement(null, "response",
- XMLWriter.OPENING);
-generatedXML.writeElement(null, "href",
- XMLWriter.OPENING);
-generatedXML
-.writeText(lockPathsList.nextElement());
-generatedXML.writeElement(null, "href",
- XMLWriter.CLOSING);
-generatedXML.writeElement(null, "status",
- XMLWriter.OPENING);
+generatedXML.writeElement("D", "response",
+XMLWriter.OPENING);
+generatedXML.writeElement("D", "href",
+XMLWriter.OPENING);
+generatedXML.writeText(lockPathsList.nextElement());
+generatedXML.writeElement("D", "href",
+XMLWriter.CLOSING);
+generatedXML.writeElement("D", "status",
+XMLWriter.OPENING);
generatedXML
.writeText("HTT
svn commit: r1022121 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/servlet/JspServletWrapper.java webapps/docs/changelog.xml
Author: markt Date: Wed Oct 13 14:55:42 2010 New Revision: 1022121 URL: http://svn.apache.org/viewvc?rev=1022121&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49986 Thread safety for JSP reload. Patch by timw Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 13 14:55:42 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178,966292,966692,981815,991837,993042,1001955,1002185,1002263,1002349,1002359,1002362,1002481,1002514,1003481,1003488,1003556,1003572,1003581,1003861,1005647 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,77837
DO NOT REPLY [Bug 49986] Double-check locking. Possible data-race in JspServletWrapper
https://issues.apache.org/bugzilla/show_bug.cgi?id=49986 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2010-10-13 10:59:02 EDT --- Fixed in 6.0.x and will be in 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022125 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Oct 13 15:02:32 2010 New Revision: 1022125 URL: http://svn.apache.org/viewvc?rev=1022125&view=rev Log: Typo Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022125&r1=1022124&r2=1022125&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 13 15:02:32 2010 @@ -127,7 +127,7 @@ 49972: Fix potential thread safe issue when formatting dates -for us in HTTP headers. (markt) +for use in HTTP headers. (markt) 50003: Set not maxThreads but minSpareThreads to - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50087] When metadata-complete="false" throw illegal JVM_CONSTANT_Class name
https://issues.apache.org/bugzilla/show_bug.cgi?id=50087 --- Comment #2 from heyoulin 2010-10-13 11:04:51 EDT --- I try jdk1.6.0_21 and jrmc-4.0.1-1.6.0 both throw this exception. Only groovy-all-1.7.2 and not test on other groovy version. But this worked fine before until i use latest build. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022128 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/http/FastHttpDateFormat.java webapps/docs/changelog.xml
Author: markt Date: Wed Oct 13 15:06:26 2010 New Revision: 1022128 URL: http://svn.apache.org/viewvc?rev=1022128&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 Potential thread safety issues in FastHttpDateFormat Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 13 15:06:26 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178,966292,966692,981815,991837,993042,1001955,1002185,1002263,1002349,1002359,1002362,1002481,1002514,1003481,1003488,1003556,1003572,1003581,1003861,1005467,1005647 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,77746
DO NOT REPLY [Bug 49972] Double-check idiom. Possible data-race.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49972 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #10 from Mark Thomas 2010-10-13 11:07:03 EDT --- Fixed in 6.0.x for 6.0.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022134 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Author: markt
Date: Wed Oct 13 15:16:35 2010
New Revision: 1022134
URL: http://svn.apache.org/viewvc?rev=1022134&view=rev
Log:
Avoid unnecessary cast
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1022134&r1=1022133&r2=1022134&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Oct 13
15:16:35 2010
@@ -5562,11 +5562,11 @@ public class StandardContext extends Con
dir.mkdirs();
// Set the appropriate servlet context attribute
-getServletContext().setAttribute(ServletContext.TEMPDIR, dir);
-if (getServletContext() instanceof ApplicationContext)
-((ApplicationContext) getServletContext()).setAttributeReadOnly
-(ServletContext.TEMPDIR);
-
+if (context == null) {
+getServletContext();
+}
+context.setAttribute(ServletContext.TEMPDIR, dir);
+context.setAttributeReadOnly(ServletContext.TEMPDIR);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022136 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Oct 13 15:23:17 2010 New Revision: 1022136 URL: http://svn.apache.org/viewvc?rev=1022136&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022136&r1=1022135&r2=1022136&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 13 15:23:17 2010 @@ -238,9 +238,14 @@ PATCHES PROPOSED TO BACKPORT: - Do not remove "// Make sure no session ID is returned" comment. - Documentation update will be needed. - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50066 +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50066 Compile recursive tag file if it depends on a JAR. Patch provided by Sylvain Laurent. https://issues.apache.org/bugzilla/attachment.cgi?id=26149 +1: markt, kkolinko -1: + +* Avoid unnecessary cast + http://svn.apache.org/viewvc?rev=1022134&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022137 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Wed Oct 13 15:23:33 2010 New Revision: 1022137 URL: http://svn.apache.org/viewvc?rev=1022137&view=rev Log: Proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1022137&r1=1022136&r2=1022137&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Oct 13 15:23:33 2010 @@ -72,3 +72,9 @@ PATCHES PROPOSED TO BACKPORT: http://people.apache.org/~markt/patches/2010-09-27-bug49935-tc5.patch +1: markt, kkolinko -1: + +* Avoid unnecessary cast + http://svn.apache.org/viewvc?rev=1022134&view=rev + +1: markt + -1: + \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022143 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Oct 13 15:30:39 2010 New Revision: 1022143 URL: http://svn.apache.org/viewvc?rev=1022143&view=rev Log: Add changelog entry for r1022120 Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022143&r1=1022142&r2=1022143&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 13 15:30:39 2010 @@ -40,6 +40,10 @@ +49428: Re-implement the fix for bug 49428 – +namespace issues for some Microsoft WebDAV clients. (kkolinko) + + 49669: Fix memory leak triggered by using the deprecated javax.security.auth.Policy class. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022144 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 13 15:33:12 2010 New Revision: 1022144 URL: http://svn.apache.org/viewvc?rev=1022144&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022144&r1=1022143&r2=1022144&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 13 15:33:12 2010 @@ -249,3 +249,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1022134&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 + Add a work-around for the known namespace issues for some Microsoft WebDAV + clients. Based on the patch provided by Panagiotis Astithas. + http://svn.apache.org/viewvc?rev=1022120&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49428] Fix WebDAV mounts from Windows Mini-Redirector clients
https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 --- Comment #11 from Konstantin Kolinko 2010-10-13 11:37:54 EDT --- I reimplemented the fix in trunk in r1022120 and it will be in 7.0.4. Proposed it for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022148 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 13 15:45:09 2010 New Revision: 1022148 URL: http://svn.apache.org/viewvc?rev=1022148&view=rev Log: vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1022148&r1=1022147&r2=1022148&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Oct 13 15:45:09 2010 @@ -75,6 +75,6 @@ PATCHES PROPOSED TO BACKPORT: * Avoid unnecessary cast http://svn.apache.org/viewvc?rev=1022134&view=rev - +1: markt + +1: markt, kkolinko -1: \ No newline at end of file Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022148&r1=1022147&r2=1022148&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 13 15:45:09 2010 @@ -247,7 +247,7 @@ PATCHES PROPOSED TO BACKPORT: * Avoid unnecessary cast http://svn.apache.org/viewvc?rev=1022134&view=rev - +1: markt + +1: markt, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1005192 - /tomcat/tc6.0.x/trunk/STATUS.txt
2010/10/6 : > Author: markt > Date: Wed Oct 6 18:03:03 2010 > New Revision: 1005192 > > URL: http://svn.apache.org/viewvc?rev=1005192&view=rev > Log: > Proposal > > Modified: > tomcat/tc6.0.x/trunk/STATUS.txt > > + > +* Fix path parameter handling. Currently the following URL fails with a 404: > + http://localhost:8080/examples/jsp/snp;x=y/snoop.jsp > + http://people.apache.org/~markt/patches/2010-10-06-path-param-tc6.patch > + +1: markt > + -1: > I think this is wrong, because a path parameter is not just a pair of (name, value), but a triple of (path, name, value), taking into account the path segment where it was applied. The proposed patch strips information on the parameters from the path. How the application is supposed to have access to them? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1005192 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 13/10/2010 16:57, Konstantin Kolinko wrote: > 2010/10/6 : >> Author: markt >> Date: Wed Oct 6 18:03:03 2010 >> New Revision: 1005192 >> >> URL: http://svn.apache.org/viewvc?rev=1005192&view=rev >> Log: >> Proposal >> >> Modified: >>tomcat/tc6.0.x/trunk/STATUS.txt >> >> + >> +* Fix path parameter handling. Currently the following URL fails with a 404: >> + http://localhost:8080/examples/jsp/snp;x=y/snoop.jsp >> + http://people.apache.org/~markt/patches/2010-10-06-path-param-tc6.patch >> + +1: markt >> + -1: >> > > I think this is wrong, because a path parameter is not just a pair of > (name, value), but a triple of (path, name, value), taking into > account the path segment where it was applied. > > The proposed patch strips information on the parameters from the path. > How the application is supposed to have access to them? The short answer is via getRequestURI(). The longer answer is: The Servlet Specification defines the following: requestURI = contextPath + servletPath + pathInfo It also states that: - path parameters are returned by getRequestURI() and getPathInfo() - contextPath & path parameters are ignored when mapping requests to servlets The specification does not state: - if the value returned by getContextPath() include path parameters or not. The implication is that it should not. - if the value returned by getServletPath() include path parameters or not. The implication is that it should not. If you add removal of /../ sequences, URI decoding and character decoding then the picture gets even murkier. The Servlet expert group has previously indicated [1] that the specification would be altered to state that getPathInfo() should not return path parameters and that clarification would be added to confirm that getContextPath() and getServletPath() should not return path parameters either. This clarification was never added to the specification. I'm not against switching from a pair to a triple for this but a) I'm not sure many (any?) folks are using path parameters apart from for session IDs and b) I think the 404 is a more important issue. Finally, I'd add that the behaviour varies considerably between containers in this area and an app's only hope for portability at the moment is to use getRequestURI(). Mark [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=25015 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022171 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 13 16:18:48 2010 New Revision: 1022171 URL: http://svn.apache.org/viewvc?rev=1022171&view=rev Log: vote and 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=1022171&r1=1022170&r2=1022171&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 13 16:18:48 2010 @@ -214,7 +214,7 @@ PATCHES PROPOSED TO BACKPORT: http://localhost:8080/examples/jsp/snp;x=y/snoop.jsp http://people.apache.org/~markt/patches/2010-10-06-path-param-tc6.patch +1: markt - -1: + -0: kkolinko: see Re:r1005192 thread on dev@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49965 Use correct i18n resources for StringManager in JAASRealm @@ -222,6 +222,15 @@ PATCHES PROPOSED TO BACKPORT: (Port of http://svn.apache.org/viewvc?view=revision&revision=920820) +1: markt -1: + -0: kkolinko: It is amazing that the patch just removes N lines and fixes +the issue, but I think that removing static protected fields is not +good for binary compatibility between releases. Alternative patch +proposed below. + + Alternative patch: + http://people.apache.org/~kkolinko/patches/2010-10-13_tc6_bug49965.patch + +1: kkolinko + -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49811 Add context option to disable URL re-writing and session parsing from URLs - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1005192 - /tomcat/tc6.0.x/trunk/STATUS.txt
2010/10/13 Mark Thomas : > I'm not against switching from a pair to a triple for this but a) I'm > not sure many (any?) folks are using path parameters apart from for > session IDs I will think more on it and do some testing, what of our APIs are exposing them, but just from reading RFC 3986 ch.3.3 [1] I think the representation of them as a simple HashMap is inadequate. http://tools.ietf.org/html/rfc3986#section-3.3 > and b) I think the 404 is a more important issue. Is it possible to fix the client that sends those requests? Or apply a Valve/Filter? Though, well, I can imagine a scenario that this issue may be seen a) start Tomcat and make a bookmark that includes jsessionid in its path b) reconfigure Tomcat to use a different name for jsessionid parameter c) the bookmark no longer works. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
req: Need someone to publish daemon 1.0.3 to maven repository
Hi, One user asked to put commons-daemon-1.0.3 to the Maven repository I know everything is explained here: http://www.apache.org/dev/publishing-maven-artifacts.html However, never did that, so would appreciate if someone familiar could to push the released jar's. Thanks -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: req: Need someone to publish daemon 1.0.3 to maven repository
Huh, wrong Apache tribe (I was sending that to the commons dev list). Sorry for the noise. One user asked to put commons-daemon-1.0.3 to the Maven repository Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022236 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Oct 13 18:53:17 2010 New Revision: 1022236 URL: http://svn.apache.org/viewvc?rev=1022236&view=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=1022236&r1=1022235&r2=1022236&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 13 18:53:17 2010 @@ -256,7 +256,7 @@ PATCHES PROPOSED TO BACKPORT: * Avoid unnecessary cast http://svn.apache.org/viewvc?rev=1022134&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022237 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Wed Oct 13 18:53:30 2010 New Revision: 1022237 URL: http://svn.apache.org/viewvc?rev=1022237&view=rev Log: Vote. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1022237&r1=1022236&r2=1022237&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Oct 13 18:53:30 2010 @@ -75,6 +75,6 @@ PATCHES PROPOSED TO BACKPORT: * Avoid unnecessary cast http://svn.apache.org/viewvc?rev=1022134&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: - \ No newline at end of file + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1022117 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/ApplicationContext.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
On 13 October 2010 15:41, wrote: > Author: markt > Date: Wed Oct 13 14:41:57 2010 > New Revision: 1022117 > > URL: http://svn.apache.org/viewvc?rev=1022117&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49987 > Thread safety issue with population of servlet context initialisation > parameters. > Back-port wasn't completely clean - please review. > > Modified: > tomcat/tc6.0.x/trunk/ (props changed) > tomcat/tc6.0.x/trunk/STATUS.txt > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java > tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml > > Modified: > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java > URL: > http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1022117&r1=1022116&r2=1022117&view=diff > == > --- > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java > (original) > +++ > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java > Wed Oct 13 14:41:57 2010 > @@ -122,7 +122,8 @@ public class ApplicationContext > /** > * The merged context initialization parameters for this Context. > */ > - private Map parameters = null; > + private Map parameters = > + new ConcurrentHashMap(); This should be final, surely? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022293 - /tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Author: markt
Date: Wed Oct 13 21:16:33 2010
New Revision: 1022293
URL: http://svn.apache.org/viewvc?rev=1022293&view=rev
Log:
Fix reading the request line via NIO for slow clients (such as me typing via
telnet). Need to treat each section of the request line (text or space) as a
separate phase.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1022293&r1=1022292&r2=1022293&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Wed
Oct 13 21:16:33 2010
@@ -262,7 +262,6 @@ public class InternalNioInputBuffer exte
}
pos++;
}
-parsingRequestLineStart = pos;
parsingRequestLinePhase = 3;
}
if ( parsingRequestLinePhase == 3 ) {
@@ -280,13 +279,17 @@ public class InternalNioInputBuffer exte
space = false;
}
}
-
+parsingRequestLineStart = pos;
+parsingRequestLinePhase = 4;
+}
+if (parsingRequestLinePhase == 4) {
// Mark the current buffer position
int end = 0;
//
// Reading the URI
//
+boolean space = false;
while (!space) {
// Read new bytes if needed
if (pos >= lastValid) {
@@ -316,10 +319,9 @@ public class InternalNioInputBuffer exte
} else {
request.requestURI().setBytes(buf, parsingRequestLineStart,
end - parsingRequestLineStart);
}
-parsingRequestLineStart = pos;
-parsingRequestLinePhase = 4;
+parsingRequestLinePhase = 5;
}
-if ( parsingRequestLinePhase == 4 ) {
+if ( parsingRequestLinePhase == 5 ) {
// Spec says single SP but also be tolerant of multiple and/or HT
boolean space = true;
while (space) {
@@ -334,7 +336,10 @@ public class InternalNioInputBuffer exte
space = false;
}
}
-
+parsingRequestLineStart = pos;
+parsingRequestLinePhase = 6;
+}
+if (parsingRequestLinePhase == 6) {
// Mark the current buffer position
end = 0;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022294 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Oct 13 21:19:17 2010 New Revision: 1022294 URL: http://svn.apache.org/viewvc?rev=1022294&view=rev Log: Update change-log Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022294&r1=1022293&r2=1022294&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 13 21:19:17 2010 @@ -146,6 +146,11 @@ 50054: Correctly handle the setting of minSpareThreads in AJP connector. (kfujino) + +Fix issues when using a non-blocking read for the request line with the +NIO connector that could result in the request line being mis-read. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022303 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Author: markt
Date: Wed Oct 13 21:54:28 2010
New Revision: 1022303
URL: http://svn.apache.org/viewvc?rev=1022303&view=rev
Log:
Better clean-up.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1022303&r1=1022302&r2=1022303&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Oct
13 21:54:28 2010
@@ -396,10 +396,10 @@ public class Http11NioProtocol extends A
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
socket.getPoller().add(socket);
-recycledProcessors.offer(processor);
+release(socket);
} else {
// Connection closed. OK to recycle the processor.
-recycledProcessors.offer(processor);
+release(socket);
}
return state;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022304 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Oct 13 21:57:46 2010 New Revision: 1022304 URL: http://svn.apache.org/viewvc?rev=1022304&view=rev Log: Testing in 6.0.x confirmed this is the same issue. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1022304&r1=1022303&r2=1022304&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 13 21:57:46 2010 @@ -147,9 +147,9 @@ AJP connector. (kfujino) -Fix issues when using a non-blocking read for the request line with the -NIO connector that could result in the request line being mis-read. -(markt) +50072: Fix issues when using a non-blocking read for the +request line with the NIO connector that could result in the request +line being mis-read. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50072] Blank responses
https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 --- Comment #5 from Mark Thomas 2010-10-13 17:59:19 EDT --- Created an attachment (id=26173) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26173) Proposed patch -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022306 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Oct 13 22:02:13 2010 New Revision: 1022306 URL: http://svn.apache.org/viewvc?rev=1022306&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022306&r1=1022305&r2=1022306&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 13 22:02:13 2010 @@ -265,3 +265,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1022120&view=rev +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 + NIO connector can mis-read request line if not sent in a single pacaket + https://issues.apache.org/bugzilla/attachment.cgi?id=26173&action=edit + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50072] Blank responses
https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 --- Comment #6 from Mark Thomas 2010-10-13 18:02:49 EDT --- Thanks for the additional traces and analysis. The analysis is particularly helpful. I tracked the problem down to a long standing issue in the NIO connector where request lines sent in more that one packet are likely to be mis-read. The simplest way to reproduce this is to use telnet. I have applied a fix for this issue to 7.0.x and it will be included in 7.0.4 onwards. I have proposed a port of the same fix for 6.0.x (patch attached). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022307 - /tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Author: markt
Date: Wed Oct 13 22:03:42 2010
New Revision: 1022307
URL: http://svn.apache.org/viewvc?rev=1022307&view=rev
Log:
Fix warnings
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1022307&r1=1022306&r2=1022307&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed Oct
13 22:03:42 2010
@@ -2787,6 +2787,7 @@ public class WebdavServlet
context = theContext;
}
+@Override
public InputSource resolveEntity (String publicId, String systemId) {
context.log(sm.getString("webdavservlet.enternalEntityIgnored",
publicId, systemId));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022310 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Oct 13 22:08:49 2010 New Revision: 1022310 URL: http://svn.apache.org/viewvc?rev=1022310&view=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=1022310&r1=1022309&r2=1022310&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 13 22:08:49 2010 @@ -263,7 +263,7 @@ PATCHES PROPOSED TO BACKPORT: Add a work-around for the known namespace issues for some Microsoft WebDAV clients. Based on the patch provided by Panagiotis Astithas. http://svn.apache.org/viewvc?rev=1022120&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50072 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022315 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Author: kkolinko Date: Wed Oct 13 22:41:45 2010 New Revision: 1022315 URL: http://svn.apache.org/viewvc?rev=1022315&view=rev Log: Followup to r1022117 Remove unused import. CTR Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1022315&r1=1022314&r2=1022315&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Oct 13 22:41:45 2010 @@ -42,7 +42,6 @@ import javax.servlet.ServletContextAttri import org.apache.catalina.Context; import org.apache.catalina.Host; import org.apache.catalina.Wrapper; -import org.apache.catalina.deploy.ApplicationParameter; import org.apache.catalina.util.Enumerator; import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.ResourceSet; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1022117 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/ApplicationContext.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
2010/10/13 : > Author: markt > Date: Wed Oct 13 14:41:57 2010 > New Revision: 1022117 > > URL: http://svn.apache.org/viewvc?rev=1022117&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49987 > Thread safety issue with population of servlet context initialisation > parameters. > Back-port wasn't completely clean - please review. > +1. Looks OK for me. Re: sebb: 2010/10/13 sebb : >> -private Map parameters = null; >> +private Map parameters = >> +new ConcurrentHashMap(); > > This should be final, surely? > There are a lot of non-final fields in ApplicationContext and I think in related classes as well. I do not think making this specific one as final is essential. (Anyway, +1 if anybody wants to do that). 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: r1022323 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Author: kkolinko
Date: Wed Oct 13 23:25:47 2010
New Revision: 1022323
URL: http://svn.apache.org/viewvc?rev=1022323&view=rev
Log:
Followup to r1022303
I think that releasing the socket should be done before passing it away to a
poller.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1022323&r1=1022322&r2=1022323&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Oct
13 23:25:47 2010
@@ -395,8 +395,8 @@ public class Http11NioProtocol extends A
} else if (state == SocketState.OPEN){
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
-socket.getPoller().add(socket);
release(socket);
+socket.getPoller().add(socket);
} else {
// Connection closed. OK to recycle the processor.
release(socket);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Recycling processors in Http11NioProtocol
Hi!
Looking at the Http11NioProtocol.Http11ConnectionHandler.release(NioChannel
socket) method in Http11NioProtocol.java, it looks for me that like
that method does in all other places before any call to
"recycledProcessors.offer(result);" there should be
- a call to connections.remove(socket)
- a call to Http11NioProcessor.recycle()
I see two places where those calls are missing. A patch is inline
below, as well as attached to the message. Any comments? I might miss
something.
I cannot call release(socket) in the second case, as it is possible
that connections.remove(socket) call will return null there.
[[[
Index: java/org/apache/coyote/http11/Http11NioProtocol.java
===
--- java/org/apache/coyote/http11/Http11NioProtocol.java(revision
1022323)
+++ java/org/apache/coyote/http11/Http11NioProtocol.java(working copy)
@@ -330,8 +330,7 @@
state = processor.asyncPostProcess();
}
if (state != SocketState.LONG && state !=
SocketState.ASYNC_END) {
-connections.remove(socket);
-recycledProcessors.offer(processor);
+release(socket);
if (state == SocketState.OPEN) {
socket.getPoller().add(socket);
}
@@ -422,6 +421,8 @@
// less-than-verbose logs.
log.error(sm.getString("http11protocol.proto.error"), e);
}
+connections.remove(socket);
+processor.recycle();
recycledProcessors.offer(processor);
return SocketState.CLOSED;
}
]]]
Best regards,
Konstantin Kolinko
Index: java/org/apache/coyote/http11/Http11NioProtocol.java
===
--- java/org/apache/coyote/http11/Http11NioProtocol.java(revision
1022323)
+++ java/org/apache/coyote/http11/Http11NioProtocol.java(working copy)
@@ -330,8 +330,7 @@
state = processor.asyncPostProcess();
}
if (state != SocketState.LONG && state !=
SocketState.ASYNC_END) {
-connections.remove(socket);
-recycledProcessors.offer(processor);
+release(socket);
if (state == SocketState.OPEN) {
socket.getPoller().add(socket);
}
@@ -422,6 +421,8 @@
// less-than-verbose logs.
log.error(sm.getString("http11protocol.proto.error"), e);
}
+connections.remove(socket);
+processor.recycle();
recycledProcessors.offer(processor);
return SocketState.CLOSED;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022328 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Oct 14 00:23:57 2010 New Revision: 1022328 URL: http://svn.apache.org/viewvc?rev=1022328&view=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=1022328&r1=1022327&r2=1022328&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 14 00:23:57 2010 @@ -270,4 +270,10 @@ PATCHES PROPOSED TO BACKPORT: NIO connector can mis-read request line if not sent in a single pacaket https://issues.apache.org/bugzilla/attachment.cgi?id=26173&action=edit +1: markt + +1: kkolinko: if together with r1022323 + -1: + + Additional patch: + http://svn.apache.org/viewvc?rev=1022323&view=rev + +1: kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1022117 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/ApplicationContext.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
On 14 October 2010 00:05, Konstantin Kolinko wrote: > 2010/10/13 : >> Author: markt >> Date: Wed Oct 13 14:41:57 2010 >> New Revision: 1022117 >> >> URL: http://svn.apache.org/viewvc?rev=1022117&view=rev >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49987 >> Thread safety issue with population of servlet context initialisation >> parameters. >> Back-port wasn't completely clean - please review. >> > > +1. Looks OK for me. > > Re: sebb: > 2010/10/13 sebb : >>> - private Map parameters = null; >>> + private Map parameters = >>> + new ConcurrentHashMap(); >> >> This should be final, surely? >> > > There are a lot of non-final fields in ApplicationContext and I think > in related classes as well. I do not think making this specific one as > final is essential. (Anyway, +1 if anybody wants to do that). Given that the fix is for thread-safety, using final is intended to ensure that the field is correctly published following construction. There's little point in using the thread-safe ConcurrentHashMap if the field is not identical in all threads... > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatAtApacheConNA2010" by Je anFredericClere
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatAtApacheConNA2010" page has been changed by JeanFredericClere. http://wiki.apache.org/tomcat/TomcatAtApacheConNA2010?action=diff&rev1=1&rev2=2 -- There is a full day track of sessions on Friday, and two days of Tomcat training classes available on Monday & Tuesday - = BOF / MeetUp - (date to be set) = + = BOF / MeetUp - Thursday 4th = - There will be a Tomcat !MeetUp on (date to be set) night at ~8PM. '''This event is open to anyone who wants to come, even if you are not registered for the conference.''' + There will be a Tomcat !MeetUp on Thursday 4th night at 8PM. '''This event is open to anyone who wants to come, even if you are not registered for the conference.''' (Draft) Plan for the meetup: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatAtApacheConNA2010" by Je anFredericClere
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatAtApacheConNA2010" page has been changed by JeanFredericClere. http://wiki.apache.org/tomcat/TomcatAtApacheConNA2010?action=diff&rev1=2&rev2=3 -- * security * memory leaks on reload * harnessing the power of CATALINA_BASE - * Other? + * [Add the topic you want to present] === Attendees === Please register [[http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA|on the link]] if you plan to attend. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1022385 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: jfclere Date: Thu Oct 14 06:10:39 2010 New Revision: 1022385 URL: http://svn.apache.org/viewvc?rev=1022385&view=rev Log: Add the meetup entry. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1022385&r1=1022384&r2=1022385&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Oct 14 06:10:39 2010 @@ -3,18 +3,18 @@ Apache Tomcat - Welcome! - - - + + + - - + + http://tomcat.apache.org/";> - + @@ -25,28 +25,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> +http://www.apache.org/images/asf-logo.gif"; /> -http://www.google.com/search"; method="get"> - - - +http://www.google.com/search";> + + + - + - + - + Apache Tomcat @@ -178,11 +178,11 @@ - - + + - + @@ -219,14 +219,14 @@ and their stories are listed on the - + - + - + @@ -235,8 +235,8 @@ and their stories are listed on the - - + + 2010-08-11 @@ -262,14 +262,14 @@ content directly in a web application (a - + - + - + @@ -278,8 +278,8 @@ content directly in a web application (a - - + + 2010-07-22 @@ -303,14 +303,14 @@ Apache Tomcat. This release includes bug - + - + - + @@ -319,8 +319,8 @@ Apache Tomcat. This release includes bug - - + + 2010-09-16 @@ -345,14 +345,14 @@ fixes over Apache Tomcat 5.5.30. - + - + - + @@ -361,8 +361,8 @@ fixes over Apache Tomcat 5.5.30. - - + + 2010-05-27 @@ -373,7 +373,7 @@ fixes over Apache Tomcat 5.5.30. http://na.apachecon.com/c/acna2010/";> - + http://na.apachecon.com/c/acna2010/";>ApacheCon North America 2010 will be held 1-5 November 2010, at the Westin Peachtree in Atlanta, Georgia, USA. @@ -387,7 +387,7 @@ The Tomcat Project Management Committee Tomcat community and beyond. The Tomcat track will take place on http://na.apachecon.com/c/acna2010/schedule/2010/11/05";>Friday the 5th and is a whole day track. -Additionally we will have a meetup and/or sessions during the barcamp. +Additionally we have a http://wiki.apache.org/tomcat/TomcatAtApacheConNA2010";>meetup on Thursday the 4th and sessions during the barcamp. @@ -395,14 +395,14 @@ Additionally we will have a meetup and/o - + - + - + @@ -411,8 +411,8 @@ Additionally we will have a meetup and/o - - + + 2010-03-01 @@ -431,7 +431,7 @@ This release includes mainly bug fixes a ChangeLog for 1.2.30 - + Notice Apache Tomcat Connectors version 1.2.29 was withdrawn from the release due to regression with Microsoft IIS connector. @@ -441,14 +441,14 @@ regression with Microsoft IIS connector. - + - + - + @@ -457,8 +457,8 @@ regression with Microsoft IIS connector. - - + + 2010-02-17 @@ -481,14 +481,14 @@ This version is principally a bugfix rel - + - + - + @@ -511,7 +511,7 @@ This version is principally a bugfix rel - + @@ -520,17 +520,17 @@ This version is principally a bugfix rel - + - + Copyright © 1999-2010, The Apache Software Foundation - + "Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1022385&r1=1022384&r2=1022385&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Thu Oct 14 06:10:39 2010 @@ -86,7 +86,7 @@ The Tomcat Project Management Committee Tomcat community and beyond. The Tomcat track will take place on http://na.apachecon.com/c/acna2010/schedule/2010/11/05";>Friday the 5th and is a whole day track. -Additionally we will have a meetup and/or sessions during the barcamp. +Additionally we have a http://wiki.apache.org/tomcat/TomcatAtApacheConNA2010";>meetup on Thursday the 4th and sessions during the barcamp. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1022117 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/ApplicationContext.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
2010/10/14 sebb : > On 14 October 2010 00:05, Konstantin Kolinko wrote: >> Re: sebb: >> 2010/10/13 sebb : - private Map parameters = null; + private Map parameters = + new ConcurrentHashMap(); >>> >>> This should be final, surely? >>> >> >> There are a lot of non-final fields in ApplicationContext and I think >> in related classes as well. I do not think making this specific one as >> final is essential. (Anyway, +1 if anybody wants to do that). > > Given that the fix is for thread-safety, using final is intended to > ensure that the field is correctly published following construction. > There's little point in using the thread-safe ConcurrentHashMap if the > field is not identical in all threads... > The fix replaces creation on first access with creation at start time. There are no races between threads when a servlet context starts. If there were several threads, a sync between them should have been elsewhere (to protect a lot of non-final fields that are being set here). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
