diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/tool_cb_hdr.c | 12 | ||||
-rw-r--r-- | src/tool_cb_hdr.h | 10 | ||||
-rw-r--r-- | src/tool_operate.c | 18 |
3 files changed, 27 insertions, 13 deletions
diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c index e96331177..738cd5dfc 100644 --- a/src/tool_cb_hdr.c +++ b/src/tool_cb_hdr.c @@ -41,7 +41,10 @@ static char *parse_filename(const char *ptr, size_t len); size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) { - struct OutStruct *outs = userdata; + HeaderData *hdrdata = userdata; + struct getout *urlnode = hdrdata->urlnode; + struct OutStruct *outs = hdrdata->outs; + struct OutStruct *heads = hdrdata->heads; const char *str = ptr; const size_t cb = size * nmemb; const char *end = (char*)ptr + cb; @@ -63,8 +66,13 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) return failure; } #endif + /* --dump-header option */ + if(outs->config->headerfile) { + fwrite(ptr, size, nmemb, heads->stream); + } - if((cb > 20) && checkprefix("Content-disposition:", str)) { + if((urlnode->flags & GETOUT_USEREMOTE) && outs->config->content_disposition + && (cb > 20) && checkprefix("Content-disposition:", str)) { const char *p = str + 20; /* look for the 'filename=' parameter diff --git a/src/tool_cb_hdr.h b/src/tool_cb_hdr.h index 5909336e6..0300c0068 100644 --- a/src/tool_cb_hdr.h +++ b/src/tool_cb_hdr.h @@ -23,6 +23,16 @@ ***************************************************************************/ #include "tool_setup.h" +/* Structure to pass as userdata in tool_header_cb */ +typedef struct { + /* getout object pointer currently processing */ + struct getout *urlnode; + /* output stream */ + struct OutStruct *outs; + /* header output stream */ + struct OutStruct *heads; +} HeaderData; + /* ** callback for CURLOPT_HEADERFUNCTION */ diff --git a/src/tool_operate.c b/src/tool_operate.c index e3d002133..689ffb2d7 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -504,6 +504,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) long retry_sleep_default; long retry_sleep; char *this_url; + HeaderData hdrdata; outfile = NULL; infdopen = FALSE; @@ -1211,17 +1212,12 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) if(config->proto_redir_present) my_setopt_flags(curl, CURLOPT_REDIR_PROTOCOLS, config->proto_redir); - if((urlnode->flags & GETOUT_USEREMOTE) - && config->content_disposition) { - my_setopt(curl, CURLOPT_HEADERFUNCTION, tool_header_cb); - my_setopt(curl, CURLOPT_HEADERDATA, &outs); - } - else { - /* if HEADERFUNCTION was set to something in the previous loop, it - is important that we set it (back) to NULL now */ - my_setopt(curl, CURLOPT_HEADERFUNCTION, NULL); - my_setopt(curl, CURLOPT_HEADERDATA, config->headerfile?&heads:NULL); - } + hdrdata.urlnode = urlnode; + hdrdata.outs = &outs; + hdrdata.heads = &heads; + + my_setopt(curl, CURLOPT_HEADERFUNCTION, tool_header_cb); + my_setopt(curl, CURLOPT_HEADERDATA, &hdrdata); if(config->resolve) /* new in 7.21.3 */ |