diff options
| -rw-r--r-- | include/curl/curl.h | 5 | ||||
| -rw-r--r-- | lib/ftp.c | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 46ccf164b..200188d91 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -309,8 +309,9 @@ typedef size_t (*curl_read_callback)(char *buffer, void *instream); typedef enum { - CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */ - CURLSOCKTYPE_LAST /* never use */ + CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */ + CURLSOCKTYPE_ACCEPT, /* socket created by accept() call */ + CURLSOCKTYPE_LAST /* never use */ } curlsocktype; /* The return code from the sockopt_callback can signal information back @@ -348,6 +348,20 @@ static CURLcode AcceptServerConnect(struct connectdata *conn) } infof(data, "Connection accepted from server\n"); + if(data->set.fsockopt) { + int error = 0; + + /* activate callback for setting socket options */ + error = data->set.fsockopt(data->set.sockopt_client, + s, + CURLSOCKTYPE_ACCEPT); + + if(error) { + Curl_closesocket(conn, s); /* close the socket and bail out */ + return CURLE_ABORTED_BY_CALLBACK; + } + } + conn->sock[SECONDARYSOCKET] = s; curlx_nonblock(s, TRUE); /* enable non-blocking */ conn->sock_accepted[SECONDARYSOCKET] = TRUE; |