Merge branch 'cloudflare:main' into main

Author: yurhasko

pnpm-lock.yaml

@@ -120,7 +120,7 @@ export async function getUploadState(
     throw new InternalError();
   }
 
-  if (!verifyHash && stateStrHash !== verifyHash) {
+  if (verifyHash !== undefined && stateStrHash !== verifyHash) {
     return new RangeError(stateStrHash, stateObject);
   }
 
@@ -719,6 +719,7 @@ export class R2Registry implements Registry {
 
     const upload = this.env.REGISTRY.resumeMultipartUpload(state.registryUploadId, state.uploadId);
     await upload.abort();
+    await this.env.REGISTRY.delete(getRegistryUploadsPath(state));
     return true;
   }
 

src/registry/r2.ts

@@ -43,6 +43,7 @@ v2Router.get("/_catalog", async (req, env: Env) => {
     {
       headers: {
         Link: `${url.protocol}//${url.hostname}${url.pathname}?n=${n ?? 1000}&last=${response.cursor ?? ""}; rel=next`,
+        "Content-Type": "application/json",
       },
     },
   );