stokito commented on a change in pull request #325:
URL: https://github.com/apache/tomcat/pull/325#discussion_r463563011
##########
File path: java/org/apache/catalina/servlets/DefaultServlet.java
##########
@@ -2611,6 +2574,44 @@ private PrecompressedResource(WebResource resource,
CompressionFormat format) {
}
}
+ /**
+ * RFC 7232 requires weak comparison for If-None-Match
+ */
+ private boolean matchByEtagWeak(String headerValue, String eTag) {
+ // Match W/"1" and W/"1"
+ if (headerValue.contains(eTag)) {
+ return true;
+ }
+ // Match W/"1" and "1"
+ String resourceEtag = weakEtagToStrong(eTag);
+ if (headerValue.contains(resourceEtag)) {
+ return true;
+ }
+ // asterisk checked last as rarely used
+ return headerValue.equals("*");
+ }
+
+ /**
+ * RFC 7232 requires strong comparison for If-Match
+ */
+ private boolean matchByEtagStrong(String headerValue, String eTag) {
+ // BZ 64265: Default servlet uses weak matching so we strip any
leading "W/" and
+ // then compare using equals
+ String resourceEtag = weakEtagToStrong(eTag);
Review comment:
the tomcat's own Weak etags will be converted to strong i.e. the W/ is
remored inside weakEtagToStrong(). So it's fine.
You can run a test that checks it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
