You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/06/13 09:55:34 UTC
svn commit: r1685217 - in /felix/trunk/http:
base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java
itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java
Author: cziegeler
Date: Sat Jun 13 07:55:34 2015
New Revision: 1685217
URL: http://svn.apache.org/r1685217
Log:
FELIX-4925 : Request path is not decoded
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java?rev=1685217&r1=1685216&r2=1685217&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java Sat Jun 13 07:55:34 2015
@@ -589,12 +589,6 @@ public final class Dispatcher implements
{
path = path.concat(req.getPathInfo());
}
- // Workaround to get path parameters (FELIX-4925)
- // This fails if the path part contains encoded characters!
- if ( req.getRequestURI().contains(";") )
- {
- path = UriUtils.relativePath(req.getContextPath(), req.getRequestURI());
- }
final String requestURI = path;
// Determine which servlet we should forward the request to...
Modified: felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java?rev=1685217&r1=1685216&r2=1685217&view=diff
==============================================================================
--- felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java (original)
+++ felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java Sat Jun 13 07:55:34 2015
@@ -329,45 +329,6 @@ public class HttpJettyTest extends BaseI
}
/**
- * Tests the handling of URI path parameters.
- */
- @Test
- public void testHandleUriPathParametersOk() throws Exception
- {
- CountDownLatch initLatch = new CountDownLatch(1);
- CountDownLatch destroyLatch = new CountDownLatch(1);
-
- TestServlet servlet = new TestServlet(initLatch, destroyLatch)
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
- {
- assertEquals("", request.getContextPath());
- assertEquals("/foo", request.getServletPath());
- assertEquals("/a;b/c;d/e;f;g/h", request.getPathInfo());
- assertEquals("/foo/a;b/c;d/e;f;g/h", request.getRequestURI());
- assertEquals("i=j+k&l=m", request.getQueryString());
- }
- };
-
- register("/foo", servlet);
-
- URL testURL = createURL("/foo/a;b/c;d/e;f;g/h?i=j+k&l=m");
-
- assertTrue(initLatch.await(5, TimeUnit.SECONDS));
-
- assertResponseCode(SC_OK, testURL);
-
- unregister(servlet);
-
- assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
-
- assertResponseCode(SC_NOT_FOUND, testURL);
- }
-
- /**
* Tests that we can register a filter with Jetty and that its lifecycle is correctly controlled.
*/
@Test