diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-05-25 17:33:28 +0900 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-05-25 23:06:08 +0200 |
| commit | b061fed981c97bef78679f193173ab55a4dce91e (patch) | |
| tree | a64b568cba77c5eee1ced652fdbd0ce9dd6ad4f4 /src/tool_cb_hdr.h | |
| parent | 9c480490f7559e169cea59754480f87d2763e2c2 (diff) | |
Made -D option work with -O and -J.
To achieve this, first new structure HeaderData is defined to hold
necessary data to perform header-related work. Then tool_header_cb now
receives HeaderData pointer as userdata. All header-related work
(currently, dumping header and Content-Disposition inspection) are done
in this callback function. HeaderData.outs->config is used to determine
whether each work is done.
Unit tests were also updated because after this change, curl code always
sets CURLOPT_HEADERFUNCTION and CURLOPT_HEADERDATA.
Tested with -O -J -D, -O -J -i and -O -J -D -i and all worked fine.
Diffstat (limited to 'src/tool_cb_hdr.h')
| -rw-r--r-- | src/tool_cb_hdr.h | 10 |
1 files changed, 10 insertions, 0 deletions
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 */ |