Commit b9728bca authored by Jay Satiro's avatar Jay Satiro
Browse files

tool_cb_hdr: Fix --remote-header-name with schemeless URL 

- Move the existing scheme check from tool_operate.

In the case of --remote-header-name we want to parse Content-disposition
for a filename, but only if the scheme is http or https. A recent
adjustment 0dc4d8e4 was made to account for schemeless URLs however it's
not 100% accurate. To remedy that I've moved the scheme check to the
header callback, since at that point the library has already determined
the scheme.

Bug: https://github.com/curl/curl/issues/760
Reported-by: Kai Noda
parent 283babfa

src/tool_cb_hdr.c

+4 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) 
  const char *str = ptr;

  const size_t cb = size * nmemb;

  const char *end = (char*)ptr + cb;

  char *url = NULL;



  /*

   * Once that libcurl has called back tool_header_cb() the returned value
@@ -88,7 +89,9 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) 
   */



  if(hdrcbdata->honor_cd_filename &&

     (cb > 20) && checkprefix("Content-disposition:", str)) {

     (cb > 20) && checkprefix("Content-disposition:", str) &&

     !curl_easy_getinfo(outs->config->easy, CURLINFO_EFFECTIVE_URL, &url) &&

     url && (checkprefix("http://", url) || checkprefix("https://", url))) {

    const char *p = str + 20;



    /* look for the 'filename=' parameter

src/tool_operate.c

+1 −6
Original line number Diff line number Diff line
@@ -1295,12 +1295,7 @@ static CURLcode operate_do(struct GlobalConfig *global, 
          my_setopt_flags(curl, CURLOPT_REDIR_PROTOCOLS, config->proto_redir);



        if(config->content_disposition

           && (urlnode->flags & GETOUT_USEREMOTE)

           && (checkprefix("http://", this_url) ||

               checkprefix("https://", this_url) ||

               (!strstr(this_url, "://") &&

                (!config->proto_default ||

                 checkprefix("http", config->proto_default)))))

           && (urlnode->flags & GETOUT_USEREMOTE))

          hdrcbdata.honor_cd_filename = TRUE;

        else

          hdrcbdata.honor_cd_filename = FALSE;