Author: markt Date: Wed Feb 19 17:26:36 2014 New Revision: 1569834 URL: http://svn.apache.org/r1569834 Log: Update tests to check correct handling elements added between 3.0 and 3.1 Add missing deny-uncovered-http-methods element from merged web.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1569834&r1=1569833&r2=1569834&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Wed Feb 19 17:26:36 2014 @@ -1284,6 +1284,15 @@ public class WebXml { } } + // deny-uncovered-http-methods was introduced in Servlet 3.1 + if (getMajorVersion() > 3 || + (getMajorVersion() == 3 && getMinorVersion() > 0)) { + if (denyUncoveredHttpMethods) { + sb.append("\n"); + sb.append(" <deny-uncovered-http-methods/>"); + } + } + sb.append("</web-app>"); return sb.toString(); } Modified: tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java?rev=1569834&r1=1569833&r2=1569834&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java Wed Feb 19 17:26:36 2014 @@ -338,6 +338,9 @@ public class TestWebXml { MultipartDef multiPart = new MultipartDef(); servletDef.setMultipartDef(multiPart); + // deny-uncovered-http-methods added in Servlet 3.1 + webXmlDefaultFragment.setDenyUncoveredHttpMethods(true); + return webXmlDefaultFragment; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org