mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 16:18:48 -05:00
4a5aa6682d
This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:
f871de0... build: make use of 76 lib/*.h renamed files
ffd8e12... build: rename 76 lib/*.h files
This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:
c087374... curl_setup.h: remove redundant include guard
This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:
13606bb... build: make use of 93 lib/*.c renamed files
5b6e792... build: rename 93 lib/*.c files
7d83dff... build: commit 13606bbfde follow-up 1
Start of related discussion thread:
http://curl.haxx.se/mail/lib-2013-01/0012.html
Asking for confirmation on pushing this revertion commit:
http://curl.haxx.se/mail/lib-2013-01/0048.html
Confirmation summary:
http://curl.haxx.se/mail/lib-2013-01/0079.html
NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.
lib/curl_imap.h
lib/curl_smtp.h
146 lines
3.5 KiB
C
146 lines
3.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, 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
|
|
* 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.
|
|
*
|
|
***************************************************************************/
|
|
/*
|
|
* This source code is used for lib1502, lib1503, lib1504 and lib1505 with
|
|
* only #ifdefs controlling the cleanup sequence.
|
|
*
|
|
* Test case 1502 converted from bug report #3575448, identifying a memory
|
|
* leak in the CURLOPT_RESOLVE handling with the multi interface.
|
|
*/
|
|
|
|
#include "test.h"
|
|
|
|
#ifdef HAVE_LIMITS_H
|
|
#include <limits.h>
|
|
#endif
|
|
|
|
#include "testutil.h"
|
|
#include "warnless.h"
|
|
#include "memdebug.h"
|
|
|
|
#define TEST_HANG_TIMEOUT 60 * 1000
|
|
|
|
int test(char *URL)
|
|
{
|
|
CURL* easy = NULL;
|
|
CURLM* multi = NULL;
|
|
int still_running;
|
|
int res = 0;
|
|
|
|
char redirect[160];
|
|
|
|
/* DNS cache injection */
|
|
struct curl_slist *dns_cache_list;
|
|
|
|
sprintf(redirect, "google.com:%s:%s", libtest_arg2, libtest_arg3);
|
|
|
|
start_test_timing();
|
|
|
|
dns_cache_list = curl_slist_append(NULL, redirect);
|
|
if(!dns_cache_list) {
|
|
fprintf(stderr, "curl_slist_append() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
res_global_init(CURL_GLOBAL_ALL);
|
|
if(res) {
|
|
curl_slist_free_all(dns_cache_list);
|
|
return res;
|
|
}
|
|
|
|
easy_init(easy);
|
|
|
|
easy_setopt(easy, CURLOPT_URL, URL);
|
|
easy_setopt(easy, CURLOPT_HEADER, 1L);
|
|
easy_setopt(easy, CURLOPT_RESOLVE, dns_cache_list);
|
|
|
|
multi_init(multi);
|
|
|
|
multi_add_handle(multi, easy);
|
|
|
|
multi_perform(multi, &still_running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
while(still_running) {
|
|
struct timeval timeout;
|
|
fd_set fdread;
|
|
fd_set fdwrite;
|
|
fd_set fdexcep;
|
|
int maxfd = -99;
|
|
|
|
FD_ZERO(&fdread);
|
|
FD_ZERO(&fdwrite);
|
|
FD_ZERO(&fdexcep);
|
|
timeout.tv_sec = 1;
|
|
timeout.tv_usec = 0;
|
|
|
|
multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd);
|
|
|
|
/* At this point, maxfd is guaranteed to be greater or equal than -1. */
|
|
|
|
select_test(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
multi_perform(multi, &still_running);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
#ifdef LIB1502
|
|
/* undocumented cleanup sequence - type UA */
|
|
curl_multi_cleanup(multi);
|
|
curl_easy_cleanup(easy);
|
|
curl_global_cleanup();
|
|
#endif
|
|
|
|
#ifdef LIB1503
|
|
/* proper cleanup sequence - type PA */
|
|
curl_multi_remove_handle(multi, easy);
|
|
curl_multi_cleanup(multi);
|
|
curl_easy_cleanup(easy);
|
|
curl_global_cleanup();
|
|
#endif
|
|
|
|
#ifdef LIB1504
|
|
/* undocumented cleanup sequence - type UB */
|
|
curl_easy_cleanup(easy);
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
#endif
|
|
|
|
#ifdef LIB1505
|
|
/* proper cleanup sequence - type PB */
|
|
curl_multi_remove_handle(multi, easy);
|
|
curl_easy_cleanup(easy);
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
#endif
|
|
|
|
curl_slist_free_all(dns_cache_list);
|
|
|
|
return res;
|
|
}
|