473243 Delay resource close for async default content

jetty-util/src/main/java/org/eclipse/jetty/util/resource/URLResource.java

@@ -301,7 +301,7 @@ public class URLResource extends Resource
 
         path = URIUtil.canonicalPath(path);
 
-        return newResource(URIUtil.addPaths(_url.toExternalForm(),path), _useCaches);
+        return newResource(URIUtil.addPaths(_url.toExternalForm(),URIUtil.encodePath(path)), _useCaches);
     }
 
     /* ------------------------------------------------------------ */

jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java

@@ -38,6 +38,8 @@ import java.util.zip.ZipFile;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.toolchain.test.OS;
 import org.eclipse.jetty.util.IO;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -344,6 +346,21 @@ public class ResourceTest
         }
     }
 
+    /* ------------------------------------------------------------ */
+    @Test
+    public void testEncodeAddPath ()
+    throws Exception
+    {
+        Resource r;
+
+        r = Resource.newResource(__userURL+"TestData/").addPath("foo%/b r");
+        Assert.assertThat(r.getURI().toString(),Matchers.endsWith("/foo%25/b%20r"));
+        
+        r = Resource.newResource("jar:"+__userURL+"TestData/test.zip!/subdir/").addPath("foo%/b r");
+        Assert.assertThat(r.getURI().toString(),Matchers.endsWith("/foo%25/b%20r"));
+    }
+    
+    
     /* ------------------------------------------------------------ */
     @Test
     public void testJarFileCopyToDirectoryTraversal () throws Exception