When generating a redirect to a directory in the Default Servlet, avoid generating a protocol relative redirect.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk@1840056 13f79535-47bb-0310-9956-ffa450edef68

Author: markt-asf

java/org/apache/catalina/servlets/DefaultServlet.java

@@ -1154,6 +1154,10 @@ private void doDirectoryRedirect(HttpServletRequest request, HttpServletResponse
             location.append('?');
             location.append(request.getQueryString());
         }
+        // Avoid protocol relative redirects
+        while (location.length() > 1 && location.charAt(1) == '/') {
+            location.deleteCharAt(0);
+        }
         response.sendRedirect(response.encodeRedirectURL(location.toString()));
     }
 

webapps/docs/changelog.xml

@@ -76,6 +76,10 @@
       <fix>
         <bug>62667</bug>: Add recursion to rewrite substitution parsing. (remm)
       </fix>
+      <fix>
+        When generating a redirect to a directory in the Default Servlet, avoid
+        generating a protocol relative redirect. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">