Remove out of date comments

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1848321 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 6, 2018 · 3b86f09 · 3b86f09
1 parent c935bd5
commit 3b86f09
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -621,8 +621,6 @@ public void invoke(Request request, Response response) throws IOException, Servl
                 request.setRemoteAddr(remoteIp);
                 request.setRemoteHost(remoteIp);
 
-                // use request.coyoteRequest.mimeHeaders.setValue(str).setString(str) because request.addHeader(str, str) is no-op in Tomcat
-                // 6.0
                 if (proxiesHeaderValue.size() == 0) {
                     request.getCoyoteRequest().getMimeHeaders().removeHeader(proxiesHeader);
                 } else {
@@ -644,15 +642,11 @@ public void invoke(Request request, Response response) throws IOException, Servl
                     // of the request
                 } else if (isForwardedProtoHeaderValueSecure(protocolHeaderValue)) {
                     request.setSecure(true);
-                    // use request.coyoteRequest.scheme instead of request.setScheme() because request.setScheme() is no-op in Tomcat 6.0
                     request.getCoyoteRequest().scheme().setString("https");
-
                     setPorts(request, httpsServerPort);
                 } else {
                     request.setSecure(false);
-                    // use request.coyoteRequest.scheme instead of request.setScheme() because request.setScheme() is no-op in Tomcat 6.0
                     request.getCoyoteRequest().scheme().setString("http");
-
                     setPorts(request, httpServerPort);
                 }
             }
@@ -686,15 +680,11 @@ public void invoke(Request request, Response response) throws IOException, Servl
         } finally {
             request.setRemoteAddr(originalRemoteAddr);
             request.setRemoteHost(originalRemoteHost);
-
             request.setSecure(originalSecure);
-
-            MimeHeaders headers = request.getCoyoteRequest().getMimeHeaders();
-            // use request.coyoteRequest.scheme instead of request.setScheme() because request.setScheme() is no-op in Tomcat 6.0
             request.getCoyoteRequest().scheme().setString(originalScheme);
-
             request.setServerPort(originalServerPort);
 
+            MimeHeaders headers = request.getCoyoteRequest().getMimeHeaders();
             if (originalProxiesHeader == null || originalProxiesHeader.length() == 0) {
                 headers.removeHeader(proxiesHeader);
             } else {