diff options
Diffstat (limited to 'lib/pure/cgi.nim')
| -rw-r--r-- | lib/pure/cgi.nim | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/pure/cgi.nim b/lib/pure/cgi.nim index b30f8dd33..d5690bf51 100644 --- a/lib/pure/cgi.nim +++ b/lib/pure/cgi.nim @@ -31,7 +31,7 @@ import strutils, os, strtabs, cookies -proc URLencode*(s: string): string = +proc urlEncode*(s: string): string = ## Encodes a value to be HTTP safe: This means that characters in the set ## ``{'A'..'Z', 'a'..'z', '0'..'9', '_'}`` are carried over to the result, ## a space is converted to ``'+'`` and every other character is encoded as @@ -52,7 +52,7 @@ proc handleHexChar(c: char, x: var int) {.inline.} = of 'A'..'F': x = (x shl 4) or (ord(c) - ord('A') + 10) else: assert(false) -proc URLdecode*(s: string): string = +proc urlDecode*(s: string): string = ## Decodes a value from its HTTP representation: This means that a ``'+'`` ## is converted to a space, ``'%xx'`` (where ``xx`` denotes a hexadecimal ## value) is converted to the character with ordinal number ``xx``, and @@ -82,7 +82,7 @@ proc addXmlChar(dest: var string, c: char) {.inline.} = of '\"': add(dest, """) else: add(dest, c) -proc XMLencode*(s: string): string = +proc xmlEncode*(s: string): string = ## Encodes a value to be XML safe: ## * ``"`` is replaced by ``"`` ## * ``<`` is replaced by ``<`` @@ -99,7 +99,8 @@ type methodPost, ## query uses the POST method methodGet ## query uses the GET method -{.deprecated: [TRequestMethod: RequestMethod, ECgi: CgiError].} +{.deprecated: [TRequestMethod: RequestMethod, ECgi: CgiError, + URLencode: urlEncode, XMLencode: xmlEncode, URLdecode: urlDecode].} proc cgiError*(msg: string) {.noreturn.} = ## raises an ECgi exception with message `msg`. @@ -331,9 +332,9 @@ proc setTestData*(keysvalues: varargs[string]) = var i = 0 var query = "" while i < keysvalues.len: - add(query, URLencode(keysvalues[i])) + add(query, urlEncode(keysvalues[i])) add(query, '=') - add(query, URLencode(keysvalues[i+1])) + add(query, urlEncode(keysvalues[i+1])) add(query, '&') inc(i, 2) putEnv("QUERY_STRING", query) |