Merge branch 'patchJsonld' of https://github.com/solid/node-solid-server into patchJsonld

bourgeoa · bourgeoa · commit 03a48ee19b19 · 2022-08-19T17:37:32.000+02:00
diff --git a/lib/resource-mapper.js b/lib/resource-mapper.js
@@ -147,7 +147,7 @@ class ResourceMapper {
     return { path, contentType: contentType || this._defaultContentType }
   }
 
-  // encode/decode path except slash (/) / %encodedSlash (%2F|%2f) /ntimes%encodedSlash (%2525...2F|%2525...2f)
+  // encode/decode path except slash (/), %encodedSlash (%2F|%2f), or ntimes%encodedSlash (%2525...2F|%2525...2f)
   // see https://github.com/solid/node-solid-server/issues/1666
   _exceptSlash () { return /(\/|%(?:25)*(?:2f))/gi }
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ class ResourceMapper {`
`147`	`147`	`return { path, contentType: contentType \|\| this._defaultContentType }`
`148`	`148`	`}`
`149`	`149`
`150`		`- // encode/decode path except slash (/) / %encodedSlash (%2F\|%2f) /ntimes%encodedSlash (%2525...2F\|%2525...2f)`
	`150`	`+ // encode/decode path except slash (/), %encodedSlash (%2F\|%2f), or ntimes%encodedSlash (%2525...2F\|%2525...2f)`
`151`	`151`	`// see https://github.com/solid/node-solid-server/issues/1666`
`152`	`152`	`_exceptSlash () { return /(\/\|%(?:25)*(?:2f))/gi }`
`153`	`153`