mirror of
https://github.com/moparisthebest/curl
synced 2024-11-14 05:25:06 -05:00
c834213ad5
1- Two new error codes are introduced. CURLE_FTP_ACCEPT_FAILED to be set whenever ACCEPTing fails because of FTP server connected. CURLE_FTP_ACCEPT_TIMEOUT to be set whenever ACCEPTing timeouts. Neither of these errors are considered fatal and control connection remains OK because it could just be a firewall blocking server to connect to the client. 2- One new setopt option was introduced. CURLOPT_ACCEPTTIMEOUT_MS It sets the maximum amount of time FTP client is going to wait for a server to connect. Internal default accept timeout is 60 seconds.
145 lines
3.4 KiB
C
145 lines
3.4 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"
|
|
|
|
/* lib591 is used for test cases 591, 592, 593 and 594 */
|
|
|
|
#include <fcntl.h>
|
|
|
|
#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 res = 0;
|
|
int running;
|
|
int msgs_left;
|
|
CURLMsg *msg;
|
|
FILE *upload = NULL;
|
|
int error;
|
|
|
|
start_test_timing();
|
|
|
|
upload = fopen(libtest_arg3, "rb");
|
|
if(!upload) {
|
|
error = ERRNO;
|
|
fprintf(stderr, "fopen() failed with error: %d (%s)\n",
|
|
error, strerror(error));
|
|
fprintf(stderr, "Error opening file: (%s)\n", libtest_arg3);
|
|
return TEST_ERR_FOPEN;
|
|
}
|
|
|
|
res_global_init(CURL_GLOBAL_ALL);
|
|
if(res) {
|
|
fclose(upload);
|
|
return res;
|
|
}
|
|
|
|
easy_init(easy);
|
|
|
|
/* go verbose */
|
|
easy_setopt(easy, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* specify target */
|
|
easy_setopt(easy, CURLOPT_URL, URL);
|
|
|
|
/* enable uploading */
|
|
easy_setopt(easy, CURLOPT_UPLOAD, 1L);
|
|
|
|
/* data pointer for the file read function */
|
|
easy_setopt(easy, CURLOPT_READDATA, upload);
|
|
|
|
/* use active mode FTP */
|
|
easy_setopt(easy, CURLOPT_FTPPORT, "-");
|
|
|
|
/* server connection timeout */
|
|
easy_setopt(easy, CURLOPT_ACCEPTTIMEOUT_MS,
|
|
strtol(libtest_arg2, NULL, 10)*1000);
|
|
|
|
multi_init(multi);
|
|
|
|
multi_add_handle(multi, easy);
|
|
|
|
for(;;) {
|
|
struct timeval interval;
|
|
fd_set fdread;
|
|
fd_set fdwrite;
|
|
fd_set fdexcep;
|
|
long timeout = -99;
|
|
int maxfd = -99;
|
|
|
|
multi_perform(multi, &running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
if(!running)
|
|
break; /* done */
|
|
|
|
FD_ZERO(&fdread);
|
|
FD_ZERO(&fdwrite);
|
|
FD_ZERO(&fdexcep);
|
|
|
|
multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd);
|
|
|
|
/* At this point, maxfd is guaranteed to be greater or equal than -1. */
|
|
|
|
multi_timeout(multi, &timeout);
|
|
|
|
/* At this point, timeout is guaranteed to be greater or equal than -1. */
|
|
|
|
if(timeout != -1L) {
|
|
interval.tv_sec = timeout/1000;
|
|
interval.tv_usec = (timeout%1000)*1000;
|
|
}
|
|
else {
|
|
interval.tv_sec = 0;
|
|
interval.tv_usec = 100000L; /* 100 ms */
|
|
}
|
|
|
|
select_test(maxfd+1, &fdread, &fdwrite, &fdexcep, &interval);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
msg = curl_multi_info_read(multi, &msgs_left);
|
|
if(msg)
|
|
res = msg->data.result;
|
|
|
|
test_cleanup:
|
|
|
|
/* undocumented cleanup sequence - type UA */
|
|
|
|
curl_multi_cleanup(multi);
|
|
curl_easy_cleanup(easy);
|
|
curl_global_cleanup();
|
|
|
|
/* close the local file */
|
|
fclose(upload);
|
|
|
|
return res;
|
|
}
|