From fcd9b4773e13d7ffe5b0871525775e38759da0cc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Tue, 9 Oct 2012 19:05:47 +0300
Subject: [PATCH] Redirect if no ending slash in context root request (#9921)

Change-Id: Ief3f2c339a962230607df2e3e17dea93fcfb4f2e
---
 .../src/com/vaadin/server/VaadinServlet.java  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 7673c2d2f7..13ea68f252 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -206,11 +206,36 @@ public class VaadinServlet extends HttpServlet implements Constants {
     @Override
     protected void service(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
+        /*
+         * Some servlet containers cause problems with requests to the context
+         * root without any ending slash - ensure we avoid such problems by
+         * redirecting to an ending slash in these cases. See #9921
+         */
+        if (handleContextRootWithoutSlash(request, response)) {
+            return;
+        }
         CurrentInstance.clearAll();
         setCurrent(this);
         service(createVaadinRequest(request), createVaadinResponse(response));
     }
 
+    private boolean handleContextRootWithoutSlash(HttpServletRequest request,
+            HttpServletResponse response) {
+        if ("/".equals(request.getPathInfo())
+                && "".equals(request.getServletPath())
+                && !request.getRequestURI().endsWith("/")) {
+            /*
+             * Path info is for the root but request URI doesn't end with a
+             * slash -> redirect to the same URI but with an ending slash.
+             */
+            response.setStatus(HttpServletResponse.SC_FOUND);
+            response.setHeader("Location", request.getRequestURI() + "/");
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     private void service(VaadinServletRequest request,
             VaadinServletResponse response) throws ServletException,
             IOException {
-- 
2.39.5