- I was going to fix issue #59 in KNOWN_BUGS
If the CURLOPT_PORT option is used on an FTP URL like "ftp://example.com/file;type=A" the ";type=A" is stripped off. I added test case 562 to verify, only to find out that I couldn't repeat this bug so I hereby consider it not a bug anymore!
This commit is contained in:
parent
22e2ecb003
commit
6b95c4e358
10
CHANGES
10
CHANGES
@ -6,6 +6,16 @@
|
|||||||
|
|
||||||
Changelog
|
Changelog
|
||||||
|
|
||||||
|
|
||||||
|
Daniel Stenberg (30 Apr 2009)
|
||||||
|
- I was going to fix issue #59 in KNOWN_BUGS
|
||||||
|
|
||||||
|
If the CURLOPT_PORT option is used on an FTP URL like
|
||||||
|
"ftp://example.com/file;type=A" the ";type=A" is stripped off.
|
||||||
|
|
||||||
|
I added test case 562 to verify, only to find out that I couldn't repeat
|
||||||
|
this bug so I hereby consider it not a bug anymore!
|
||||||
|
|
||||||
Daniel Stenberg (29 Apr 2009)
|
Daniel Stenberg (29 Apr 2009)
|
||||||
- Based on bug report #2723219 (http://curl.haxx.se/bug/view.cgi?id=2723219)
|
- Based on bug report #2723219 (http://curl.haxx.se/bug/view.cgi?id=2723219)
|
||||||
I've now made TFTP "connections" not being kept for re-use within libcurl.
|
I've now made TFTP "connections" not being kept for re-use within libcurl.
|
||||||
|
@ -27,9 +27,6 @@ may have been fixed since this was written!
|
|||||||
is waiting for the the 100-continue response.
|
is waiting for the the 100-continue response.
|
||||||
http://curl.haxx.se/mail/lib-2008-08/0462.html
|
http://curl.haxx.se/mail/lib-2008-08/0462.html
|
||||||
|
|
||||||
59. If the CURLOPT_PORT option is used on an FTP URL like
|
|
||||||
"ftp://example.com/file;type=A" the ";type=A" is stripped off.
|
|
||||||
|
|
||||||
58. It seems sensible to be able to use CURLOPT_NOBODY and
|
58. It seems sensible to be able to use CURLOPT_NOBODY and
|
||||||
CURLOPT_FAILONERROR with FTP to detect if a file exists or not, but it is
|
CURLOPT_FAILONERROR with FTP to detect if a file exists or not, but it is
|
||||||
not working: http://curl.haxx.se/mail/lib-2008-07/0295.html
|
not working: http://curl.haxx.se/mail/lib-2008-07/0295.html
|
||||||
|
53
tests/data/test562
Normal file
53
tests/data/test562
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
<testcase>
|
||||||
|
<info>
|
||||||
|
<keywords>
|
||||||
|
FTP
|
||||||
|
PASV
|
||||||
|
RETR
|
||||||
|
</keywords>
|
||||||
|
</info>
|
||||||
|
# Server-side
|
||||||
|
<reply>
|
||||||
|
<data>
|
||||||
|
silly data
|
||||||
|
over FTP
|
||||||
|
</data>
|
||||||
|
</reply>
|
||||||
|
|
||||||
|
# Client-side
|
||||||
|
<client>
|
||||||
|
<server>
|
||||||
|
ftp
|
||||||
|
</server>
|
||||||
|
<tool>
|
||||||
|
lib562
|
||||||
|
</tool>
|
||||||
|
<name>
|
||||||
|
FTP a type=A URL and CURLOPT_PORT set
|
||||||
|
</name>
|
||||||
|
|
||||||
|
# note that we need quotes around the URL below to make sure the shell doesn't
|
||||||
|
# treat the semicolon as a separator!
|
||||||
|
<command>
|
||||||
|
'ftp://%HOSTIP:23456/562;type=A' %FTPPORT
|
||||||
|
</command>
|
||||||
|
|
||||||
|
</client>
|
||||||
|
|
||||||
|
# Verify data after the test has been "shot"
|
||||||
|
#
|
||||||
|
# There's no MTDM in the protocol here since this code doesn't ask for the
|
||||||
|
# time/date of the file
|
||||||
|
<verify>
|
||||||
|
<protocol>
|
||||||
|
USER anonymous
|
||||||
|
PASS ftp@example.com
|
||||||
|
PWD
|
||||||
|
EPSV
|
||||||
|
TYPE A
|
||||||
|
SIZE 562
|
||||||
|
RETR 562
|
||||||
|
QUIT
|
||||||
|
</protocol>
|
||||||
|
</verify>
|
||||||
|
</testcase>
|
@ -10,7 +10,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \
|
|||||||
lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527 \
|
lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527 \
|
||||||
lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \
|
lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \
|
||||||
lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 \
|
lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 \
|
||||||
lib539 lib557 lib558 lib559 lib560
|
lib539 lib557 lib558 lib559 lib560 lib562
|
||||||
|
|
||||||
|
|
||||||
lib500_SOURCES = lib500.c $(SUPPORTFILES)
|
lib500_SOURCES = lib500.c $(SUPPORTFILES)
|
||||||
@ -123,3 +123,5 @@ lib559_SOURCES = lib558.c $(SUPPORTFILES)
|
|||||||
lib559_CFLAGS = -DLIB559
|
lib559_CFLAGS = -DLIB559
|
||||||
|
|
||||||
lib560_SOURCES = lib560.c $(SUPPORTFILES)
|
lib560_SOURCES = lib560.c $(SUPPORTFILES)
|
||||||
|
|
||||||
|
lib562_SOURCES = lib562.c $(SUPPORTFILES)
|
||||||
|
74
tests/libtest/lib562.c
Normal file
74
tests/libtest/lib562.c
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* _ _ ____ _
|
||||||
|
* Project ___| | | | _ \| |
|
||||||
|
* / __| | | | |_) | |
|
||||||
|
* | (__| |_| | _ <| |___
|
||||||
|
* \___|\___/|_| \_\_____|
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "setup.h" /* struct_stat etc. */
|
||||||
|
#include "test.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_SOCKET_H
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_SYS_TYPES_H
|
||||||
|
#include <sys/types.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_SYS_STAT_H
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_FCNTL_H
|
||||||
|
#include <fcntl.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "memdebug.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* From "KNOWN_BUGS" April 2009:
|
||||||
|
|
||||||
|
59. If the CURLOPT_PORT option is used on an FTP URL like
|
||||||
|
"ftp://example.com/file;type=A" the ";type=A" is stripped off.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
int test(char *URL)
|
||||||
|
{
|
||||||
|
CURL *curl;
|
||||||
|
CURLcode res = CURLE_OK;
|
||||||
|
|
||||||
|
if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
||||||
|
fprintf(stderr, "curl_global_init() failed\n");
|
||||||
|
return TEST_ERR_MAJOR_BAD;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* get a curl handle */
|
||||||
|
if ((curl = curl_easy_init()) == NULL) {
|
||||||
|
fprintf(stderr, "curl_easy_init() failed\n");
|
||||||
|
curl_global_cleanup();
|
||||||
|
return TEST_ERR_MAJOR_BAD;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* enable verbose */
|
||||||
|
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
||||||
|
|
||||||
|
/* set port number */
|
||||||
|
curl_easy_setopt(curl, CURLOPT_PORT, atoi(libtest_arg2) );
|
||||||
|
|
||||||
|
/* specify target */
|
||||||
|
curl_easy_setopt(curl,CURLOPT_URL, URL);
|
||||||
|
|
||||||
|
/* Now run off and do what you've been told! */
|
||||||
|
res = curl_easy_perform(curl);
|
||||||
|
|
||||||
|
curl_easy_cleanup(curl);
|
||||||
|
curl_global_cleanup();
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user