1 files changed, 2 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index e7799dac67..cd6e4cd7cd 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -403,6 +403,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
             location = location + "/" + lastPathParameter;
             String queryString = request.getQueryString();
             if (queryString != null) {
+                // Prevent HTTP Response splitting in case the server doesn't
+                queryString = queryString.replaceAll("[\\r\\n]", "");
                 location += '?' + queryString;
             }
             response.sendRedirect(location);