emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: allow end-users to customize Content-Type for --post-data and --post-file

Browse Source 
More explanation in this PR:
https://github.com/rmyorston/busybox-w32/pull/233

The real use-case:
wget https://api.github.com/markdown/raw --header "Content-Type: text/plain"

function                                             old     new   delta
wget_main                                           2560    2581     +21
wget_user_headers                                     62      76     +14
.rodata                                           104196  104197      +1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 36/0)               Total: 36 bytes

Signed-off-by: Ildar Shaimordanov <ildar.shaimordanov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ildar Shaimordanov 2021-12-12 03:19:13 +01:00 committed by Denys Vlasenko
parent c7b90dc4d1
commit b9fba185c5
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
networking/wget.c
View File

@ -211,13 +211,15 @@ enum {
HDR_HOST = (1<<0), HDR_HOST = (1<<0),
HDR_USER_AGENT = (1<<1), HDR_USER_AGENT = (1<<1),
HDR_RANGE = (1<<2), HDR_RANGE = (1<<2),
HDR_AUTH = (1<<3) * ENABLE_FEATURE_WGET_AUTHENTICATION, HDR_CONTENT_TYPE = (1<<3),
HDR_PROXY_AUTH = (1<<4) * ENABLE_FEATURE_WGET_AUTHENTICATION, HDR_AUTH = (1<<4) * ENABLE_FEATURE_WGET_AUTHENTICATION,
HDR_PROXY_AUTH = (1<<5) * ENABLE_FEATURE_WGET_AUTHENTICATION,
}; };
static const char wget_user_headers[] ALIGN1 = static const char wget_user_headers[] ALIGN1 =
"Host:\0" "Host:\0"
"User-Agent:\0" "User-Agent:\0"
"Range:\0" "Range:\0"
"Content-Type:\0"
# if ENABLE_FEATURE_WGET_AUTHENTICATION # if ENABLE_FEATURE_WGET_AUTHENTICATION
"Authorization:\0" "Authorization:\0"
"Proxy-Authorization:\0" "Proxy-Authorization:\0"
@ -226,12 +228,14 @@ static const char wget_user_headers[] ALIGN1 =
# define USR_HEADER_HOST (G.user_headers & HDR_HOST) # define USR_HEADER_HOST (G.user_headers & HDR_HOST)
# define USR_HEADER_USER_AGENT (G.user_headers & HDR_USER_AGENT) # define USR_HEADER_USER_AGENT (G.user_headers & HDR_USER_AGENT)
# define USR_HEADER_RANGE (G.user_headers & HDR_RANGE) # define USR_HEADER_RANGE (G.user_headers & HDR_RANGE)
# define USR_HEADER_CONTENT_TYPE (G.user_headers & HDR_CONTENT_TYPE)
# define USR_HEADER_AUTH (G.user_headers & HDR_AUTH) # define USR_HEADER_AUTH (G.user_headers & HDR_AUTH)
# define USR_HEADER_PROXY_AUTH (G.user_headers & HDR_PROXY_AUTH) # define USR_HEADER_PROXY_AUTH (G.user_headers & HDR_PROXY_AUTH)
#else /* No long options, no user-headers :( */ #else /* No long options, no user-headers :( */
# define USR_HEADER_HOST 0 # define USR_HEADER_HOST 0
# define USR_HEADER_USER_AGENT 0 # define USR_HEADER_USER_AGENT 0
# define USR_HEADER_RANGE 0 # define USR_HEADER_RANGE 0
# define USR_HEADER_CONTENT_TYPE 0
# define USR_HEADER_AUTH 0 # define USR_HEADER_AUTH 0
# define USR_HEADER_PROXY_AUTH 0 # define USR_HEADER_PROXY_AUTH 0
#endif #endif
@ -1261,8 +1265,13 @@ static void download_one_url(const char *url)
} }
if (G.post_data) { if (G.post_data) {
/* If user did not override it... */
if (!USR_HEADER_CONTENT_TYPE) {
SENDFMT(sfp, SENDFMT(sfp,
"Content-Type: application/x-www-form-urlencoded\r\n" "Content-Type: application/x-www-form-urlencoded\r\n"
);
}
SENDFMT(sfp,
"Content-Length: %u\r\n" "Content-Length: %u\r\n"
"\r\n" "\r\n"
"%s", "%s",