Author: markt
Date: Tue Aug 30 19:52:28 2016
New Revision: 1758452
URL: http://svn.apache.org/viewvc?rev=1758452&view=rev
Log:
Consistently decode URL patterns provided via web.xml using the encoding of the
web.xml file where specifified or UTF-8 where no explicit encoding is
specified.
Added:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java
- copied unchanged from r1758430,
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestHttpServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationFilterConfig.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/realm/TestRealmBase.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TestStandardSessionIntegration.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/TestIoTimeouts.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11OutputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestJspPropertyGroupDescriptorImpl.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGenerationHttp.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 30 19:52:28 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758430
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/Context.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/Context.java Tue Aug 30
19:52:28 2016
@@ -872,10 +872,42 @@ public interface Context extends Contain
* Add a new servlet mapping, replacing any existing mapping for
* the specified pattern.
*
+ * @param pattern URL pattern to be mapped. The pattern will be % decoded
+ * using UTF-8
+ * @param name Name of the corresponding servlet to execute
+ *
+ * @deprecated Will be removed in Tomcat 9. Use
+ * {@link #addServletMappingDecoded(String, String)}
+ */
+ @Deprecated
+ public void addServletMapping(String pattern, String name);
+
+
+ /**
+ * Add a new servlet mapping, replacing any existing mapping for
+ * the specified pattern.
+ *
+ * @param pattern URL pattern to be mapped. The pattern will be %
+ * decoded using UTF-8
+ * @param name Name of the corresponding servlet to execute
+ * @param jspWildcard true if name identifies the JspServlet and pattern
+ * contains a wildcard; false otherwise
+ *
+ * @deprecated Will be removed in Tomcat 9. Use
+ * {@link #addServletMappingDecoded(String, String, boolean)}
+ */
+ @Deprecated
+ public void addServletMapping(String pattern, String name, boolean
jspWildcard);
+
+
+ /**
+ * Add a new servlet mapping, replacing any existing mapping for
+ * the specified pattern.
+ *
* @param pattern URL pattern to be mapped
* @param name Name of the corresponding servlet to execute
*/
- public void addServletMapping(String pattern, String name);
+ public void addServletMappingDecoded(String pattern, String name);
/**
@@ -887,7 +919,7 @@ public interface Context extends Contain
* @param jspWildcard true if name identifies the JspServlet
* and pattern contains a wildcard; false otherwise
*/
- public void addServletMapping(String pattern, String name,
+ public void addServletMappingDecoded(String pattern, String name,
boolean jspWildcard);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
Tue Aug 30 19:52:28 2016
@@ -96,6 +96,7 @@ public class ApplicationFilterRegistrati
}
if (urlPatterns != null) {
+ // % decoded (if necessary) using UTF-8
for (String urlPattern : urlPatterns) {
filterMap.addURLPattern(urlPattern);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
Tue Aug 30 19:52:28 2016
@@ -31,6 +31,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Wrapper;
import org.apache.catalina.util.ParameterMap;
+import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.res.StringManager;
public class ApplicationServletRegistration
@@ -189,7 +190,8 @@ public class ApplicationServletRegistrat
}
for (String urlPattern : urlPatterns) {
- context.addServletMapping(urlPattern, wrapper.getName());
+ context.addServletMappingDecoded(
+ UDecoder.URLDecode(urlPattern, "UTF-8"),
wrapper.getName());
}
return Collections.emptySet();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Aug 30 19:52:28 2016
@@ -2803,7 +2803,7 @@ public class StandardContext extends Con
*/
String[] jspMappings = oldJspServlet.findMappings();
for (int i=0; jspMappings!=null && i<jspMappings.length; i++) {
- addServletMapping(jspMappings[i], child.getName());
+ addServletMappingDecoded(jspMappings[i], child.getName());
}
}
}
@@ -3107,60 +3107,52 @@ public class StandardContext extends Con
}
- /**
- * Add a new servlet mapping, replacing any existing mapping for
- * the specified pattern.
- *
- * @param pattern URL pattern to be mapped
- * @param name Name of the corresponding servlet to execute
- *
- * @exception IllegalArgumentException if the specified servlet name
- * is not known to this Context
- */
@Override
+ @Deprecated
public void addServletMapping(String pattern, String name) {
- addServletMapping(pattern, name, false);
+ addServletMappingDecoded(UDecoder.URLDecode(pattern, "UTF-8"), name);
+ }
+
+
+ @Override
+ @Deprecated
+ public void addServletMapping(String pattern, String name, boolean
jspWildCard) {
+ addServletMappingDecoded(UDecoder.URLDecode(pattern, "UTF-8"), name,
false);
+ }
+
+
+ @Override
+ public void addServletMappingDecoded(String pattern, String name) {
+ addServletMappingDecoded(pattern, name, false);
}
- /**
- * Add a new servlet mapping, replacing any existing mapping for
- * the specified pattern.
- *
- * @param pattern URL pattern to be mapped
- * @param name Name of the corresponding servlet to execute
- * @param jspWildCard true if name identifies the JspServlet
- * and pattern contains a wildcard; false otherwise
- *
- * @exception IllegalArgumentException if the specified servlet name
- * is not known to this Context
- */
@Override
- public void addServletMapping(String pattern, String name,
+ public void addServletMappingDecoded(String pattern, String name,
boolean jspWildCard) {
// Validate the proposed mapping
if (findChild(name) == null)
throw new IllegalArgumentException
(sm.getString("standardContext.servletMap.name", name));
- String decodedPattern = adjustURLPattern(UDecoder.URLDecode(pattern));
- if (!validateURLPattern(decodedPattern))
+ String adjustedPattern = adjustURLPattern(pattern);
+ if (!validateURLPattern(adjustedPattern))
throw new IllegalArgumentException
- (sm.getString("standardContext.servletMap.pattern",
decodedPattern));
+ (sm.getString("standardContext.servletMap.pattern",
adjustedPattern));
// Add this mapping to our registered set
synchronized (servletMappingsLock) {
- String name2 = servletMappings.get(decodedPattern);
+ String name2 = servletMappings.get(adjustedPattern);
if (name2 != null) {
// Don't allow more than one servlet on the same pattern
Wrapper wrapper = (Wrapper) findChild(name2);
- wrapper.removeMapping(decodedPattern);
+ wrapper.removeMapping(adjustedPattern);
}
- servletMappings.put(decodedPattern, name);
+ servletMappings.put(adjustedPattern, name);
}
Wrapper wrapper = (Wrapper) findChild(name);
- wrapper.addMapping(decodedPattern);
+ wrapper.addMapping(adjustedPattern);
- fireContainerEvent("addServletMapping", decodedPattern);
+ fireContainerEvent("addServletMapping", adjustedPattern);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Tue Aug 30 19:52:28 2016
@@ -1373,7 +1373,7 @@ public class ContextConfig implements Li
}
for (Entry<String, String> entry :
webxml.getServletMappings().entrySet()) {
- context.addServletMapping(entry.getKey(), entry.getValue());
+ context.addServletMappingDecoded(entry.getKey(), entry.getValue());
}
SessionConfig sessionConfig = webxml.getSessionConfig();
if (sessionConfig != null) {
@@ -1426,7 +1426,7 @@ public class ContextConfig implements Li
}
if (context.findChild(jspServletName) != null) {
for (String urlPattern : jspPropertyGroup.getUrlPatterns()) {
- context.addServletMapping(urlPattern, jspServletName,
true);
+ context.addServletMappingDecoded(urlPattern,
jspServletName, true);
}
} else {
if(log.isDebugEnabled()) {
@@ -2445,6 +2445,7 @@ public class ContextConfig implements Li
urlPatterns = processAnnotationsStringArray(evp.getValue());
urlPatternsSet = urlPatterns.length > 0;
for (String urlPattern : urlPatterns) {
+ // % decoded (if required) using UTF-8
filterMap.addURLPattern(urlPattern);
}
} else if ("servletNames".equals(name)) {
@@ -2526,6 +2527,7 @@ public class ContextConfig implements Li
if (urlPatternsSet
&& (urlsPatterns == null || urlsPatterns.length == 0))
{
for (String urlPattern : filterMap.getURLPatterns()) {
+ // % decoded (if required) using UTF-8
descMap.addURLPattern(urlPattern);
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java
Tue Aug 30 19:52:28 2016
@@ -572,6 +572,11 @@ public class FailedContext extends Lifec
public void addServletMapping(String pattern, String name,
boolean jspWildcard) { /* NO-OP */ }
@Override
+ public void addServletMappingDecoded(String pattern, String name) { /*
NO-OP */ }
+ @Override
+ public void addServletMappingDecoded(String pattern, String name,
+ boolean jspWildcard) { /* NO-OP */ }
+ @Override
public String findServletMapping(String pattern) { return null; }
@Override
public String[] findServletMappings() { return null; }
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java Tue Aug
30 19:52:28 2016
@@ -865,9 +865,9 @@ public class Tomcat {
servlet.setOverridable(true);
// Servlet mappings
- ctx.addServletMapping("/", "default");
- ctx.addServletMapping("*.jsp", "jsp");
- ctx.addServletMapping("*.jspx", "jsp");
+ ctx.addServletMappingDecoded("/", "default");
+ ctx.addServletMappingDecoded("*.jsp", "jsp");
+ ctx.addServletMappingDecoded("*.jspx", "jsp");
// Sessions
ctx.setSessionTimeout(30);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
Tue Aug 30 19:52:28 2016
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.buf.UDecod
*
* @author Craig R. McClanahan
*/
-public class FilterMap implements Serializable {
+public class FilterMap extends XmlEncodingBase implements Serializable {
// ------------------------------------------------------------- Properties
@@ -127,6 +127,9 @@ public class FilterMap implements Serial
}
public void addURLPattern(String urlPattern) {
+ addURLPatternDecoded(UDecoder.URLDecode(urlPattern, getEncoding()));
+ }
+ public void addURLPatternDecoded(String urlPattern) {
if ("*".equals(urlPattern)) {
this.matchAllUrlPatterns = true;
} else {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
Tue Aug 30 19:52:28 2016
@@ -21,10 +21,13 @@ import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
+import org.apache.tomcat.util.buf.UDecoder;
+
/**
* Representation of a jsp-property-group element in web.xml.
*/
-public class JspPropertyGroup {
+public class JspPropertyGroup extends XmlEncodingBase {
+
private Boolean deferredSyntax = null;
public void setDeferredSyntax(String deferredSyntax) {
this.deferredSyntax = Boolean.valueOf(deferredSyntax);
@@ -75,6 +78,9 @@ public class JspPropertyGroup {
private LinkedHashSet<String> urlPattern = new LinkedHashSet<>();
public void addUrlPattern(String urlPattern) {
+ addUrlPatternDecoded(UDecoder.URLDecode(urlPattern, getEncoding()));
+ }
+ public void addUrlPatternDecoded(String urlPattern) {
this.urlPattern.add(urlPattern);
}
public Set<String> getUrlPatterns() { return this.urlPattern; }
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
Tue Aug 30 19:52:28 2016
@@ -38,6 +38,25 @@ public class SecurityCollection implemen
private static final long serialVersionUID = 1L;
+ private String encoding = null;
+ public void setEncoding(String encoding) {
+ this.encoding = encoding;
+ }
+ /**
+ * Obtain the encoding of the XML source that was used to populated this
+ * object.
+ *
+ * @return The encoding of the associated XML source or <code>UTF-8</code>
+ * if the encoding could not be determined
+ */
+ public String getEncoding() {
+ if (encoding == null || encoding.length() == 0) {
+ return "UTF-8";
+ }
+ return encoding;
+ }
+
+
// ----------------------------------------------------------- Constructors
@@ -209,6 +228,9 @@ public class SecurityCollection implemen
* @param pattern The pattern
*/
public void addPattern(String pattern) {
+ addPatternDecoded(UDecoder.URLDecode(pattern, "UTF-8"));
+ }
+ public void addPatternDecoded(String pattern) {
if (pattern == null)
return;
@@ -220,7 +242,6 @@ public class SecurityCollection implemen
}
results[patterns.length] = decodedPattern;
patterns = results;
-
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
Tue Aug 30 19:52:28 2016
@@ -50,7 +50,7 @@ import org.apache.tomcat.util.res.String
*
* @author Craig R. McClanahan
*/
-public class SecurityConstraint implements Serializable {
+public class SecurityConstraint extends XmlEncodingBase implements
Serializable {
private static final long serialVersionUID = 1L;
@@ -280,6 +280,9 @@ public class SecurityConstraint implemen
if (collection == null)
return;
+
+ collection.setEncoding(getEncoding());
+
SecurityCollection results[] =
new SecurityCollection[collections.length + 1];
for (int i = 0; i < collections.length; i++)
@@ -706,7 +709,7 @@ public class SecurityConstraint implemen
for (String method : methods) {
collection.addOmittedMethod(method);
}
- collection.addPattern(pattern);
+ collection.addPatternDecoded(pattern);
collection.setName("deny-uncovered-http-methods");
SecurityConstraint constraint = new SecurityConstraint();
constraint.setAuthConstraint(true);
@@ -759,7 +762,7 @@ public class SecurityConstraint implemen
for (String method : omittedMethods) {
collection.addMethod(method);
}
- collection.addPattern(pattern);
+ collection.addPatternDecoded(pattern);
collection.setName("deny-uncovered-http-methods");
SecurityConstraint constraint = new SecurityConstraint();
constraint.setAuthConstraint(true);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Tue Aug 30 19:52:28 2016
@@ -16,7 +16,9 @@
*/
package org.apache.tomcat.util.descriptor.web;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
@@ -39,7 +41,9 @@ import javax.servlet.descriptor.TaglibDe
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.descriptor.XmlIdentifiers;
+import org.apache.tomcat.util.digester.DocumentProperties;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -50,7 +54,7 @@ import org.apache.tomcat.util.res.String
* This class checks for invalid duplicates (eg filter/servlet names)
* StandardContext will check validity of values (eg URL formats etc)
*/
-public class WebXml {
+public class WebXml extends XmlEncodingBase implements
DocumentProperties.Encoding {
protected static final String ORDER_OTHERS =
"org.apache.catalina.order.others";
@@ -126,7 +130,6 @@ public class WebXml {
public Set<String> getBeforeOrdering() { return before; }
// Common elements and attributes
-
// Required attribute of web-app element
public String getVersion() {
StringBuilder sb = new StringBuilder(3);
@@ -305,9 +308,14 @@ public class WebXml {
public Map<String,ServletDef> getServlets() { return servlets; }
// servlet-mapping
+ // Note: URLPatterns from web.xml may be URL encoded
+ // (http://svn.apache.org/r285186)
private final Map<String,String> servletMappings = new HashMap<>();
private final Set<String> servletMappingNames = new HashSet<>();
public void addServletMapping(String urlPattern, String servletName) {
+ addServletMappingDecoded(UDecoder.URLDecode(urlPattern,
getEncoding()), servletName);
+ }
+ public void addServletMappingDecoded(String urlPattern, String
servletName) {
String oldServletName = servletMappings.put(urlPattern, servletName);
if (oldServletName != null) {
// Duplicate mapping. As per clarification from the Servlet EG,
@@ -390,6 +398,7 @@ public class WebXml {
// jsp-config/jsp-property-group
private final Set<JspPropertyGroup> jspPropertyGroups = new
LinkedHashSet<>();
public void addJspPropertyGroup(JspPropertyGroup propertyGroup) {
+ propertyGroup.setEncoding(getEncoding());
jspPropertyGroups.add(propertyGroup);
}
public Set<JspPropertyGroup> getJspPropertyGroups() {
@@ -401,6 +410,7 @@ public class WebXml {
// TODO: Should support multiple description elements with language
private final Set<SecurityConstraint> securityConstraints = new
HashSet<>();
public void addSecurityConstraint(SecurityConstraint securityConstraint) {
+ securityConstraint.setEncoding(getEncoding());
securityConstraints.add(securityConstraint);
}
public Set<SecurityConstraint> getSecurityConstraints() {
@@ -640,7 +650,6 @@ public class WebXml {
*/
public String toXml() {
StringBuilder sb = new StringBuilder(2048);
-
// TODO - Various, icon, description etc elements are skipped - mainly
// because they are ignored when web.xml is parsed - see above
@@ -764,7 +773,7 @@ public class WebXml {
sb.append(" <url-pattern>*</url-pattern>\n");
} else {
for (String urlPattern : filterMap.getURLPatterns()) {
- appendElement(sb, INDENT4, "url-pattern", urlPattern);
+ appendElement(sb, INDENT4, "url-pattern",
encodeUrl(urlPattern));
}
}
// dispatcher was added in Servlet 2.4
@@ -855,7 +864,7 @@ public class WebXml {
for (Map.Entry<String, String> entry : servletMappings.entrySet()) {
sb.append(" <servlet-mapping>\n");
appendElement(sb, INDENT4, "servlet-name", entry.getValue());
- appendElement(sb, INDENT4, "url-pattern", entry.getKey());
+ appendElement(sb, INDENT4, "url-pattern",
encodeUrl(entry.getKey()));
sb.append(" </servlet-mapping>\n");
}
sb.append('\n');
@@ -939,7 +948,7 @@ public class WebXml {
for (JspPropertyGroup jpg : jspPropertyGroups) {
sb.append(" <jsp-property-group>\n");
for (String urlPattern : jpg.getUrlPatterns()) {
- appendElement(sb, INDENT6, "url-pattern", urlPattern);
+ appendElement(sb, INDENT6, "url-pattern",
encodeUrl(urlPattern));
}
appendElement(sb, INDENT6, "el-ignored",
jpg.getElIgnored());
appendElement(sb, INDENT6, "page-encoding",
@@ -1034,7 +1043,7 @@ public class WebXml {
appendElement(sb, INDENT6, "description",
collection.getDescription());
for (String urlPattern : collection.findPatterns()) {
- appendElement(sb, INDENT6, "url-pattern", urlPattern);
+ appendElement(sb, INDENT6, "url-pattern",
encodeUrl(urlPattern));
}
for (String method : collection.findMethods()) {
appendElement(sb, INDENT6, "http-method", method);
@@ -1307,6 +1316,17 @@ public class WebXml {
return sb.toString();
}
+
+ private String encodeUrl(String input) {
+ try {
+ return URLEncoder.encode(input, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ // Impossible. UTF-8 is a required character set
+ return null;
+ }
+ }
+
+
private static void appendElement(StringBuilder sb, String indent,
String elementName, String value) {
if (value == null) {
@@ -1621,7 +1641,7 @@ public class WebXml {
// Add fragment mappings
for (Map.Entry<String,String> mapping : servletMappingsToAdd) {
- addServletMapping(mapping.getKey(), mapping.getValue());
+ addServletMappingDecoded(mapping.getKey(), mapping.getValue());
}
for (WebXml fragment : fragments) {
Modified: tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestHttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestHttpServlet.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestHttpServlet.java (original)
+++ tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestHttpServlet.java Tue Aug
30 19:52:28 2016
@@ -44,7 +44,7 @@ public class TestHttpServlet extends Tom
// Map the test Servlet
LargeBodyServlet largeBodyServlet = new LargeBodyServlet();
Tomcat.addServlet(ctx, "largeBodyServlet", largeBodyServlet);
- ctx.addServletMapping("/", "largeBodyServlet");
+ ctx.addServletMappingDecoded("/", "largeBodyServlet");
tomcat.start();
@@ -84,11 +84,11 @@ public class TestHttpServlet extends Tom
Bug57602ServletOuter outer = new Bug57602ServletOuter();
Tomcat.addServlet(ctx, "Bug57602ServletOuter", outer);
- ctx.addServletMapping("/outer", "Bug57602ServletOuter");
+ ctx.addServletMappingDecoded("/outer", "Bug57602ServletOuter");
Bug57602ServletInner inner = new Bug57602ServletInner();
Tomcat.addServlet(ctx, "Bug57602ServletInner", inner);
- ctx.addServletMapping("/inner", "Bug57602ServletInner");
+ ctx.addServletMappingDecoded("/inner", "Bug57602ServletInner");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Tue Aug 30 19:52:28 2016
@@ -275,9 +275,9 @@ public class TestDigestAuthenticator ext
// Add protected servlet
Tomcat.addServlet(ctxt, "TesterServlet", new TesterServlet());
- ctxt.addServletMapping(URI, "TesterServlet");
+ ctxt.addServletMappingDecoded(URI, "TesterServlet");
SecurityCollection collection = new SecurityCollection();
- collection.addPattern(URI);
+ collection.addPatternDecoded(URI);
SecurityConstraint sc = new SecurityConstraint();
sc.addAuthRole(ROLE);
sc.addCollection(collection);
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Tue Aug 30 19:52:28 2016
@@ -700,19 +700,19 @@ public class TestFormAuthenticator exten
"", System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(ctx, "SelectedMethods",
new SelectedMethodsServlet());
- ctx.addServletMapping("/test", "SelectedMethods");
+ ctx.addServletMappingDecoded("/test", "SelectedMethods");
// Login servlet just needs to respond "OK". Client will handle
// creating a valid response. No need for a form.
Tomcat.addServlet(ctx, "Login",
new TesterServlet());
- ctx.addServletMapping("/login", "Login");
+ ctx.addServletMappingDecoded("/login", "Login");
// Configure the security constraints
SecurityConstraint constraint = new SecurityConstraint();
SecurityCollection collection = new SecurityCollection();
collection.setName("Protect PUT");
collection.addMethod("PUT");
- collection.addPattern("/test");
+ collection.addPatternDecoded("/test");
constraint.addCollection(collection);
constraint.addAuthRole("tomcat");
ctx.addConstraint(constraint);
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
Tue Aug 30 19:52:28 2016
@@ -458,10 +458,10 @@ public class TestNonLoginAndBasicAuthent
// Add protected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet1", new
TesterServlet());
- nonloginContext.addServletMapping(URI_PROTECTED, "TesterServlet1");
+ nonloginContext.addServletMappingDecoded(URI_PROTECTED,
"TesterServlet1");
SecurityCollection collection1 = new SecurityCollection();
- collection1.addPattern(URI_PROTECTED);
+ collection1.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc1 = new SecurityConstraint();
sc1.addAuthRole(ROLE);
sc1.addCollection(collection1);
@@ -469,10 +469,10 @@ public class TestNonLoginAndBasicAuthent
// Add unprotected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet2", new
TesterServlet());
- nonloginContext.addServletMapping(URI_PUBLIC, "TesterServlet2");
+ nonloginContext.addServletMappingDecoded(URI_PUBLIC, "TesterServlet2");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
@@ -494,9 +494,9 @@ public class TestNonLoginAndBasicAuthent
// Add protected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet3", new TesterServlet());
- basicContext.addServletMapping(URI_PROTECTED, "TesterServlet3");
+ basicContext.addServletMappingDecoded(URI_PROTECTED, "TesterServlet3");
SecurityCollection collection = new SecurityCollection();
- collection.addPattern(URI_PROTECTED);
+ collection.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc = new SecurityConstraint();
sc.addAuthRole(ROLE);
sc.addCollection(collection);
@@ -504,10 +504,10 @@ public class TestNonLoginAndBasicAuthent
// Add unprotected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet4", new TesterServlet());
- basicContext.addServletMapping(URI_PUBLIC, "TesterServlet4");
+ basicContext.addServletMappingDecoded(URI_PUBLIC, "TesterServlet4");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
Tue Aug 30 19:52:28 2016
@@ -484,10 +484,10 @@ public class TestSSOnonLoginAndBasicAuth
// Add protected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet1",
new TesterServletEncodeUrl());
- nonloginContext.addServletMapping(URI_PROTECTED, "TesterServlet1");
+ nonloginContext.addServletMappingDecoded(URI_PROTECTED,
"TesterServlet1");
SecurityCollection collection1 = new SecurityCollection();
- collection1.addPattern(URI_PROTECTED);
+ collection1.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc1 = new SecurityConstraint();
sc1.addAuthRole(ROLE);
sc1.addCollection(collection1);
@@ -496,10 +496,10 @@ public class TestSSOnonLoginAndBasicAuth
// Add unprotected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet2",
new TesterServletEncodeUrl());
- nonloginContext.addServletMapping(URI_PUBLIC, "TesterServlet2");
+ nonloginContext.addServletMappingDecoded(URI_PUBLIC, "TesterServlet2");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
@@ -523,9 +523,9 @@ public class TestSSOnonLoginAndBasicAuth
// Add protected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet3",
new TesterServletEncodeUrl());
- basicContext.addServletMapping(URI_PROTECTED, "TesterServlet3");
+ basicContext.addServletMappingDecoded(URI_PROTECTED, "TesterServlet3");
SecurityCollection collection = new SecurityCollection();
- collection.addPattern(URI_PROTECTED);
+ collection.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc = new SecurityConstraint();
sc.addAuthRole(ROLE);
sc.addCollection(collection);
@@ -534,9 +534,9 @@ public class TestSSOnonLoginAndBasicAuth
// Add unprotected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet4",
new TesterServletEncodeUrl());
- basicContext.addServletMapping(URI_PUBLIC, "TesterServlet4");
+ basicContext.addServletMappingDecoded(URI_PUBLIC, "TesterServlet4");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
Tue Aug 30 19:52:28 2016
@@ -330,9 +330,9 @@ public class TestSSOnonLoginAndDigestAut
// Add protected servlet
Tomcat.addServlet(ctxt, "TesterServlet1", new TesterServlet());
- ctxt.addServletMapping(URI_PROTECTED, "TesterServlet1");
+ ctxt.addServletMappingDecoded(URI_PROTECTED, "TesterServlet1");
SecurityCollection collection1 = new SecurityCollection();
- collection1.addPattern(URI_PROTECTED);
+ collection1.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc1 = new SecurityConstraint();
sc1.addAuthRole(ROLE);
sc1.addCollection(collection1);
@@ -340,9 +340,9 @@ public class TestSSOnonLoginAndDigestAut
// Add unprotected servlet
Tomcat.addServlet(ctxt, "TesterServlet2", new TesterServlet());
- ctxt.addServletMapping(URI_PUBLIC, "TesterServlet2");
+ ctxt.addServletMappingDecoded(URI_PUBLIC, "TesterServlet2");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
@@ -364,9 +364,9 @@ public class TestSSOnonLoginAndDigestAut
// Add protected servlet
Tomcat.addServlet(ctxt, "TesterServlet3", new TesterServlet());
- ctxt.addServletMapping(URI_PROTECTED, "TesterServlet3");
+ ctxt.addServletMappingDecoded(URI_PROTECTED, "TesterServlet3");
SecurityCollection collection = new SecurityCollection();
- collection.addPattern(URI_PROTECTED);
+ collection.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc = new SecurityConstraint();
sc.addAuthRole(ROLE);
sc.addCollection(collection);
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
Tue Aug 30 19:52:28 2016
@@ -43,7 +43,7 @@ public class TestConnector extends Tomca
Wrapper w =
Tomcat.addServlet(root, "tester", new TesterServlet());
w.setAsyncSupported(true);
- root.addServletMapping("/", "tester");
+ root.addServletMappingDecoded("/", "tester");
Connector connector = tomcat.getConnector();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
Tue Aug 30 19:52:28 2016
@@ -115,7 +115,7 @@ public class TestCoyoteAdapter extends T
Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -136,7 +136,7 @@ public class TestCoyoteAdapter extends T
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -189,7 +189,7 @@ public class TestCoyoteAdapter extends T
Context ctx = tomcat.addContext("/testapp", null);
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
- ctx.addServletMapping("*.txt", "servlet");
+ ctx.addServletMappingDecoded("*.txt", "servlet");
tomcat.start();
@@ -240,7 +240,7 @@ public class TestCoyoteAdapter extends T
PathInfoServlet servlet = new PathInfoServlet();
Tomcat.addServlet(ctx, "servlet", servlet);
- ctx.addServletMapping("/*", "servlet");
+ ctx.addServletMappingDecoded("/*", "servlet");
tomcat.start();
@@ -283,7 +283,7 @@ public class TestCoyoteAdapter extends T
AsyncServlet servlet = new AsyncServlet();
Wrapper w = Tomcat.addServlet(ctx, "async", servlet);
w.setAsyncSupported(true);
- ctx.addServletMapping("/async", "async");
+ ctx.addServletMappingDecoded("/async", "async");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
Tue Aug 30 19:52:28 2016
@@ -108,11 +108,11 @@ public class TestCoyoteOutputStream exte
Wrapper w = Tomcat.addServlet(root, "nbWrite",
new NonBlockingWriteServlet(asyncWriteTarget,
useContainerThreadToSetListener));
w.setAsyncSupported(true);
- root.addServletMapping("/nbWrite", "nbWrite");
+ root.addServletMappingDecoded("/nbWrite", "nbWrite");
Tomcat.addServlet(root, "write",
new BlockingWriteServlet(asyncWriteTarget, syncWriteTarget));
w.setAsyncSupported(true);
- root.addServletMapping("/write", "write");
+ root.addServletMappingDecoded("/write", "write");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
Tue Aug 30 19:52:28 2016
@@ -44,7 +44,7 @@ public class TestInputBuffer extends Tom
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "Echo", new Utf8Echo());
- root.addServletMapping("/test", "Echo");
+ root.addServletMappingDecoded("/test", "Echo");
tomcat.getConnector().setProperty("soTimeout", "300000");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
Tue Aug 30 19:52:28 2016
@@ -58,7 +58,7 @@ public class TestKeepAliveCount extends
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "Simple", new SimpleServlet());
- root.addServletMapping("/test", "Simple");
+ root.addServletMappingDecoded("/test", "Simple");
tomcat.getConnector().setProperty("maxKeepAliveRequests", "5");
tomcat.getConnector().setProperty("soTimeout", "20000");
tomcat.getConnector().setProperty("keepAliveTimeout", "50000");
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Tue Aug 30 19:52:28 2016
@@ -76,7 +76,7 @@ public class TestMaxConnections extends
StandardContext root = (StandardContext) tomcat.addContext("",
SimpleHttpClient.TEMP_DIR);
root.setUnloadDelay(soTimeout);
Tomcat.addServlet(root, "Simple", new SimpleServlet());
- root.addServletMapping("/test", "Simple");
+ root.addServletMappingDecoded("/test", "Simple");
tomcat.getConnector().setProperty("maxKeepAliveRequests", "1");
tomcat.getConnector().setProperty("maxThreads", "10");
tomcat.getConnector().setProperty("soTimeout", "20000");
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
Tue Aug 30 19:52:28 2016
@@ -50,7 +50,7 @@ public class TestOutputBuffer extends To
for (int i = 1; i <= WritingServlet.EXPECTED_CONTENT_LENGTH; i*=10) {
WritingServlet servlet = new WritingServlet(i);
Tomcat.addServlet(root, "servlet" + i, servlet);
- root.addServletMapping("/servlet" + i, "servlet" + i);
+ root.addServletMappingDecoded("/servlet" + i, "servlet" + i);
}
tomcat.start();
@@ -84,7 +84,7 @@ public class TestOutputBuffer extends To
Bug52577Servlet bug52577 = new Bug52577Servlet();
Tomcat.addServlet(root, "bug52577", bug52577);
- root.addServletMapping("/", "bug52577");
+ root.addServletMappingDecoded("/", "bug52577");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
Tue Aug 30 19:52:28 2016
@@ -177,7 +177,7 @@ public class TestRequest extends TomcatB
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
- root.addServletMapping("/test", "Bug37794");
+ root.addServletMappingDecoded("/test", "Bug37794");
if (createFilter) {
FilterDef failedRequestFilter = new FilterDef();
@@ -186,7 +186,7 @@ public class TestRequest extends TomcatB
FailedRequestFilter.class.getName());
FilterMap failedRequestFilterMap = new FilterMap();
failedRequestFilterMap.setFilterName("failedRequestFilter");
- failedRequestFilterMap.addURLPattern("/*");
+ failedRequestFilterMap.addURLPatternDecoded("/*");
root.addFilterDef(failedRequestFilter);
root.addFilterMap(failedRequestFilterMap);
}
@@ -277,7 +277,7 @@ public class TestRequest extends TomcatB
// Add the Servlet
Tomcat.addServlet(ctx, "servlet", new EchoQueryStringServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -325,7 +325,7 @@ public class TestRequest extends TomcatB
ctx.getPipeline().addValve(new BasicAuthenticator());
Tomcat.addServlet(ctx, "servlet", new LoginLogoutServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
TesterMapRealm realm = new TesterMapRealm();
realm.addUser(LoginLogoutServlet.USER, LoginLogoutServlet.PWD);
@@ -372,7 +372,7 @@ public class TestRequest extends TomcatB
Context root = tomcat.addContext("",
System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
- root.addServletMapping("/", "Bug37794");
+ root.addServletMappingDecoded("/", "Bug37794");
tomcat.start();
HttpURLConnection conn = getConnection("http://localhost:"; + getPort()
+ "/");
@@ -386,7 +386,7 @@ public class TestRequest extends TomcatB
Context root = tomcat.addContext("",
System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
- root.addServletMapping("/", "Bug37794");
+ root.addServletMappingDecoded("/", "Bug37794");
tomcat.start();
HttpURLConnection conn = getConnection("http://localhost:"; + getPort()
+ "/");
@@ -479,7 +479,7 @@ public class TestRequest extends TomcatB
System.getProperty("java.io.tmpdir"));
root.setAllowCasualMultipartParsing(true);
Tomcat.addServlet(root, "Bug54984", new Bug54984Servlet());
- root.addServletMapping("/", "Bug54984");
+ root.addServletMappingDecoded("/", "Bug54984");
tomcat.start();
HttpURLConnection conn = getConnection("http://localhost:"; + getPort()
@@ -556,7 +556,7 @@ public class TestRequest extends TomcatB
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "EchoParameters", new
EchoParametersServlet());
- root.addServletMapping("/echo", "EchoParameters");
+ root.addServletMappingDecoded("/echo", "EchoParameters");
tomcat.start();
setPort(tomcat.getConnector().getLocalPort());
@@ -829,7 +829,7 @@ public class TestRequest extends TomcatB
Context ctx = tomcat.addContext(deployPath, null);
Tomcat.addServlet(ctx, "servlet", new Bug56501Servelet());
- ctx.addServletMapping("/*", "servlet");
+ ctx.addServletMappingDecoded("/*", "servlet");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java
Tue Aug 30 19:52:28 2016
@@ -56,7 +56,7 @@ public class TestResponse extends Tomcat
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "servlet", new Bug49598Servlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -112,7 +112,7 @@ public class TestResponse extends Tomcat
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "servlet", new CharsetServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -151,7 +151,7 @@ public class TestResponse extends Tomcat
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "servlet", new Bug52811Servlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Tue Aug 30 19:52:28 2016
@@ -62,7 +62,7 @@ public class TestSendFile extends Tomcat
for (int i=0; i<ITERATIONS; i++) {
WritingServlet servlet = new WritingServlet(files[i]);
Tomcat.addServlet(root, "servlet" + i, servlet);
- root.addServletMapping("/servlet" + i, "servlet" + i);
+ root.addServletMappingDecoded("/servlet" + i, "servlet" + i);
}
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
Tue Aug 30 19:52:28 2016
@@ -189,7 +189,7 @@ public class TestApplicationContext exte
ctx.setCrossContext(true);
Tomcat.addServlet(ctx, "Bug57190Servlet", new Bug57190Servlet());
- ctx.addServletMapping("/", "Bug57190Servlet");
+ ctx.addServletMappingDecoded("/", "Bug57190Servlet");
tomcat.start();
@@ -262,14 +262,14 @@ public class TestApplicationContext exte
Context ctx2 = tomcat.addContext("/second", null);
GetAttributeServlet getAttributeServlet = new GetAttributeServlet();
Tomcat.addServlet(ctx2, "getAttributeServlet", getAttributeServlet);
- ctx2.addServletMapping("/test", "getAttributeServlet");
+ ctx2.addServletMappingDecoded("/test", "getAttributeServlet");
// No file system docBase required
Context ctx1 = tomcat.addContext("/first", null);
ctx1.setCrossContext(true);
SetAttributeServlet setAttributeServlet = new
SetAttributeServlet("/test", "/second");
Tomcat.addServlet(ctx1, "setAttributeServlet", setAttributeServlet);
- ctx1.addServletMapping("/test", "setAttributeServlet");
+ ctx1.addServletMappingDecoded("/test", "setAttributeServlet");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java
Tue Aug 30 19:52:28 2016
@@ -39,6 +39,7 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.util.URLEncoder;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.UDecoder;
@RunWith(value = Parameterized.class)
public class TestApplicationContextGetRequestDispatcher extends TomcatBaseTest
{
@@ -364,12 +365,11 @@ public class TestApplicationContextGetRe
// Add a default servlet to return 404 for not found resources
Tomcat.addServlet(ctx, "Default", new Default404Servlet());
- ctx.addServletMapping("/*", "Default");
+ ctx.addServletMappingDecoded("/*", "Default");
// Add a target servlet to dispatch to
Tomcat.addServlet(ctx, "target", new TargetServlet());
- // Note: This will decode the provided path
- ctx.addServletMapping(targetPath, "target");
+ ctx.addServletMappingDecoded(UDecoder.URLDecode(targetPath, "UTF-8"),
"target");
if (useAsync) {
Wrapper w = Tomcat.addServlet(
@@ -378,8 +378,7 @@ public class TestApplicationContextGetRe
} else {
Tomcat.addServlet(ctx, "rd", new DispatcherServlet(dispatchPath));
}
- // Note: This will decode the provided path
- ctx.addServletMapping(startPath, "rd");
+ ctx.addServletMappingDecoded(UDecoder.URLDecode(startPath, "UTF-8"),
"rd");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationFilterConfig.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationFilterConfig.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationFilterConfig.java
Tue Aug 30 19:52:28 2016
@@ -41,7 +41,7 @@ public class TestApplicationFilterConfig
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "HelloWorld", new HelloWorldServlet());
- ctx.addServletMapping("/", "HelloWorld");
+ ctx.addServletMappingDecoded("/", "HelloWorld");
// Add a filter with a name that should be escaped if used in a JMX
// object name
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
Tue Aug 30 19:52:28 2016
@@ -189,10 +189,10 @@ public class TestApplicationHttpRequest
} else {
Tomcat.addServlet(ctx, "forward", new ForwardServlet("/display?" +
forwardQueryString));
}
- ctx.addServletMapping("/forward", "forward");
+ ctx.addServletMappingDecoded("/forward", "forward");
Tomcat.addServlet(ctx, "display", new
DisplayParameterServlet(expected));
- ctx.addServletMapping("/display", "display");
+ ctx.addServletMappingDecoded("/display", "display");
tomcat.start();
@@ -219,10 +219,10 @@ public class TestApplicationHttpRequest
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "forward", new ForwardServlet("/modify"));
- ctx.addServletMapping("/forward", "forward");
+ ctx.addServletMappingDecoded("/forward", "forward");
Tomcat.addServlet(ctx, "modify", new ModifyParameterServlet());
- ctx.addServletMapping("/modify", "modify");
+ ctx.addServletMappingDecoded("/modify", "modify");
tomcat.start();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java?rev=1758452&r1=1758451&r2=1758452&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
Tue Aug 30 19:52:28 2016
@@ -111,7 +111,7 @@ public class TestApplicationMapping exte
Context ctx = tomcat.addContext(contextPath, null);
Tomcat.addServlet(ctx, "Mapping", new MappingServlet());
- ctx.addServletMapping(mapping, "Mapping");
+ ctx.addServletMappingDecoded(mapping, "Mapping");
tomcat.start();
@@ -132,9 +132,9 @@ public class TestApplicationMapping exte
Context ctx = tomcat.addContext(contextPath, null);
Tomcat.addServlet(ctx, "Include", new IncludeServlet());
- ctx.addServletMapping(mapping, "Include");
+ ctx.addServletMappingDecoded(mapping, "Include");
Tomcat.addServlet(ctx, "Mapping", new MappingServlet());
- ctx.addServletMapping("/mapping", "Mapping");
+ ctx.addServletMappingDecoded("/mapping", "Mapping");
tomcat.start();
@@ -160,9 +160,9 @@ public class TestApplicationMapping exte
Context ctx = tomcat.addContext(contextPath, null);
Tomcat.addServlet(ctx, "Include", new NamedIncludeServlet());
- ctx.addServletMapping(mapping, "Include");
+ ctx.addServletMappingDecoded(mapping, "Include");
Tomcat.addServlet(ctx, "Mapping", new MappingServlet());
- ctx.addServletMapping("/mapping", "Mapping");
+ ctx.addServletMappingDecoded("/mapping", "Mapping");
tomcat.start();
@@ -183,9 +183,9 @@ public class TestApplicationMapping exte
Context ctx = tomcat.addContext(contextPath, null);
Tomcat.addServlet(ctx, "Forward", new ForwardServlet());
- ctx.addServletMapping(mapping, "Forward");
+ ctx.addServletMappingDecoded(mapping, "Forward");
Tomcat.addServlet(ctx, "Mapping", new MappingServlet());
- ctx.addServletMapping("/mapping", "Mapping");
+ ctx.addServletMappingDecoded("/mapping", "Mapping");
tomcat.start();
@@ -211,9 +211,9 @@ public class TestApplicationMapping exte
Context ctx = tomcat.addContext(contextPath, null);
Tomcat.addServlet(ctx, "Forward", new NamedForwardServlet());
- ctx.addServletMapping(mapping, "Forward");
+ ctx.addServletMappingDecoded(mapping, "Forward");
Tomcat.addServlet(ctx, "Mapping", new MappingServlet());
- ctx.addServletMapping("/mapping", "Mapping");
+ ctx.addServletMappingDecoded("/mapping", "Mapping");
tomcat.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
