Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java Tue Aug 30 20:08:50 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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java Tue Aug 30 20:08:50 2016 @@ -49,7 +49,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); @@ -103,7 +103,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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java Tue Aug 30 20:08:50 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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java Tue Aug 30 20:08:50 2016 @@ -85,7 +85,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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java Tue Aug 30 20:08:50 2016 @@ -53,7 +53,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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Tue Aug 30 20:08:50 2016 @@ -90,7 +90,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(); @@ -212,7 +212,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(); @@ -320,7 +320,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(); @@ -414,7 +414,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(); @@ -634,7 +634,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(); @@ -691,7 +691,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(); @@ -749,7 +749,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(); @@ -835,7 +835,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); @@ -918,7 +918,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(); @@ -1002,7 +1002,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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java Tue Aug 30 20:08:50 2016 @@ -47,7 +47,7 @@ public class TesterConnectionLimit exten Context ctx = tomcat.addContext("", null); ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); - ctx.addServletMapping("/", "default"); + ctx.addServletMappingDecoded("/", "default"); tomcat.getConnector().setAttribute("maxConnections", "-1"); Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Tue Aug 30 20:08:50 2016 @@ -72,7 +72,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(); @@ -121,7 +121,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(); @@ -180,7 +180,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(); @@ -605,7 +605,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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java Tue Aug 30 20:08:50 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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java Tue Aug 30 20:08:50 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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java Tue Aug 30 20:08:50 2016 @@ -338,7 +338,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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java Tue Aug 30 20:08:50 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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java Tue Aug 30 20:08:50 2016 @@ -76,7 +76,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/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Tue Aug 30 20:08:50 2016 @@ -52,7 +52,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(); @@ -67,7 +67,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/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1758456&r1=1758455&r2=1758456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Aug 30 20:08:50 2016 @@ -191,6 +191,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 specified 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
