You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/03/25 14:48:19 UTC
wicket git commit: WICKET-6111 Empty redirect on redirect to home
page if home page already shown
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 3cbe984f7 -> f55265093
WICKET-6111 Empty redirect on redirect to home page if home page already shown
Remove the workaround for the incorrect behavior in old Tomcat versions.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f5526509
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f5526509
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f5526509
Branch: refs/heads/wicket-7.x
Commit: f5526509340234e730c5e252da7c7d3cdee91294
Parents: 3cbe984
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 25 14:47:16 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 25 14:47:16 2016 +0100
----------------------------------------------------------------------
.../wicket/protocol/http/servlet/ServletWebResponse.java | 8 --------
.../wicket/protocol/http/servlet/ServletWebResponseTest.java | 4 ++--
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f5526509/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
index 304480d..a1e5c8c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
@@ -285,14 +285,6 @@ public class ServletWebResponse extends WebResponse
}
else
{
- if (url.startsWith("./"))
- {
- /*
- * WICKET-4260 Tomcat does not canonalize urls, which leads to problems with IE
- * when url is relative and starts with a dot
- */
- url = url.substring(2);
- }
httpServletResponse.sendRedirect(url);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f5526509/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
index e9fd4fa..0af28f9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
@@ -115,7 +115,7 @@ public class ServletWebResponseTest extends Assert
ServletWebResponse webResponse = new ServletWebResponse(webRequest, httpServletResponse);
webResponse.sendRedirect(url);
- verify(httpServletResponse).sendRedirect("relative/path");
+ verify(httpServletResponse).sendRedirect("./relative/path");
assertTrue(webResponse.isRedirect());
}
@@ -214,4 +214,4 @@ public class ServletWebResponseTest extends Assert
ServletWebResponse webResponse = new ServletWebResponse(webRequest, httpServletResponse);
assertEquals(url + ";foo", webResponse.encodeRedirectURL(url));
}
-}
\ No newline at end of file
+}