diff options
| author | Ildar Shaimordanov <ildar.shaimordanov@gmail.com> | 2021-12-12 03:19:13 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2021-12-12 03:22:43 +0100 |
| commit | b9fba185c570b52fccffa2b9ae39ba32a0860daf (patch) | |
| tree | d4105fca3fb86b3c4e0d6fe05bb7f31bb16dd49b /networking | |
| parent | c7b90dc4d10ccc4f95940f42676ff907cee73272 (diff) | |
| download | busybox-w32-b9fba185c570b52fccffa2b9ae39ba32a0860daf.tar.gz busybox-w32-b9fba185c570b52fccffa2b9ae39ba32a0860daf.tar.bz2 busybox-w32-b9fba185c570b52fccffa2b9ae39ba32a0860daf.zip | |
wget: allow end-users to customize Content-Type for --post-data and --post-file
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>
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/wget.c | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/networking/wget.c b/networking/wget.c index 91ef99eab..9ec0e67b9 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
| @@ -211,29 +211,33 @@ enum { | |||
| 211 | HDR_HOST = (1<<0), | 211 | HDR_HOST = (1<<0), |
| 212 | HDR_USER_AGENT = (1<<1), | 212 | HDR_USER_AGENT = (1<<1), |
| 213 | HDR_RANGE = (1<<2), | 213 | HDR_RANGE = (1<<2), |
| 214 | HDR_AUTH = (1<<3) * ENABLE_FEATURE_WGET_AUTHENTICATION, | 214 | HDR_CONTENT_TYPE = (1<<3), |
| 215 | HDR_PROXY_AUTH = (1<<4) * ENABLE_FEATURE_WGET_AUTHENTICATION, | 215 | HDR_AUTH = (1<<4) * ENABLE_FEATURE_WGET_AUTHENTICATION, |
| 216 | HDR_PROXY_AUTH = (1<<5) * ENABLE_FEATURE_WGET_AUTHENTICATION, | ||
| 216 | }; | 217 | }; |
| 217 | static const char wget_user_headers[] ALIGN1 = | 218 | static const char wget_user_headers[] ALIGN1 = |
| 218 | "Host:\0" | 219 | "Host:\0" |
| 219 | "User-Agent:\0" | 220 | "User-Agent:\0" |
| 220 | "Range:\0" | 221 | "Range:\0" |
| 222 | "Content-Type:\0" | ||
| 221 | # if ENABLE_FEATURE_WGET_AUTHENTICATION | 223 | # if ENABLE_FEATURE_WGET_AUTHENTICATION |
| 222 | "Authorization:\0" | 224 | "Authorization:\0" |
| 223 | "Proxy-Authorization:\0" | 225 | "Proxy-Authorization:\0" |
| 224 | # endif | 226 | # endif |
| 225 | ; | 227 | ; |
| 226 | # define USR_HEADER_HOST (G.user_headers & HDR_HOST) | 228 | # define USR_HEADER_HOST (G.user_headers & HDR_HOST) |
| 227 | # define USR_HEADER_USER_AGENT (G.user_headers & HDR_USER_AGENT) | 229 | # define USR_HEADER_USER_AGENT (G.user_headers & HDR_USER_AGENT) |
| 228 | # define USR_HEADER_RANGE (G.user_headers & HDR_RANGE) | 230 | # define USR_HEADER_RANGE (G.user_headers & HDR_RANGE) |
| 229 | # define USR_HEADER_AUTH (G.user_headers & HDR_AUTH) | 231 | # define USR_HEADER_CONTENT_TYPE (G.user_headers & HDR_CONTENT_TYPE) |
| 230 | # define USR_HEADER_PROXY_AUTH (G.user_headers & HDR_PROXY_AUTH) | 232 | # define USR_HEADER_AUTH (G.user_headers & HDR_AUTH) |
| 233 | # define USR_HEADER_PROXY_AUTH (G.user_headers & HDR_PROXY_AUTH) | ||
| 231 | #else /* No long options, no user-headers :( */ | 234 | #else /* No long options, no user-headers :( */ |
| 232 | # define USR_HEADER_HOST 0 | 235 | # define USR_HEADER_HOST 0 |
| 233 | # define USR_HEADER_USER_AGENT 0 | 236 | # define USR_HEADER_USER_AGENT 0 |
| 234 | # define USR_HEADER_RANGE 0 | 237 | # define USR_HEADER_RANGE 0 |
| 235 | # define USR_HEADER_AUTH 0 | 238 | # define USR_HEADER_CONTENT_TYPE 0 |
| 236 | # define USR_HEADER_PROXY_AUTH 0 | 239 | # define USR_HEADER_AUTH 0 |
| 240 | # define USR_HEADER_PROXY_AUTH 0 | ||
| 237 | #endif | 241 | #endif |
| 238 | 242 | ||
| 239 | /* Globals */ | 243 | /* Globals */ |
| @@ -1261,8 +1265,13 @@ static void download_one_url(const char *url) | |||
| 1261 | } | 1265 | } |
| 1262 | 1266 | ||
| 1263 | if (G.post_data) { | 1267 | if (G.post_data) { |
| 1268 | /* If user did not override it... */ | ||
| 1269 | if (!USR_HEADER_CONTENT_TYPE) { | ||
| 1270 | SENDFMT(sfp, | ||
| 1271 | "Content-Type: application/x-www-form-urlencoded\r\n" | ||
| 1272 | ); | ||
| 1273 | } | ||
| 1264 | SENDFMT(sfp, | 1274 | SENDFMT(sfp, |
| 1265 | "Content-Type: application/x-www-form-urlencoded\r\n" | ||
| 1266 | "Content-Length: %u\r\n" | 1275 | "Content-Length: %u\r\n" |
| 1267 | "\r\n" | 1276 | "\r\n" |
| 1268 | "%s", | 1277 | "%s", |