aboutsummaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2024-11-11 17:19:38 +0100
committerbptato <nincsnevem662@gmail.com>2024-11-11 21:19:52 +0100
commit23beebe67a445aaeeae20a5cd80ff522db1b0ddb (patch)
tree7c29e0be74bc78b02492b31751383096ce1cffdd /src/server
parentbce7d58e6e6e54814b74d9d41766f98552206e32 (diff)
downloadchawan-23beebe67a445aaeeae20a5cd80ff522db1b0ddb.tar.gz
url: reduce URL object size, simplify
* query, fragment are now strings, not options * get rid of Host, Path types, now hostname/pathname are strings * fix ipv4 parsing error case * in file protocol, fix URL for dirlist without slash with a redirection
Diffstat (limited to 'src/server')
-rw-r--r--src/server/buffer.nim22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index ec4b38f4..0386b996 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -707,7 +707,7 @@ type GotoAnchorResult* = object
proc gotoAnchor*(buffer: Buffer): GotoAnchorResult {.proxy.} =
if buffer.document == nil:
return GotoAnchorResult(found: false)
- var anchor = buffer.document.findAnchor(buffer.url.anchor)
+ var anchor = buffer.document.findAnchor(buffer.url.hash)
var focus: ReadLineResult = nil
if buffer.config.autofocus:
let autofocus = buffer.document.findAutoFocus()
@@ -1232,7 +1232,7 @@ proc makeFormRequest(buffer: Buffer; parsedAction: URL; httpMethod: HttpMethod;
# mutate action URL
let kvlist = entryList.toNameValuePairs()
#TODO with charset
- parsedAction.query = some(serializeFormURLEncoded(kvlist))
+ parsedAction.setSearch(serializeFormURLEncoded(kvlist, qmark = true))
return newRequest(parsedAction, httpMethod)
return newRequest(parsedAction) # get action URL
of frtMailto:
@@ -1240,8 +1240,8 @@ proc makeFormRequest(buffer: Buffer; parsedAction: URL; httpMethod: HttpMethod;
# mailWithHeaders
let kvlist = entryList.toNameValuePairs()
#TODO with charset
- let headers = serializeFormURLEncoded(kvlist, spaceAsPlus = false)
- parsedAction.query = some(headers)
+ parsedAction.setSearch(serializeFormURLEncoded(kvlist,
+ spaceAsPlus = false, qmark = true))
return newRequest(parsedAction, httpMethod)
# mail as body
let kvlist = entryList.toNameValuePairs()
@@ -1250,19 +1250,19 @@ proc makeFormRequest(buffer: Buffer; parsedAction: URL; httpMethod: HttpMethod;
else:
#TODO with charset
serializeFormURLEncoded(kvlist)
- if parsedAction.query.isNone:
- parsedAction.query = some("")
- if parsedAction.query.get != "":
- parsedAction.query.get &= '&'
- parsedAction.query.get &= "body=" & body
+ if parsedAction.search == "":
+ parsedAction.search = "?"
+ if parsedAction.search != "?":
+ parsedAction.search &= '&'
+ parsedAction.search &= "body=" & body
return newRequest(parsedAction, httpMethod)
of frtHttp:
if httpMethod == hmGet:
# mutate action URL
let kvlist = entryList.toNameValuePairs()
#TODO with charset
- let query = serializeFormURLEncoded(kvlist)
- parsedAction.query = some(query)
+ let query = serializeFormURLEncoded(kvlist, qmark = true)
+ parsedAction.setSearch(query)
return newRequest(parsedAction, httpMethod)
# submit as entity body
let body = case enctype