summaryrefslogtreecommitdiff
path: root/src/tool_cb_hdr.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-11-20 23:33:46 +0100
committerDaniel Stenberg <daniel@haxx.se>2011-11-20 23:35:49 +0100
commitc532604b137cae2e2814280778f914e4cd0460d1 (patch)
treed3104e465a15e8e5b813906129f4010b4921d694 /src/tool_cb_hdr.c
parent64f328c787ab763cc994eadd6b82f32490d37ebb (diff)
downloadcurl-c532604b137cae2e2814280778f914e4cd0460d1.tar.gz
-J -O: use -O name if no Content-Disposition header comes!
A regression between 7.22.0 and 7.23.0 -- downloading a file with the flags -O and -J results in the content being written to stdout if and only if there was no Content-Disposition header in the http response. If there is a C-D header with a filename attribute, the output is correctly written. Reported by: Dave Reisner Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html
Diffstat (limited to 'src/tool_cb_hdr.c')
-rw-r--r--src/tool_cb_hdr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index fb24b4508..dea73387a 100644
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata)
}
#endif
- if(!outs->filename && (cb > 20) &&
- checkprefix("Content-disposition:", str)) {
+ if((cb > 20) && checkprefix("Content-disposition:", str)) {
const char *p = str + 20;
/* look for the 'filename=' parameter