You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/10/15 18:11:41 UTC
[tomcat] branch 8.5.x updated (ac33061 -> b85b00d)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from ac33061 Add a test for connectionUploadTimeout/disableUploadTimeout
new 3afb422 Fix formatting
new b85b00d Weak eTag should be weak
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
.../org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Weak eTag should be weak
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b85b00d461e4dab8655df3c2466aebb1369ed9f7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 15 17:29:15 2020 +0100
Weak eTag should be weak
---
.../org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
index b514882..0e6665e 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
@@ -58,7 +58,7 @@ public class TestDefaultServletIfMatchRequests extends TomcatBaseTest {
resourceETagWeak = "W/" + resourceETagStrong;
String otherETagStrong = "\"123456789\"";
- String otherETagWeak = "\"123456789\"";
+ String otherETagWeak = "W/\"123456789\"";
List<Object[]> parameterSets = new ArrayList<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Fix formatting
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3afb422f70a8b37724efc6aa864b6387c9d5e673
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 15 16:10:40 2020 +0100
Fix formatting
---
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index 5562bb6..bd72e21 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1499,7 +1499,7 @@ public class DefaultServlet extends HttpServlet {
// If the timestamp of the entity the client got differs from
// the last modification date of the entity, the entire entity
// is returned.
- if (Math.abs(lastModified -headerValueTime) > 1000) {
+ if (Math.abs(lastModified - headerValueTime) > 1000) {
return FULL;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org