Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java Tue Aug 30 16:41:12 2016 @@ -45,7 +45,7 @@ public class TestWebSocketFrameClient ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterFirehoseServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); @@ -87,11 +87,11 @@ public class TestWebSocketFrameClient ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); Context ctx2 = tomcat.addContext("/foo", null); ctx2.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx2, "default", new DefaultServlet()); - ctx2.addServletMapping("/", "default"); + ctx2.addServletMappingDecoded("/", "default"); tomcat.start();
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java Tue Aug 30 16:41:12 2016 @@ -47,7 +47,7 @@ public class TestWebSocketFrameClientSSL Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterFirehoseServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); TesterSupport.initSsl(tomcat); @@ -94,7 +94,7 @@ public class TestWebSocketFrameClientSSL Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterFirehoseServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); TesterSupport.initSsl(tomcat); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java Tue Aug 30 16:41:12 2016 @@ -50,7 +50,7 @@ public class TestWsPingPongMessages exte ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java Tue Aug 30 16:41:12 2016 @@ -95,7 +95,7 @@ public class TestWsRemoteEndpoint extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -208,7 +208,7 @@ public class TestWsRemoteEndpoint extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java Tue Aug 30 16:41:12 2016 @@ -49,7 +49,7 @@ public class TestWsSubprotocols extends ctx.addApplicationListener(Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Tue Aug 30 16:41:12 2016 @@ -88,7 +88,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); @@ -210,7 +210,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -318,7 +318,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(BlockingConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -407,7 +407,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ConstantTxConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -622,7 +622,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); @@ -679,7 +679,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); @@ -737,7 +737,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); @@ -823,7 +823,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); TesterSupport.initSsl(tomcat); @@ -906,7 +906,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); @@ -990,7 +990,7 @@ public class TestWsWebSocketContainer ex Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Tue Aug 30 16:41:12 2016 @@ -77,7 +77,7 @@ public class TestEncodingDecoding extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ProgramaticServerEndpointConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -126,7 +126,7 @@ public class TestEncodingDecoding extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -186,7 +186,7 @@ public class TestEncodingDecoding extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -235,7 +235,7 @@ public class TestEncodingDecoding extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -283,7 +283,7 @@ public class TestEncodingDecoding extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -764,7 +764,7 @@ public class TestEncodingDecoding extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ProgramaticServerEndpointConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java Tue Aug 30 16:41:12 2016 @@ -56,7 +56,7 @@ public class TestPojoEndpointBase extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); @@ -87,7 +87,7 @@ public class TestPojoEndpointBase extend Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java Tue Aug 30 16:41:12 2016 @@ -59,7 +59,7 @@ public class TestPojoMethodMapping exten Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java Tue Aug 30 16:41:12 2016 @@ -57,7 +57,7 @@ public class TestClassLoader extends Web ctx.addApplicationListener(Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java Tue Aug 30 16:41:12 2016 @@ -341,7 +341,7 @@ public class TestClose extends WebSocket Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(configClass.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); return tomcat; Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java Tue Aug 30 16:41:12 2016 @@ -50,7 +50,7 @@ public class TestCloseBug58624 extends W Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(Bug58624ServerConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java Tue Aug 30 16:41:12 2016 @@ -54,7 +54,7 @@ public class TestShutdown extends WebSoc Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(EchoBufferedConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java Tue Aug 30 16:41:12 2016 @@ -73,7 +73,7 @@ public class TestWsRemoteEndpointImplSer Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(Bug58624Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Tue Aug 30 16:41:12 2016 @@ -49,7 +49,7 @@ public class TestWsServerContainer exten Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(Bug54807Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.start(); @@ -64,7 +64,7 @@ public class TestWsServerContainer exten Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(Bug54807Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1758423&r1=1758422&r2=1758423&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 30 16:41:12 2016 @@ -174,6 +174,11 @@ <fix> Fix a file descriptor leak when reading the global web.xml. (markt) </fix> + <fix> + 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. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
