Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/jetty-12.1.x/13685-zeroLengthFiles

# Conflicts:
#	jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/FileMappingHttpContentFactory.java

Author: gregw

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/FileMappingHttpContentFactory.java

@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
-import java.time.Instant;
 import java.util.Objects;
 
 import org.eclipse.jetty.http.HttpField;
@@ -94,8 +93,6 @@ private static class SingleBufferFileMappedHttpContent extends HttpContent.Wrapp
     {
         private final ByteBuffer _buffer;
         private final HttpField _contentLength;
-        private final HttpField _lastModified;
-        private final Instant _lastModifiedInstant;
 
         private SingleBufferFileMappedHttpContent(HttpContent content) throws IOException
         {
@@ -107,8 +104,6 @@ private SingleBufferFileMappedHttpContent(HttpContent content) throws IOExceptio
             if (_buffer == null)
                 throw new IOException("Cannot memory map Content (not supported by underlying FileSystem): " + content.getResource());
             _contentLength = new HttpField(HttpHeader.CONTENT_LENGTH, Integer.toString(_buffer.remaining()));
-            _lastModified = content.getLastModified();
-            _lastModifiedInstant = content.getLastModifiedInstant();
         }
 
         @Override
@@ -136,18 +131,6 @@ public long getContentLengthValue()
         {
             return _buffer.remaining();
         }
-
-        @Override
-        public Instant getLastModifiedInstant()
-        {
-            return _lastModifiedInstant;
-        }
-
-        @Override
-        public HttpField getLastModified()
-        {
-            return _lastModified;
-        }
     }
 
     private static class MultiBufferFileMappedHttpContent extends HttpContent.Wrapper
@@ -156,8 +139,6 @@ private static class MultiBufferFileMappedHttpContent extends HttpContent.Wrappe
         private final int maxBufferSize;
         private final HttpField _contentLength;
         private final long _contentLengthValue;
-        private final HttpField _lastModified;
-        private final Instant _lastModifiedInstant;
 
         private MultiBufferFileMappedHttpContent(HttpContent content, int maxBufferSize) throws IOException
         {
@@ -189,8 +170,6 @@ private MultiBufferFileMappedHttpContent(HttpContent content, int maxBufferSize)
             }
             _contentLengthValue = total;
             _contentLength = new HttpField(HttpHeader.CONTENT_LENGTH, Long.toString(total));
-            _lastModified = content.getLastModified();
-            _lastModifiedInstant = content.getLastModifiedInstant();
         }
 
         @Override
@@ -259,17 +238,5 @@ public long getContentLengthValue()
         {
             return _contentLengthValue;
         }
-
-        @Override
-        public Instant getLastModifiedInstant()
-        {
-            return _lastModifiedInstant;
-        }
-
-        @Override
-        public HttpField getLastModified()
-        {
-            return _lastModified;
-        }
     }
 }

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/HttpContent.java

@@ -90,6 +90,7 @@ public interface HttpContent
 
     /**
      * Get the last modified instant of this resource.
+     * Always return the most up-to-date value.
      *
      * @return the last modified instant, or null if that instant of this content is not known.
      * @see #getLastModified()

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/ValidatingCachingHttpContentFactory.java

@@ -38,6 +38,10 @@
  * a positive value indicates the number of milliseconds of the minimum time between validation checks.
  * </p>
  * <p>
+ * When the wrapped {@link HttpContent}'s {@link HttpContent#getLastModifiedInstant() last modification time} did not change,
+ * it is considered that the resource did not change too and is therefore not refreshed.
+ * </p>
+ * <p>
  * This also remember a missed entry for the time set by {@code validationTime}ms. After this has
  * elapsed the entry will be invalid and will be evicted from the cache at the next access.
  * </p>

jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/content/FileMappingHttpContentFactoryTest.java

@@ -20,6 +20,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
 
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.io.ByteBufferPool;
@@ -37,13 +39,47 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @ExtendWith(WorkDirExtension.class)
 public class FileMappingHttpContentFactoryTest
 {
     public WorkDir workDir;
 
+    @Test
+    public void testSingleBufferFileMappedLastModified() throws Exception
+    {
+        Path file = Files.writeString(workDir.getEmptyPathDir().resolve("file.txt"), "0123456789abcdefghijABCDEFGHIJ");
+        FileMappingHttpContentFactory fileMappingHttpContentFactory = new FileMappingHttpContentFactory(
+            new ResourceHttpContentFactory(ResourceFactory.root().newResource(file.getParent()), MimeTypes.DEFAULTS, ByteBufferPool.SIZED_NON_POOLING));
+
+        HttpContent content = fileMappingHttpContentFactory.getContent("file.txt");
+        Instant originalLastModifiedInstant = content.getLastModifiedInstant();
+
+        // Set the file's last modified time to 10s into the future.
+        Files.setLastModifiedTime(file, FileTime.from(Instant.now().plusSeconds(10)));
+
+        assertThat(originalLastModifiedInstant, lessThan(content.getLastModifiedInstant()));
+    }
+
+    @Test
+    public void testMultiBufferFileMappedLastModified() throws Exception
+    {
+        Path file = Files.writeString(workDir.getEmptyPathDir().resolve("file.txt"), "0123456789abcdefghijABCDEFGHIJ");
+        FileMappingHttpContentFactory fileMappingHttpContentFactory = new FileMappingHttpContentFactory(
+            new ResourceHttpContentFactory(ResourceFactory.root().newResource(file.getParent()), MimeTypes.DEFAULTS, ByteBufferPool.SIZED_NON_POOLING),
+            0, 10);
+
+        HttpContent content = fileMappingHttpContentFactory.getContent("file.txt");
+        Instant originalLastModifiedInstant = content.getLastModifiedInstant();
+
+        // Set the file's last modified time to 10s into the future.
+        Files.setLastModifiedTime(file, FileTime.from(Instant.now().plusSeconds(10)));
+
+        assertThat(originalLastModifiedInstant, lessThan(content.getLastModifiedInstant()));
+    }
+
     @Test
     public void testMultiBufferFileMappedOffsetAndLength() throws Exception
     {

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/internal/ContentSourceRange.java

@@ -115,16 +115,15 @@ public Content.Chunk read()
                 {
                     // Advance position to the correct offset.
                     RetainableByteBuffer slice = chunk.slice();
-                    _offsetRemaining -= slice.skip(_offsetRemaining);
                     chunk.release();
-                    if (_offsetRemaining > 0)
-                        continue;
+                    while (_offsetRemaining > 0)
+                        _offsetRemaining -= slice.skip(_offsetRemaining);
                     chunk = Content.Chunk.from(slice, chunk.isLast());
                 }
             }
 
-            // We can start processing the limited length if we have reached the starting offset.
-
+            // We can start processing the limited length if we have reached the starting offset and there
+            // is length remaining
             if (_lengthRemaining == 0)
             {
                 // We have read all we need to

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java

@@ -29,6 +29,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -136,6 +137,7 @@ public static ContextHandler getContextHandler(Request request)
     private final MimeTypes.Mutable _mimeTypes = new MimeTypes.Mutable();
     private final List<ContextScopeListener> _contextListeners = new CopyOnWriteArrayList<>();
     private final List<VHost> _vhosts = new ArrayList<>();
+    private final AtomicBoolean _enterScopeSetClassloaderFailed = new AtomicBoolean();
 
     private String _displayName;
     private String _contextPath = "/";
@@ -754,8 +756,12 @@ protected ClassLoader enterScope(Request contextRequest)
             }
             catch (Throwable x)
             {
-                if (LOG.isDebugEnabled())
-                    LOG.debug("error setting a context classloader on thread {}", Thread.currentThread(), x);
+                // Log as warning the first time it happens.
+                String msg = "Error setting a context classloader on thread {}";
+                if (_enterScopeSetClassloaderFailed.compareAndSet(false, true))
+                    LOG.warn(msg, Thread.currentThread(), x);
+                else if (LOG.isDebugEnabled())
+                    LOG.debug(msg, Thread.currentThread(), x);
             }
         }
         notifyEnterScope(contextRequest);

jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java

@@ -193,7 +193,8 @@ public boolean handle(Request request, Response response, Callback callback) thr
                     @Override
                     public void run()
                     {
-                        try (Blocker.Callback cb = Blocker.callback())
+                        try (StacklessLogging ignore = new StacklessLogging(ContextHandler.class);
+                             Blocker.Callback cb = Blocker.callback())
                         {
                             // When a classloader is configured, Response.write() tries to set it as the context classloader.
                             response.write(true, ByteBuffer.allocate(32), cb);
@@ -209,6 +210,12 @@ public void run()
                         }
                     }
 
+                    @Override
+                    public ClassLoader getContextClassLoader()
+                    {
+                        return null;
+                    }
+
                     @Override
                     public void setContextClassLoader(ClassLoader cl)
                     {
@@ -258,7 +265,8 @@ public boolean handle(Request request, Response response, Callback callback) thr
                         @Override
                         public void completed(Integer result, Object attachment)
                         {
-                            try (Blocker.Callback cb = Blocker.callback())
+                            try (StacklessLogging ignore = new StacklessLogging(ContextHandler.class);
+                                 Blocker.Callback cb = Blocker.callback())
                             {
                                 // When a classloader is configured, Response.write() tries to set it as the context classloader.
                                 response.write(true, ByteBuffer.allocate(32), cb);