svn commit: r1835271 - /tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java

[ma...@apache.org]

Author: markt
Date: Fri Jul  6 17:20:05 2018
New Revision: 1835271

URL: http://svn.apache.org/viewvc?rev=1835271&view=rev
Log:
Fix cache interoperability problem.
Note: Always adding this header reduces the usefulness of caches significantly. Next task is to look at possible optimisations.

Modified:
    tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1835271&r1=1835270&r2=1835271&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Fri Jul  6 17:20:05 2018
@@ -148,6 +148,10 @@ public class CorsFilter extends GenericF
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         HttpServletResponse response = (HttpServletResponse) servletResponse;
 
+        // For any request that passes through this filter, the response (and the
+        // associated headers) will depend on the origin.
+        ResponseUtil.addVaryFieldName(response, CorsFilter.REQUEST_HEADER_ORIGIN);
+
         // Determines the CORS request type.
         CorsFilter.CORSRequestType requestType = checkRequestType(request);
 
@@ -290,9 +294,6 @@ public class CorsFilter extends GenericF
                     exposedHeadersString);
         }
 
-        // Indicate the response depends on the origin
-        ResponseUtil.addVaryFieldName(response, CorsFilter.REQUEST_HEADER_ORIGIN);
-
         // Forward the request down the filter chain.
         filterChain.doFilter(request, response);
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org