aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/buffer.nim10
-rw-r--r--src/types/url.nim43
2 files changed, 22 insertions, 31 deletions
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index a1218a62..1cdab600 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -1266,7 +1266,7 @@ proc makeFormRequest(buffer: Buffer; parsedAction: URL; httpMethod: HttpMethod;
# mutate action URL
let kvlist = entryList.toNameValuePairs()
#TODO with charset
- parsedAction.setSearch(serializeFormURLEncoded(kvlist, qmark = true))
+ parsedAction.setSearch('?' & serializeFormURLEncoded(kvlist))
return newRequest(parsedAction, httpMethod)
return newRequest(parsedAction) # get action URL
of frtMailto:
@@ -1274,8 +1274,8 @@ proc makeFormRequest(buffer: Buffer; parsedAction: URL; httpMethod: HttpMethod;
# mailWithHeaders
let kvlist = entryList.toNameValuePairs()
#TODO with charset
- parsedAction.setSearch(serializeFormURLEncoded(kvlist,
- spaceAsPlus = false, qmark = true))
+ parsedAction.setSearch('?' & serializeFormURLEncoded(kvlist,
+ spaceAsPlus = false))
return newRequest(parsedAction, httpMethod)
# mail as body
let kvlist = entryList.toNameValuePairs()
@@ -1295,8 +1295,8 @@ proc makeFormRequest(buffer: Buffer; parsedAction: URL; httpMethod: HttpMethod;
# mutate action URL
let kvlist = entryList.toNameValuePairs()
#TODO with charset
- let query = serializeFormURLEncoded(kvlist, qmark = true)
- parsedAction.setSearch(query)
+ let search = '?' & serializeFormURLEncoded(kvlist)
+ parsedAction.setSearch(search)
return newRequest(parsedAction, httpMethod)
# submit as entity body
let body = case enctype
diff --git a/src/types/url.nim b/src/types/url.nim
index f3b52611..83ef020a 100644
--- a/src/types/url.nim
+++ b/src/types/url.nim
@@ -1034,37 +1034,28 @@ proc setHref(ctx: JSContext; url: URL; s: string) {.jsfset: "href".} =
func isIP*(url: URL): bool =
return url.hostType in {htIpv4, htIpv6}
-#https://url.spec.whatwg.org/#concept-urlencoded-serializer
+# https://url.spec.whatwg.org/#urlencoded-parsing
proc parseFromURLEncoded(input: string): seq[(string, string)] =
+ result = @[]
for s in input.split('&'):
if s == "":
continue
- var name = ""
- var value = ""
- for i in 0..<s.len:
- if s[i] == '=':
- name = s.substr(0, i - 1)
- value = s.substr(i + 1)
- break
- if name == "":
- name = s
- for i in 0..<name.len:
- if name[i] == '+':
- name[i] = ' '
- for i in 0..<value.len:
- if value[i] == '+':
- value[i] = ' '
- result.add((percentDecode(name), percentDecode(value)))
-
-#https://url.spec.whatwg.org/#concept-urlencoded-serializer
-proc serializeFormURLEncoded*(kvs: seq[(string, string)]; spaceAsPlus = true;
- qmark = false): string =
+ var name = s.until('=')
+ var value = s.after('=')
+ for c in name.mitems:
+ if c == '+':
+ c = ' '
+ for c in value.mitems:
+ if c == '+':
+ c = ' '
+ result.add((name.percentDecode(), value.percentDecode()))
+
+# https://url.spec.whatwg.org/#urlencoded-serializing
+proc serializeFormURLEncoded*(kvs: seq[(string, string)]; spaceAsPlus = true):
+ string =
result = ""
- if qmark:
- result &= '?'
- for it in kvs:
- let (name, value) = it
- if result != "":
+ for (name, value) in kvs:
+ if result.len > 0:
result &= '&'
result.percentEncode(name, ApplicationXWWWFormUrlEncodedSet, spaceAsPlus)
result &= '='