From ba3695353add020b686547699ba5e259c339bfa6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 25 Aug 2015 12:33:40 +0100 Subject: [settings] Re-add "uristring" setting type Commit 09b057c ("[settings] Remove "uristring" setting type") removed support for URI-encoded settings via the "uristring" setting type, on the basis that such encoding was no longer necessary to avoid problems with the command line parser. Other valid use cases for the "uristring" setting type do exist: for example, a password containing a '/' character expanded via chain http://username:${password:uristring}@server.name/boot.php Restore the existence of the "uristring" setting, avoiding the potentially large stack allocations that were used in the old code prior to commit 09b057c ("[settings] Remove "uristring" setting type"). Requested-by: Robin Smidsrød Signed-off-by: Michael Brown --- src/net/tcp/httpcore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/net') diff --git a/src/net/tcp/httpcore.c b/src/net/tcp/httpcore.c index af3ca9780..f3685de04 100644 --- a/src/net/tcp/httpcore.c +++ b/src/net/tcp/httpcore.c @@ -1826,7 +1826,7 @@ static size_t http_params ( struct parameters *params, char *buf, size_t len ) { } /* URI-encode the key */ - frag_len = uri_encode ( param->key, 0, buf, remaining ); + frag_len = uri_encode_string ( 0, param->key, buf, remaining ); buf += frag_len; len += frag_len; remaining -= frag_len; @@ -1839,7 +1839,7 @@ static size_t http_params ( struct parameters *params, char *buf, size_t len ) { remaining--; /* URI-encode the value */ - frag_len = uri_encode ( param->value, 0, buf, remaining ); + frag_len = uri_encode_string ( 0, param->value, buf, remaining); buf += frag_len; len += frag_len; remaining -= frag_len; -- cgit v1.2.3-55-g7522