From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 30 Jul 2018 22:27:50 +0000 (+0200)
Subject: curl: use Content-Disposition before the "URL end" for -OJ
X-Git-Tag: curl-7_61_1~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e78f2cfe56c39a6c32191c207aae683de0e9a042;p=thirdparty%2Fcurl.git

curl: use Content-Disposition before the "URL end" for -OJ

Regression introduced in 7.61.0

Reported-by: Thomas Klausner
Fixes #2783
Closes #2813
---

diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index 6419b72048..04bc7e17bb 100644
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -106,9 +106,6 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
      (protocol & (CURLPROTO_HTTPS|CURLPROTO_HTTP))) {
     const char *p = str + 20;
 
-    if(!outs->stream && !tool_create_output_file(outs, FALSE))
-      return failure;
-
     /* look for the 'filename=' parameter
        (encoded filenames (*=) are not supported) */
     for(;;) {
@@ -156,6 +153,8 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
       }
       break;
     }
+    if(!outs->stream && !tool_create_output_file(outs, FALSE))
+      return failure;
   }
 
   if(hdrcbdata->config->show_headers &&