moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Correct error code for CCC/SSL shutdown failure

Browse Source
This commit is contained in:
Linus Nielsen Feltzing 2007-01-08 11:24:11 +00:00
parent 55123424c8
commit d465199411
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/curl/curl.h
View File

@ -397,8 +397,8 @@ typedef enum {
generic so the error message will be of
interest when this has happened */
CURLE_FTP_SSL_CCC_FAILED, /* 80 - Failed to clear the FTP command
channel */
CURLE_SSL_SHUTDOWN_FAILED, /* 80 - Failed to shut down the SSL
connection */
CURL_LAST /* never use! */
} CURLcode;

6
lib/ftp.c
View File

@ -2563,8 +2563,10 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
/* First shut down the SSL layer (note: this call will block) */
result = Curl_ssl_shutdown(conn, FIRSTSOCKET);
if(result)
return CURLE_FTP_SSL_CCC_FAILED;
if(result) {
failf(conn->data, "Failed to clear the command channel (CCC)");
return result;
}
/* Then continue as normal */
result = ftp_state_pwd(conn);

6
lib/sslgen.c
View File

@ -401,10 +401,12 @@ CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex)
{
if(conn->ssl[sockindex].use) {
#ifdef USE_SSLEAY
return Curl_ossl_shutdown(conn, sockindex);
if(Curl_ossl_shutdown(conn, sockindex))
return CURLE_SSL_SHUTDOWN_FAILED;
#else
#ifdef USE_GNUTLS
return Curl_gtls_shutdown(conn, sockindex);
if(Curl_gtls_shutdown(conn, sockindex))
return CURLE_SSL_SHUTDOWN_FAILED;
#else
(void)conn;
(void)sockindex;

4
lib/strerror.c
View File

@ -244,8 +244,8 @@ curl_easy_strerror(CURLcode error)
case CURLE_FTP_SSL_FAILED:
return "Requested FTP SSL level failed";
case CURLE_FTP_SSL_CCC_FAILED:
return "Failed to clear the FTP command channel";
case CURLE_SSL_SHUTDOWN_FAILED:
return "Failed to shut down the SSL connection";
case CURLE_SEND_FAIL_REWIND:
return "Send failed since rewinding of the data stream failed";