From d2b36e466afd69b6e2b202aca21db3bd2e48b190 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 8 Aug 2013 13:01:16 +0200 Subject: global dns cache: didn't work [regression] CURLOPT_DNS_USE_GLOBAL_CACHE broke in commit c43127414d89ccb (been broken since the libcurl 7.29.0 release). While this option has been documented as deprecated for almost a decade and nobody even reported this bug, it should remain functional. Added test case 1512 to verify --- tests/libtest/lib1512.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 tests/libtest/lib1512.c (limited to 'tests/libtest/lib1512.c') diff --git a/tests/libtest/lib1512.c b/tests/libtest/lib1512.c new file mode 100644 index 000000000..93d5ea908 --- /dev/null +++ b/tests/libtest/lib1512.c @@ -0,0 +1,89 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 2013, Linus Nielsen Feltzing + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +/* + * Use global DNS cache (while deprecated it should still work), populate it + * with CURLOPT_RESOLVE in the first request and then make sure a subsequent + * easy transfer finds and uses the populated stuff. + */ + +#include "test.h" + +#include "memdebug.h" + +#define NUM_HANDLES 2 + +int test(char *URL) +{ + CURLcode res; + CURL *curl[NUM_HANDLES] = {NULL, NULL}; + char *port = libtest_arg3; + char *address = libtest_arg2; + char dnsentry[256]; + struct curl_slist *slist = NULL; + int i; + char target_url[256]; + (void)URL; /* URL is setup in the code */ + + if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + sprintf(dnsentry, "server.example.curl:%s:%s", port, address); + printf("%s\n", dnsentry); + slist = curl_slist_append(slist, dnsentry); + + /* get NUM_HANDLES easy handles */ + for(i=0; i < NUM_HANDLES; i++) { + /* get an easy handle */ + easy_init(curl[i]); + /* specify target */ + sprintf(target_url, "http://server.example.curl:%s/path/1512%04i", + port, i + 1); + target_url[sizeof(target_url) - 1] = '\0'; + easy_setopt(curl[i], CURLOPT_URL, target_url); + /* go verbose */ + easy_setopt(curl[i], CURLOPT_VERBOSE, 1L); + /* include headers */ + easy_setopt(curl[i], CURLOPT_HEADER, 1L); + + easy_setopt(curl[i], CURLOPT_DNS_USE_GLOBAL_CACHE, 1L); + } + + /* make the first one populate the GLOBAL cache */ + easy_setopt(curl[0], CURLOPT_RESOLVE, slist); + + /* run NUM_HANDLES transfers */ + for(i=0; (i < NUM_HANDLES) && !res; i++) + res = curl_easy_perform(curl[i]); + +test_cleanup: + + curl_easy_cleanup(curl[0]); + curl_easy_cleanup(curl[1]); + curl_slist_free_all(slist); + curl_global_cleanup(); + + return (int)res; +} + -- cgit v1.2.3