diff options
| author | bptato <nincsnevem662@gmail.com> | 2025-05-03 16:26:27 +0200 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2025-05-03 17:29:15 +0200 |
| commit | 89d7057b8a6e9136aafad65328c11634a6e280f3 (patch) | |
| tree | 89dc86ea3e76e27ef6aea0ea69540c7b86ebd77f /src/server | |
| parent | 6e2795857546a76e7e0d0641761ac7c6da8f8808 (diff) | |
| download | chawan-89d7057b8a6e9136aafad65328c11634a6e280f3.tar.gz | |
url: add schemeType, fix port bug on protocol assignment
Allows branching on the scheme without string comparisons.
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/buffer.nim | 2 | ||||
| -rw-r--r-- | src/server/loader.nim | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/server/buffer.nim b/src/server/buffer.nim index e898ee86..f8ced08d 100644 --- a/src/server/buffer.nim +++ b/src/server/buffer.nim @@ -1377,7 +1377,7 @@ proc click(buffer: Buffer; anchor: HTMLAnchorElement): ClickResult = let url = anchor.reinitURL() if url.isSome: var url = url.get - if url.scheme == "javascript": + if url.schemeType == stJavascript: if buffer.config.scripting == smFalse: return ClickResult() let s = buffer.evalJSURL(url) diff --git a/src/server/loader.nim b/src/server/loader.nim index 54e75629..2c12213d 100644 --- a/src/server/loader.nim +++ b/src/server/loader.nim @@ -1341,7 +1341,7 @@ proc loadResource(ctx: var LoaderContext; client: ClientHandle; var prevurl: URL = nil while redo and tries < MaxRewrites: redo = false - if ctx.config.w3mCGICompat and request.url.scheme == "file": + if ctx.config.w3mCGICompat and request.url.schemeType == stFile: let path = request.url.pathname.percentDecode() if ctx.canRewriteForCGICompat(path): let newURL = newURL("cgi-bin:" & path & request.url.search) @@ -1350,25 +1350,25 @@ proc loadResource(ctx: var LoaderContext; client: ClientHandle; inc tries redo = true continue - case request.url.scheme - of "cgi-bin": + case request.url.schemeType + of stCgiBin: ctx.loadCGI(client, handle, request, prevurl, config) if handle.stream != nil: ctx.addFd(handle) else: ctx.close(handle) - of "stream": + of stStream: ctx.loadStream(client, handle, request) if handle.stream != nil: ctx.addFd(handle) else: ctx.close(handle) - of "cache": + of stCache: ctx.loadFromCache(client, handle, request) assert handle.stream == nil - of "data": + of stData: ctx.loadData(handle, request) - of "about": + of stAbout: ctx.loadAbout(handle, request) else: prevurl = request.url |