generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

another multiple FTP transfer fix

Browse Source
This commit is contained in:
Daniel Stenberg 2001-05-11 06:40:04 +00:00
parent fef1fc0d32
commit 282939c6fe
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/url.c
View File

@ -2019,6 +2019,7 @@ static CURLcode Connect(struct UrlData *data,
*/ */
struct connectdata *old_conn = conn; struct connectdata *old_conn = conn;
char *path = old_conn->path; /* setup the current path pointer properly */ char *path = old_conn->path; /* setup the current path pointer properly */
char *ppath = old_conn->ppath; /* this is the modified path pointer */
if(old_conn->proxyhost) if(old_conn->proxyhost)
free(old_conn->proxyhost); free(old_conn->proxyhost);
conn = conn_temp; /* use this connection from now on */ conn = conn_temp; /* use this connection from now on */
@ -2027,19 +2028,17 @@ static CURLcode Connect(struct UrlData *data,
conn->name = conn->gname; conn->name = conn->gname;
conn->hostname = old_conn->gname; conn->hostname = old_conn->gname;
conn->path = path; /* use this one */ free(conn->path); /* free the previously allocated path pointer */
/* The 'ppath' may have been advanced a few steps from the 'path' start /* 'path' points to the allocated data, 'ppath' may have been advanced
point. We must also advance our new pointer as many steps as the to point somewhere within the 'path' area. */
previous one was! This was the cause of the multiple ftp file bug conn->path = path;
found on May 9 2001 libcurl 7.7.3 */ conn->ppath = ppath;
conn->ppath = (old_conn->ppath - old_conn->path)+path;
free(old_conn->path); /* free the previous path pointer */
/* re-use init */ /* re-use init */
conn->bits.reuse = TRUE; /* yes, we're re-using here */ conn->bits.reuse = TRUE; /* yes, we're re-using here */
conn->bits.chunk = FALSE; /* always assume not chunked unless told otherwise */ conn->bits.chunk = FALSE; /* always assume not chunked unless told
otherwise */
conn->maxdownload = -1; /* might have been used previously! */ conn->maxdownload = -1; /* might have been used previously! */
free(old_conn); /* we don't need this anymore */ free(old_conn); /* we don't need this anymore */