OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix accessing versioned resource using file service

Browse Source 
Fixes #986.
This commit is contained in:
Asher 2019-09-16 10:59:28 -05:00
parent 0141ded35d
commit 5c16399810
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/channel.ts
View File

@ -164,8 +164,8 @@ export class FileProviderChannel implements IServerChannel, IDisposable {
private transform(resource: UriComponents): URI { private transform(resource: UriComponents): URI {
// Used for walkthrough content. // Used for walkthrough content.
if (resource.path.indexOf("/static") === 0) { if (/^\/static[^/]*\//.test(resource.path)) {
return URI.file(this.environmentService.appRoot + resource.path.replace(/^\/static/, "")); return URI.file(this.environmentService.appRoot + resource.path.replace(/^\/static[^/]*\//, "/"));
// Used by the webview service worker to load resources. // Used by the webview service worker to load resources.
} else if (resource.path === "/vscode-resource" && resource.query) { } else if (resource.path === "/vscode-resource" && resource.query) {
try { try {

2
src/server.ts
View File

@ -279,7 +279,7 @@ export abstract class Server {
// without adding query parameters which have their own issues. // without adding query parameters which have their own issues.
// REVIEW: Discuss whether this is the best option; this is sort of a quick // REVIEW: Discuss whether this is the best option; this is sort of a quick
// hack almost to get caching in the meantime but it does work pretty well. // hack almost to get caching in the meantime but it does work pretty well.
if (/static-.+/.test(base)) { if (/^\/static-.+/.test(base)) {
base = "/static"; base = "/static";
} }