mirror of
https://github.com/moparisthebest/curl
synced 2024-12-25 01:28:51 -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
115 lines
2.9 KiB
C
115 lines
2.9 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2011, 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.
|
|
*
|
|
***************************************************************************/
|
|
#include "test.h"
|
|
|
|
#include "testutil.h"
|
|
#include "warnless.h"
|
|
#include "memdebug.h"
|
|
|
|
#define TEST_HANG_TIMEOUT 60 * 1000
|
|
|
|
/*
|
|
* Source code in here hugely as reported in bug report 651464 by
|
|
* Christopher R. Palmer.
|
|
*
|
|
* Use multi interface to get document over proxy with bad port number.
|
|
* This caused the interface to "hang" in libcurl 7.10.2.
|
|
*/
|
|
int test(char *URL)
|
|
{
|
|
CURL *c = NULL;
|
|
int res = 0;
|
|
CURLM *m = NULL;
|
|
fd_set rd, wr, exc;
|
|
int running;
|
|
|
|
start_test_timing();
|
|
|
|
global_init(CURL_GLOBAL_ALL);
|
|
|
|
easy_init(c);
|
|
|
|
/* The point here is that there must not be anything running on the given
|
|
proxy port */
|
|
if (libtest_arg2)
|
|
easy_setopt(c, CURLOPT_PROXY, libtest_arg2);
|
|
easy_setopt(c, CURLOPT_URL, URL);
|
|
easy_setopt(c, CURLOPT_VERBOSE, 1L);
|
|
|
|
multi_init(m);
|
|
|
|
multi_add_handle(m, c);
|
|
|
|
for(;;) {
|
|
struct timeval interval;
|
|
int maxfd = -99;
|
|
|
|
interval.tv_sec = 1;
|
|
interval.tv_usec = 0;
|
|
|
|
fprintf(stderr, "curl_multi_perform()\n");
|
|
|
|
multi_perform(m, &running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
if(!running) {
|
|
/* This is where this code is expected to reach */
|
|
int numleft;
|
|
CURLMsg *msg = curl_multi_info_read(m, &numleft);
|
|
fprintf(stderr, "Expected: not running\n");
|
|
if(msg && !numleft)
|
|
res = TEST_ERR_SUCCESS; /* this is where we should be */
|
|
else
|
|
res = TEST_ERR_FAILURE; /* not correct */
|
|
break; /* done */
|
|
}
|
|
fprintf(stderr, "running == %d\n", running);
|
|
|
|
FD_ZERO(&rd);
|
|
FD_ZERO(&wr);
|
|
FD_ZERO(&exc);
|
|
|
|
fprintf(stderr, "curl_multi_fdset()\n");
|
|
|
|
multi_fdset(m, &rd, &wr, &exc, &maxfd);
|
|
|
|
/* At this point, maxfd is guaranteed to be greater or equal than -1. */
|
|
|
|
select_test(maxfd+1, &rd, &wr, &exc, &interval);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
/* proper cleanup sequence - type PA */
|
|
|
|
curl_multi_remove_handle(m, c);
|
|
curl_multi_cleanup(m);
|
|
curl_easy_cleanup(c);
|
|
curl_global_cleanup();
|
|
|
|
return res;
|
|
}
|
|
|