Unverified Commit 2b126cd7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

duphandle: make sure CURLOPT_RESOLVE is duplicated fine too 

Verified in test 1502 now

Fixes #2485
Closes #2486
Reported-by: Ernst Sjöstrand
parent 462d8378

lib/easy.c

+3 −0
Original line number Diff line number Diff line
@@ -892,6 +892,9 @@ static CURLcode dupset(struct Curl_easy *dst, struct Curl_easy *src) 
  /* Duplicate mime data. */

  result = Curl_mime_duppart(&dst->set.mimepost, &src->set.mimepost);



  if(src->set.resolve)

    dst->change.resolve = dst->set.resolve;



  return result;

}

tests/libtest/lib1502.c

+11 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -40,6 +40,7 @@ 
int test(char *URL)

{

  CURL *easy = NULL;

  CURL *dup;

  CURLM *multi = NULL;

  int still_running;

  int res = 0;
@@ -72,6 +73,15 @@ int test(char *URL) 
  easy_setopt(easy, CURLOPT_HEADER, 1L);

  easy_setopt(easy, CURLOPT_RESOLVE, dns_cache_list);



  dup = curl_easy_duphandle(easy);

  if(dup) {

    curl_easy_cleanup(easy);

    easy = dup;

  }

  else {

    return CURLE_OUT_OF_MEMORY;

  }



  multi_init(multi);



  multi_add_handle(multi, easy);