romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 18:57:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Bogdan Nicula's hanging test case was converted to test case 533 and the test

Browse source 
now runs fine.
This commit is contained in:
Daniel Stenberg 2006-10-06 21:19:57 +00:00
parent ca5846cde9
commit befc30bc55
7 changed files with 189 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

53
tests/data/test533 Normal file
View file

@ -0,0 +1,53 @@
<info>
<keywords>
FTP
PASV
RETR
</keywords>
</info>
# Server-side
<reply>
<data>
</data>
<servercmd>
REPLY RETR 550 the file doesn't exist
REPLY SIZE 550 Can't check for file existence
</servercmd>
</reply>
# Client-side
<client>
<server>
ftp
</server>
<tool>
lib533
</tool>
<name>
FTP RETR a non-existing file twice using the multi interface
</name>
<command>
ftp://%HOSTIP:%FTPPORT/path/533
</command>
</client>
# Verify data after the test has been "shot"
<verify>
<strip>
</strip>
<protocol>
USER anonymous
PASS curl_by_daniel@haxx.se
PWD
CWD path
EPSV
TYPE I
SIZE 533
RETR 533
EPSV
SIZE 533
RETR 533
QUIT
</protocol>
</verify>

7
tests/libtest/Makefile.am
View file

@ -42,7 +42,7 @@ SUPPORTFILES = first.c test.h
noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \
lib507 lib508 lib509 lib510 lib511 lib512 lib513 lib514 lib515 lib516 \
lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527 \
lib529 lib530 lib532
lib529 lib530 lib532 lib533
lib500_SOURCES = lib500.c $(SUPPORTFILES)
lib500_LDADD = $(LIBDIR)/libcurl.la
@ -168,3 +168,8 @@ lib532_SOURCES = lib526.c $(SUPPORTFILES)
lib532_CFLAGS = -DLIB532
lib532_LDADD = $(LIBDIR)/libcurl.la
lib532_DEPENDENCIES = $(LIBDIR)/libcurl.la
lib533_SOURCES = lib533.c $(SUPPORTFILES)
lib533_LDADD = $(LIBDIR)/libcurl.la
lib533_DEPENDENCIES = $(LIBDIR)/libcurl.la

113
tests/libtest/lib533.c Normal file
View file

@ -0,0 +1,113 @@
/*****************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* $Id$
*/
#include "test.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
int test(char *URL)
{
int res = 0;
CURL *curl;
int running;
char done=FALSE;
CURLM *m;
int current=0;
int i;
/* In windows, this will init the winsock stuff */
curl_global_init(CURL_GLOBAL_ALL);
curl = curl_easy_init();
if(!curl)
return 100 + i; /* major bad */
curl_easy_setopt(curl, CURLOPT_URL, URL);
/* go verbose */
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
m = curl_multi_init();
res = (int)curl_multi_add_handle(m, curl);
fprintf(stderr, "Start at URL 0\n");
while(!done) {
fd_set rd, wr, exc;
int max_fd;
struct timeval interval;
interval.tv_sec = 1;
interval.tv_usec = 0;
while (res == CURLM_CALL_MULTI_PERFORM) {
res = (int)curl_multi_perform(m, &running);
if (running <= 0) {
if(!current++) {
fprintf(stderr, "Advancing to URL 1\n");
/* remove the handle we use */
curl_multi_remove_handle(m, curl);
/* make us re-use the same handle all the time, and try resetting
the handle first too */
curl_easy_reset(curl);
curl_easy_setopt(curl, CURLOPT_URL, URL);
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
/* re-add it */
res = (int)curl_multi_add_handle(m, curl);
if(res) {
fprintf(stderr, "add handle failed: %d.\n", res);
res = 243;
break;
}
}
else
done = TRUE; /* bail out */
break;
}
}
if(done)
break;
if (res != CURLM_OK) {
fprintf(stderr, "not okay???\n");
break;
}
FD_ZERO(&rd);
FD_ZERO(&wr);
FD_ZERO(&exc);
max_fd = 0;
if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) {
fprintf(stderr, "unexpected failured of fdset.\n");
res = 189;
break;
}
if (select_test(max_fd+1, &rd, &wr, &exc, &interval) == -1) {
fprintf(stderr, "bad select??\n");
res = 195;
break;
}
res = CURLM_CALL_MULTI_PERFORM;
}
curl_easy_cleanup(curl);
curl_multi_cleanup(m);
curl_global_cleanup();
return res;
}