diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | RELEASE-NOTES | 3 | ||||
| -rw-r--r-- | lib/connect.c | 10 | ||||
| -rw-r--r-- | lib/ftp.c | 4 |
4 files changed, 15 insertions, 8 deletions
@@ -6,6 +6,12 @@ Changelog +Daniel S (13 July 2007) +- Daniel Cater fixes: + 1 - made 'make vc8' work on windows. + 2 - made libcurl itself built with CURL_NO_OLDIES defined (which doesn't + define the symbols for backwards source compatibility) + Daniel S (12 July 2007) - Made the krb5 code build with Heimdal's GSSAPI lib. diff --git a/RELEASE-NOTES b/RELEASE-NOTES index f72fbdab2..64f038493 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -37,6 +37,7 @@ New curl mirrors: This release would not have looked like this without help, code, reports and advice from friends like these: - Dan Fandrich, Song Ma, Daniel Black, Giancarlo Formicuccia, Shmulik Regev + Dan Fandrich, Song Ma, Daniel Black, Giancarlo Formicuccia, Shmulik Regev, + Daniel Cater Thanks! (and sorry if I forgot to mention someone) diff --git a/lib/connect.c b/lib/connect.c index ffce3dad5..65b2878b3 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -288,7 +288,7 @@ static CURLcode bindlocal(struct connectdata *conn, sizeof(hostent_buf)); */ failf(data, "Couldn't bind to '%s'", data->set.device); - return CURLE_HTTP_PORT_FAILED; + return CURLE_INTERFACE_FAILED; } infof(data, "Bind local address to %s\n", myhost); @@ -325,7 +325,7 @@ static CURLcode bindlocal(struct connectdata *conn, #endif if (CURL_INADDR_NONE == in && -1 == in6) { failf(data,"couldn't find my own IP address (%s)", myhost); - return CURLE_HTTP_PORT_FAILED; + return CURLE_INTERFACE_FAILED; } /* end of inet_addr */ if ( h ) { @@ -334,7 +334,7 @@ static CURLcode bindlocal(struct connectdata *conn, socksize = addr->ai_addrlen; } else - return CURLE_HTTP_PORT_FAILED; + return CURLE_INTERFACE_FAILED; } else if(port) { @@ -370,7 +370,7 @@ static CURLcode bindlocal(struct connectdata *conn, size = sizeof(add); if(getsockname(sockfd, (struct sockaddr *) &add, &size) < 0) { failf(data, "getsockname() failed"); - return CURLE_HTTP_PORT_FAILED; + return CURLE_INTERFACE_FAILED; } /* We re-use/clobber the port variable here below */ if(((struct sockaddr *)&add)->sa_family == AF_INET) @@ -393,7 +393,7 @@ static CURLcode bindlocal(struct connectdata *conn, data->state.os_errno = SOCKERRNO; failf(data, "bind failure: %s", Curl_strerror(conn, data->state.os_errno)); - return CURLE_HTTP_PORT_FAILED; + return CURLE_INTERFACE_FAILED; } @@ -2157,7 +2157,7 @@ static CURLcode ftp_state_stor_resp(struct connectdata *conn, if(ftpcode>=400) { failf(data, "Failed FTP upload: %0d", ftpcode); /* oops, we never close the sockets! */ - return CURLE_FTP_COULDNT_STOR_FILE; + return CURLE_UPLOAD_FAILED; } if(data->set.ftp_use_port) { @@ -3055,7 +3055,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn, CURLcode status, bool premature case CURLE_FTP_PORT_FAILED: case CURLE_FTP_COULDNT_SET_BINARY: case CURLE_FTP_COULDNT_RETR_FILE: - case CURLE_FTP_COULDNT_STOR_FILE: + case CURLE_UPLOAD_FAILED: case CURLE_FTP_ACCESS_DENIED: case CURLE_FILESIZE_EXCEEDED: /* the connection stays alive fine even though this happened */ |