This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0c85025414 It is not required to send Accept-Ranges before accepting
Range
0c85025414 is described below
commit 0c85025414c2a3bc813847c1a7fcff7728df3050
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Dec 3 14:09:05 2024 +0000
It is not required to send Accept-Ranges before accepting Range
---
.../apache/catalina/servlets/DefaultServlet.java | 4 ---
.../catalina/servlets/TestDefaultServletRfc14.java | 33 ----------------------
2 files changed, 37 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index ef7c257daf..25c8426ba3 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1444,10 +1444,6 @@ public class DefaultServlet extends HttpServlet {
protected Ranges parseRange(HttpServletRequest request,
HttpServletResponse response, WebResource resource)
throws IOException {
- if (useAcceptRanges == false) {
- // Not supported feature, ignore
- return FULL;
- }
if (!"GET".equals(request.getMethod())) {
// RFC 9110 - Section 14.2: GET is the only method for which range
handling is defined.
// Otherwise MUST ignore a Range header field
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletRfc14.java
b/test/org/apache/catalina/servlets/TestDefaultServletRfc14.java
index f38e0bf26d..e9c02d46fa 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletRfc14.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletRfc14.java
@@ -33,39 +33,6 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestDefaultServletRfc14 extends TomcatBaseTest {
- @Test
- public void test_14_optional() throws Exception {
-
- Tomcat tomcat = getTomcatInstance();
-
- File appDir = new File("test/webapp");
- Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
-
- Wrapper w = Tomcat.addServlet(ctxt, "default",
DefaultServlet.class.getName());
- w.addInitParameter("useAcceptRanges", "false");
- ctxt.addServletMappingDecoded("/", "default");
-
- tomcat.start();
-
- String path = "http://localhost:"; + getPort() + "/index.html";
- ByteChunk responseBody = new ByteChunk();
- Map<String,List<String>> responseHeaders = new HashMap<>();
- Map<String,List<String>> requestHeaders = new HashMap<>();
-
- String rangeHeader = "bytes=0-10";
- // Get and Head
-
- requestHeaders.computeIfAbsent("Range", (k) -> List.of(rangeHeader));
- int rc = getUrl(path, responseBody, requestHeaders, responseHeaders);
- Assert.assertEquals(
- "RFC 9110 - 14: Range requests is turn of, SC_OK of GET is
expected",
- HttpServletResponse.SC_OK, rc);
- Assert.assertFalse(
- "RFC 9110 - 14: Range requests is turn of, absence of header
`Accept-Ranges: bytes` is expected",
- responseHeaders.containsKey("Accept-Ranges") &&
responseHeaders.get("Accept-Ranges").contains("bytes"));
-
- tomcat.stop();
- }
@Test
public void test_14_2_range_handling_defined_methods() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
