Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
c31451cf
Commit
c31451cf
authored
19 years ago
by
Daniel Stenberg
Browse files
Options
Downloads
Patches
Plain Diff
Jon Turner pointed out that doing -P [hostname] with curl (built ipv4-only)
didn't work.
parent
5deff1a1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGES
+4
-0
4 additions, 0 deletions
CHANGES
RELEASE-NOTES
+2
-1
2 additions, 1 deletion
RELEASE-NOTES
lib/ftp.c
+11
-2
11 additions, 2 deletions
lib/ftp.c
with
17 additions
and
3 deletions
CHANGES
+
4
−
0
View file @
c31451cf
...
...
@@ -6,6 +6,10 @@
Changelog
Daniel (19 January 2006)
- Jon Turner pointed out that doing -P [hostname] with curl (built ipv4-only)
didn't work.
Daniel (18 January 2006)
- As reported in bug #1408742 (http://curl.haxx.se/bug/view.cgi?id=1408742),
the configure script complained about a missing "missing" script if you ran
...
...
This diff is collapsed.
Click to expand it.
RELEASE-NOTES
+
2
−
1
View file @
c31451cf
...
...
@@ -18,6 +18,7 @@ This release includes the following changes:
This release includes the following bugfixes:
o -P [hostname] with ipv6-disabled curl
o libcurl.m4 was updated
o configure no longer warns if the current path contains a space
o test suite kill race condition
...
...
@@ -43,6 +44,6 @@ advice from friends like these:
Dov Murik, Jean Jacques Drouin, Andres Garcia, Yang Tse, Gisle Vanem, Dan
Fandrich, Alexander Lazic, Michael Jahn, Andrew Benham, Bryan Henderson,
David Shaw
David Shaw
, Jon Turner
Thanks! (and sorry if I forgot to mention someone)
This diff is collapsed.
Click to expand it.
lib/ftp.c
+
11
−
2
View file @
c31451cf
...
...
@@ -1011,6 +1011,8 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
bool
sa_filled_in
=
FALSE
;
Curl_addrinfo
*
addr
=
NULL
;
unsigned
short
ip
[
4
];
bool
freeaddr
=
TRUE
;
(
void
)
fcmd
;
/* not used in the IPv4 code */
if
(
data
->
set
.
ftpport
)
{
in_addr_t
in
;
...
...
@@ -1030,7 +1032,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
else
if
(
strlen
(
data
->
set
.
ftpport
)
>
1
)
{
/* might be a host name! */
struct
Curl_dns_entry
*
h
=
NULL
;
int
rc
=
Curl_resolv
(
conn
,
myhos
t
,
0
,
&
h
);
int
rc
=
Curl_resolv
(
conn
,
data
->
set
.
ftppor
t
,
0
,
&
h
);
if
(
rc
==
CURLRESOLV_PENDING
)
/* BLOCKING */
rc
=
Curl_wait_for_resolv
(
conn
,
&
h
);
...
...
@@ -1039,7 +1041,13 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
/* when we return from this function, we can forget about this entry
so we can unlock it now already */
Curl_resolv_unlock
(
data
,
h
);
freeaddr
=
FALSE
;
/* make sure we don't free 'addr' in this function
since it points to a DNS cache entry! */
}
/* (h) */
else
{
infof
(
data
,
"Failed to resolve host name %s
\n
"
,
data
->
set
.
ftpport
);
}
}
/* strlen */
}
/* CURL_INADDR_NONE */
}
/* data->set.ftpport */
...
...
@@ -1132,7 +1140,8 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
else
return
CURLE_FTP_PORT_FAILED
;
Curl_freeaddrinfo
(
addr
);
if
(
freeaddr
)
Curl_freeaddrinfo
(
addr
);
ftp
->
count1
=
PORT
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment