CURLOPT_SERVER_RESPONSE_TIMEOUT: the new name
Starting now, CURLOPT_FTP_RESPONSE_TIMEOUT is the alias instead of the other way around. Since 7.20.0, CURLOPT_SERVER_RESPONSE_TIMEOUT has existed as an alias but since the option is for more protocols than FTP the more "correct" version of the option is the "server" one so now we switch. Closes #9104
This commit is contained in:
Родитель
671cc8e110
Коммит
be43dd600a
|
@ -86,7 +86,7 @@ static int upload(CURL *curlhandle, const char *remotepath,
|
|||
curl_easy_setopt(curlhandle, CURLOPT_URL, remotepath);
|
||||
|
||||
if(timeout)
|
||||
curl_easy_setopt(curlhandle, CURLOPT_FTP_RESPONSE_TIMEOUT, timeout);
|
||||
curl_easy_setopt(curlhandle, CURLOPT_SERVER_RESPONSE_TIMEOUT, timeout);
|
||||
|
||||
curl_easy_setopt(curlhandle, CURLOPT_HEADERFUNCTION, getcontentlengthfunc);
|
||||
curl_easy_setopt(curlhandle, CURLOPT_HEADERDATA, &uploaded_len);
|
||||
|
|
|
@ -409,8 +409,8 @@ Use EPSV. See \fICURLOPT_FTP_USE_EPSV(3)\fP
|
|||
Use PRET. See \fICURLOPT_FTP_USE_PRET(3)\fP
|
||||
.IP CURLOPT_FTP_CREATE_MISSING_DIRS
|
||||
Create missing directories on the remote server. See \fICURLOPT_FTP_CREATE_MISSING_DIRS(3)\fP
|
||||
.IP CURLOPT_FTP_RESPONSE_TIMEOUT
|
||||
Timeout for FTP responses. See \fICURLOPT_FTP_RESPONSE_TIMEOUT(3)\fP
|
||||
.IP CURLOPT_SERVER_RESPONSE_TIMEOUT
|
||||
Timeout for server responses. See \fICURLOPT_SERVER_RESPONSE_TIMEOUT(3)\fP
|
||||
.IP CURLOPT_FTP_ALTERNATIVE_TO_USER
|
||||
Alternative to USER. See \fICURLOPT_FTP_ALTERNATIVE_TO_USER(3)\fP
|
||||
.IP CURLOPT_FTP_SKIP_PASV_IP
|
||||
|
|
|
@ -63,4 +63,4 @@ Added in 7.15.5
|
|||
Returns CURLE_OK if the option is supported, CURLE_UNKNOWN_OPTION if not, or
|
||||
CURLE_OUT_OF_MEMORY if there was insufficient heap space.
|
||||
.SH "SEE ALSO"
|
||||
.BR CURLOPT_FTP_SKIP_PASV_IP "(3), " CURLOPT_FTP_RESPONSE_TIMEOUT "(3), "
|
||||
.BR CURLOPT_FTP_SKIP_PASV_IP "(3), " CURLOPT_SERVER_RESPONSE_TIMEOUT "(3), "
|
||||
|
|
|
@ -22,14 +22,14 @@
|
|||
.\" *
|
||||
.\" **************************************************************************
|
||||
.\"
|
||||
.TH CURLOPT_FTP_RESPONSE_TIMEOUT 3 "19 Jun 2014" "libcurl 7.37.0" "curl_easy_setopt options"
|
||||
.TH CURLOPT_SERVER_RESPONSE_TIMEOUT 3 "19 Jun 2014" "libcurl 7.37.0" "curl_easy_setopt options"
|
||||
.SH NAME
|
||||
CURLOPT_FTP_RESPONSE_TIMEOUT \- time allowed to wait for FTP response
|
||||
CURLOPT_SERVER_RESPONSE_TIMEOUT \- time allowed to wait for server response
|
||||
.SH SYNOPSIS
|
||||
.nf
|
||||
#include <curl/curl.h>
|
||||
|
||||
CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_RESPONSE_TIMEOUT,
|
||||
CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SERVER_RESPONSE_TIMEOUT,
|
||||
long timeout);
|
||||
.fi
|
||||
.SH DESCRIPTION
|
||||
|
@ -38,28 +38,30 @@ amount of time that the server is allowed to take in order to send a response
|
|||
message for a command before the session is considered dead. While libcurl is
|
||||
waiting for a response, this value overrides \fICURLOPT_TIMEOUT(3)\fP. It is
|
||||
recommended that if used in conjunction with \fICURLOPT_TIMEOUT(3)\fP, you set
|
||||
\fICURLOPT_FTP_RESPONSE_TIMEOUT(3)\fP to a value smaller than
|
||||
\fICURLOPT_SERVER_RESPONSE_TIMEOUT(3)\fP to a value smaller than
|
||||
\fICURLOPT_TIMEOUT(3)\fP.
|
||||
|
||||
This option was formerly known as \fBCURLOPT_FTP_RESPONSE_TIMEOUT\fP.
|
||||
.SH DEFAULT
|
||||
None
|
||||
.SH PROTOCOLS
|
||||
FTP
|
||||
FTP, IMAP, POP3 and SMTP
|
||||
.SH EXAMPLE
|
||||
.nf
|
||||
CURL *curl = curl_easy_init();
|
||||
if(curl) {
|
||||
curl_easy_setopt(curl, CURLOPT_URL, "ftp://example.com/slow.txt");
|
||||
/* wait no more than 23 seconds */
|
||||
curl_easy_setopt(curl, CURLOPT_FTP_RESPONSE_TIMEOUT, 23L);
|
||||
curl_easy_setopt(curl, CURLOPT_SERVER_RESPONSE_TIMEOUT, 23L);
|
||||
ret = curl_easy_perform(curl);
|
||||
|
||||
curl_easy_cleanup(curl);
|
||||
}
|
||||
.fi
|
||||
.SH AVAILABILITY
|
||||
Added in 7.10.8
|
||||
Added in 7.10.8. Used under this name since 7.20.0
|
||||
.SH RETURN VALUE
|
||||
Returns CURLE_OK if FTP is supported, and CURLE_UNKNOWN_OPTION if not. Returns
|
||||
Returns CURLE_OK if supported, and CURLE_UNKNOWN_OPTION if not. Returns
|
||||
CURLE_BAD_FUNCTION_ARGUMENT if set to a negative value or a value that when
|
||||
converted to milliseconds is too large.
|
||||
.SH "SEE ALSO"
|
|
@ -45,9 +45,9 @@ man_MANS = \
|
|||
CURLINFO_FILETIME_T.3 \
|
||||
CURLINFO_FTP_ENTRY_PATH.3 \
|
||||
CURLINFO_HEADER_SIZE.3 \
|
||||
CURLINFO_HTTPAUTH_AVAIL.3 \
|
||||
CURLINFO_HTTP_CONNECTCODE.3 \
|
||||
CURLINFO_HTTP_VERSION.3 \
|
||||
CURLINFO_HTTPAUTH_AVAIL.3 \
|
||||
CURLINFO_LASTSOCKET.3 \
|
||||
CURLINFO_LOCAL_IP.3 \
|
||||
CURLINFO_LOCAL_PORT.3 \
|
||||
|
@ -95,11 +95,11 @@ man_MANS = \
|
|||
CURLINFO_TOTAL_TIME_T.3 \
|
||||
CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3 \
|
||||
CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3 \
|
||||
CURLMOPT_MAXCONNECTS.3 \
|
||||
CURLMOPT_MAX_CONCURRENT_STREAMS.3 \
|
||||
CURLMOPT_MAX_HOST_CONNECTIONS.3 \
|
||||
CURLMOPT_MAX_PIPELINE_LENGTH.3 \
|
||||
CURLMOPT_MAX_TOTAL_CONNECTIONS.3 \
|
||||
CURLMOPT_MAXCONNECTS.3 \
|
||||
CURLMOPT_PIPELINING.3 \
|
||||
CURLMOPT_PIPELINING_SERVER_BL.3 \
|
||||
CURLMOPT_PIPELINING_SITE_BL.3 \
|
||||
|
@ -110,13 +110,14 @@ man_MANS = \
|
|||
CURLMOPT_TIMERDATA.3 \
|
||||
CURLMOPT_TIMERFUNCTION.3 \
|
||||
CURLOPT_ABSTRACT_UNIX_SOCKET.3 \
|
||||
CURLOPT_ACCEPTTIMEOUT_MS.3 \
|
||||
CURLOPT_ACCEPT_ENCODING.3 \
|
||||
CURLOPT_ACCEPTTIMEOUT_MS.3 \
|
||||
CURLOPT_ADDRESS_SCOPE.3 \
|
||||
CURLOPT_ALTSVC.3 \
|
||||
CURLOPT_ALTSVC_CTRL.3 \
|
||||
CURLOPT_APPEND.3 \
|
||||
CURLOPT_AUTOREFERER.3 \
|
||||
CURLOPT_AWS_SIGV4.3 \
|
||||
CURLOPT_BUFFERSIZE.3 \
|
||||
CURLOPT_CAINFO.3 \
|
||||
CURLOPT_CAINFO_BLOB.3 \
|
||||
|
@ -127,10 +128,10 @@ man_MANS = \
|
|||
CURLOPT_CHUNK_END_FUNCTION.3 \
|
||||
CURLOPT_CLOSESOCKETDATA.3 \
|
||||
CURLOPT_CLOSESOCKETFUNCTION.3 \
|
||||
CURLOPT_CONNECTTIMEOUT.3 \
|
||||
CURLOPT_CONNECTTIMEOUT_MS.3 \
|
||||
CURLOPT_CONNECT_ONLY.3 \
|
||||
CURLOPT_CONNECT_TO.3 \
|
||||
CURLOPT_CONNECTTIMEOUT.3 \
|
||||
CURLOPT_CONNECTTIMEOUT_MS.3 \
|
||||
CURLOPT_CONV_FROM_NETWORK_FUNCTION.3 \
|
||||
CURLOPT_CONV_FROM_UTF8_FUNCTION.3 \
|
||||
CURLOPT_CONV_TO_NETWORK_FUNCTION.3 \
|
||||
|
@ -170,18 +171,17 @@ man_MANS = \
|
|||
CURLOPT_FOLLOWLOCATION.3 \
|
||||
CURLOPT_FORBID_REUSE.3 \
|
||||
CURLOPT_FRESH_CONNECT.3 \
|
||||
CURLOPT_FTPPORT.3 \
|
||||
CURLOPT_FTPSSLAUTH.3 \
|
||||
CURLOPT_FTP_ACCOUNT.3 \
|
||||
CURLOPT_FTP_ALTERNATIVE_TO_USER.3 \
|
||||
CURLOPT_FTP_CREATE_MISSING_DIRS.3 \
|
||||
CURLOPT_FTP_FILEMETHOD.3 \
|
||||
CURLOPT_FTP_RESPONSE_TIMEOUT.3 \
|
||||
CURLOPT_FTP_SKIP_PASV_IP.3 \
|
||||
CURLOPT_FTP_SSL_CCC.3 \
|
||||
CURLOPT_FTP_USE_EPRT.3 \
|
||||
CURLOPT_FTP_USE_EPSV.3 \
|
||||
CURLOPT_FTP_USE_PRET.3 \
|
||||
CURLOPT_FTPPORT.3 \
|
||||
CURLOPT_FTPSSLAUTH.3 \
|
||||
CURLOPT_GSSAPI_DELEGATION.3 \
|
||||
CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 \
|
||||
CURLOPT_HAPROXYPROTOCOL.3 \
|
||||
|
@ -190,21 +190,21 @@ man_MANS = \
|
|||
CURLOPT_HEADERFUNCTION.3 \
|
||||
CURLOPT_HEADEROPT.3 \
|
||||
CURLOPT_HSTS.3 \
|
||||
CURLOPT_HSTS_CTRL.3 \
|
||||
CURLOPT_HSTSREADDATA.3 \
|
||||
CURLOPT_HSTSREADFUNCTION.3 \
|
||||
CURLOPT_HSTSWRITEDATA.3 \
|
||||
CURLOPT_HSTSWRITEFUNCTION.3 \
|
||||
CURLOPT_HSTS_CTRL.3 \
|
||||
CURLOPT_HTTP09_ALLOWED.3 \
|
||||
CURLOPT_HTTP200ALIASES.3 \
|
||||
CURLOPT_HTTP_CONTENT_DECODING.3 \
|
||||
CURLOPT_HTTP_TRANSFER_DECODING.3 \
|
||||
CURLOPT_HTTP_VERSION.3 \
|
||||
CURLOPT_HTTPAUTH.3 \
|
||||
CURLOPT_HTTPGET.3 \
|
||||
CURLOPT_HTTPHEADER.3 \
|
||||
CURLOPT_HTTPPOST.3 \
|
||||
CURLOPT_HTTPPROXYTUNNEL.3 \
|
||||
CURLOPT_HTTP_CONTENT_DECODING.3 \
|
||||
CURLOPT_HTTP_TRANSFER_DECODING.3 \
|
||||
CURLOPT_HTTP_VERSION.3 \
|
||||
CURLOPT_IGNORE_CONTENT_LENGTH.3 \
|
||||
CURLOPT_INFILESIZE.3 \
|
||||
CURLOPT_INFILESIZE_LARGE.3 \
|
||||
|
@ -228,16 +228,16 @@ man_MANS = \
|
|||
CURLOPT_MAIL_FROM.3 \
|
||||
CURLOPT_MAIL_RCPT.3 \
|
||||
CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 \
|
||||
CURLOPT_MAX_RECV_SPEED_LARGE.3 \
|
||||
CURLOPT_MAX_SEND_SPEED_LARGE.3 \
|
||||
CURLOPT_MAXAGE_CONN.3 \
|
||||
CURLOPT_MAXCONNECTS.3 \
|
||||
CURLOPT_MAXFILESIZE.3 \
|
||||
CURLOPT_MAXFILESIZE_LARGE.3 \
|
||||
CURLOPT_MAXLIFETIME_CONN.3 \
|
||||
CURLOPT_MAXREDIRS.3 \
|
||||
CURLOPT_MAX_RECV_SPEED_LARGE.3 \
|
||||
CURLOPT_MAX_SEND_SPEED_LARGE.3 \
|
||||
CURLOPT_MIMEPOST.3 \
|
||||
CURLOPT_MIME_OPTIONS.3 \
|
||||
CURLOPT_MIMEPOST.3 \
|
||||
CURLOPT_NETRC.3 \
|
||||
CURLOPT_NETRC_FILE.3 \
|
||||
CURLOPT_NEW_DIRECTORY_PERMS.3 \
|
||||
|
@ -259,32 +259,29 @@ man_MANS = \
|
|||
CURLOPT_POSTFIELDSIZE_LARGE.3 \
|
||||
CURLOPT_POSTQUOTE.3 \
|
||||
CURLOPT_POSTREDIR.3 \
|
||||
CURLOPT_PRE_PROXY.3 \
|
||||
CURLOPT_PREQUOTE.3 \
|
||||
CURLOPT_PREREQDATA.3 \
|
||||
CURLOPT_PREREQFUNCTION.3 \
|
||||
CURLOPT_PRE_PROXY.3 \
|
||||
CURLOPT_PRIVATE.3 \
|
||||
CURLOPT_PROGRESSDATA.3 \
|
||||
CURLOPT_PROGRESSFUNCTION.3 \
|
||||
CURLOPT_PROTOCOLS.3 \
|
||||
CURLOPT_PROTOCOLS_STR.3 \
|
||||
CURLOPT_PROXY.3 \
|
||||
CURLOPT_PROXYAUTH.3 \
|
||||
CURLOPT_PROXYHEADER.3 \
|
||||
CURLOPT_PROXYPASSWORD.3 \
|
||||
CURLOPT_PROXYPORT.3 \
|
||||
CURLOPT_PROXYTYPE.3 \
|
||||
CURLOPT_PROXYUSERNAME.3 \
|
||||
CURLOPT_PROXYUSERPWD.3 \
|
||||
CURLOPT_PROXY_CAINFO.3 \
|
||||
CURLOPT_PROXY_CAINFO_BLOB.3 \
|
||||
CURLOPT_PROXY_CAPATH.3 \
|
||||
CURLOPT_PROXY_CRLFILE.3 \
|
||||
CURLOPT_PROXY_KEYPASSWD.3 \
|
||||
CURLOPT_PROXY_ISSUERCERT.3 \
|
||||
CURLOPT_PROXY_ISSUERCERT_BLOB.3 \
|
||||
CURLOPT_PROXY_KEYPASSWD.3 \
|
||||
CURLOPT_PROXY_PINNEDPUBLICKEY.3 \
|
||||
CURLOPT_PROXY_SERVICE_NAME.3 \
|
||||
CURLOPT_PROXY_SSL_CIPHER_LIST.3 \
|
||||
CURLOPT_PROXY_SSL_OPTIONS.3 \
|
||||
CURLOPT_PROXY_SSL_VERIFYHOST.3 \
|
||||
CURLOPT_PROXY_SSL_VERIFYPEER.3 \
|
||||
CURLOPT_PROXY_SSLCERT.3 \
|
||||
CURLOPT_PROXY_SSLCERT_BLOB.3 \
|
||||
CURLOPT_PROXY_SSLCERTTYPE.3 \
|
||||
|
@ -292,15 +289,18 @@ man_MANS = \
|
|||
CURLOPT_PROXY_SSLKEY_BLOB.3 \
|
||||
CURLOPT_PROXY_SSLKEYTYPE.3 \
|
||||
CURLOPT_PROXY_SSLVERSION.3 \
|
||||
CURLOPT_PROXY_SSL_CIPHER_LIST.3 \
|
||||
CURLOPT_PROXY_SSL_OPTIONS.3 \
|
||||
CURLOPT_PROXY_SSL_VERIFYHOST.3 \
|
||||
CURLOPT_PROXY_SSL_VERIFYPEER.3 \
|
||||
CURLOPT_PROXY_TLS13_CIPHERS.3 \
|
||||
CURLOPT_PROXY_TLSAUTH_PASSWORD.3 \
|
||||
CURLOPT_PROXY_TLSAUTH_TYPE.3 \
|
||||
CURLOPT_PROXY_TLSAUTH_USERNAME.3 \
|
||||
CURLOPT_PROXY_TRANSFER_MODE.3 \
|
||||
CURLOPT_PROXYAUTH.3 \
|
||||
CURLOPT_PROXYHEADER.3 \
|
||||
CURLOPT_PROXYPASSWORD.3 \
|
||||
CURLOPT_PROXYPORT.3 \
|
||||
CURLOPT_PROXYTYPE.3 \
|
||||
CURLOPT_PROXYUSERNAME.3 \
|
||||
CURLOPT_PROXYUSERPWD.3 \
|
||||
CURLOPT_PUT.3 \
|
||||
CURLOPT_QUOTE.3 \
|
||||
CURLOPT_RANDOM_FILE.3 \
|
||||
|
@ -326,6 +326,7 @@ man_MANS = \
|
|||
CURLOPT_SASL_IR.3 \
|
||||
CURLOPT_SEEKDATA.3 \
|
||||
CURLOPT_SEEKFUNCTION.3 \
|
||||
CURLOPT_SERVER_RESPONSE_TIMEOUT.3 \
|
||||
CURLOPT_SERVICE_NAME.3 \
|
||||
CURLOPT_SHARE.3 \
|
||||
CURLOPT_SOCKOPTDATA.3 \
|
||||
|
@ -342,15 +343,6 @@ man_MANS = \
|
|||
CURLOPT_SSH_KNOWNHOSTS.3 \
|
||||
CURLOPT_SSH_PRIVATE_KEYFILE.3 \
|
||||
CURLOPT_SSH_PUBLIC_KEYFILE.3 \
|
||||
CURLOPT_SSLCERT.3 \
|
||||
CURLOPT_SSLCERT_BLOB.3 \
|
||||
CURLOPT_SSLCERTTYPE.3 \
|
||||
CURLOPT_SSLENGINE.3 \
|
||||
CURLOPT_SSLENGINE_DEFAULT.3 \
|
||||
CURLOPT_SSLKEY.3 \
|
||||
CURLOPT_SSLKEY_BLOB.3 \
|
||||
CURLOPT_SSLKEYTYPE.3 \
|
||||
CURLOPT_SSLVERSION.3 \
|
||||
CURLOPT_SSL_CIPHER_LIST.3 \
|
||||
CURLOPT_SSL_CTX_DATA.3 \
|
||||
CURLOPT_SSL_CTX_FUNCTION.3 \
|
||||
|
@ -363,6 +355,15 @@ man_MANS = \
|
|||
CURLOPT_SSL_VERIFYHOST.3 \
|
||||
CURLOPT_SSL_VERIFYPEER.3 \
|
||||
CURLOPT_SSL_VERIFYSTATUS.3 \
|
||||
CURLOPT_SSLCERT.3 \
|
||||
CURLOPT_SSLCERT_BLOB.3 \
|
||||
CURLOPT_SSLCERTTYPE.3 \
|
||||
CURLOPT_SSLENGINE.3 \
|
||||
CURLOPT_SSLENGINE_DEFAULT.3 \
|
||||
CURLOPT_SSLKEY.3 \
|
||||
CURLOPT_SSLKEY_BLOB.3 \
|
||||
CURLOPT_SSLKEYTYPE.3 \
|
||||
CURLOPT_SSLVERSION.3 \
|
||||
CURLOPT_STDERR.3 \
|
||||
CURLOPT_STREAM_DEPENDS.3 \
|
||||
CURLOPT_STREAM_DEPENDS_E.3 \
|
||||
|
@ -387,19 +388,18 @@ man_MANS = \
|
|||
CURLOPT_TLSAUTH_USERNAME.3 \
|
||||
CURLOPT_TRAILERDATA.3 \
|
||||
CURLOPT_TRAILERFUNCTION.3 \
|
||||
CURLOPT_TRANSFERTEXT.3 \
|
||||
CURLOPT_TRANSFER_ENCODING.3 \
|
||||
CURLOPT_TRANSFERTEXT.3 \
|
||||
CURLOPT_UNIX_SOCKET_PATH.3 \
|
||||
CURLOPT_UNRESTRICTED_AUTH.3 \
|
||||
CURLOPT_UPKEEP_INTERVAL_MS.3 \
|
||||
CURLOPT_UPLOAD.3 \
|
||||
CURLOPT_UPLOAD_BUFFERSIZE.3 \
|
||||
CURLOPT_URL.3 \
|
||||
CURLOPT_USE_SSL.3 \
|
||||
CURLOPT_USERAGENT.3 \
|
||||
CURLOPT_USERNAME.3 \
|
||||
CURLOPT_USERPWD.3 \
|
||||
CURLOPT_USE_SSL.3 \
|
||||
CURLOPT_AWS_SIGV4.3 \
|
||||
CURLOPT_VERBOSE.3 \
|
||||
CURLOPT_WILDCARDMATCH.3 \
|
||||
CURLOPT_WRITEDATA.3 \
|
||||
|
|
|
@ -616,7 +616,7 @@ CURLOPT_FTP_ACCOUNT 7.13.0
|
|||
CURLOPT_FTP_ALTERNATIVE_TO_USER 7.15.5
|
||||
CURLOPT_FTP_CREATE_MISSING_DIRS 7.10.7
|
||||
CURLOPT_FTP_FILEMETHOD 7.15.1
|
||||
CURLOPT_FTP_RESPONSE_TIMEOUT 7.10.8
|
||||
CURLOPT_FTP_RESPONSE_TIMEOUT 7.10.8 7.85.0
|
||||
CURLOPT_FTP_SKIP_PASV_IP 7.15.0
|
||||
CURLOPT_FTP_SSL 7.11.0 7.16.4
|
||||
CURLOPT_FTP_SSL_CCC 7.16.1
|
||||
|
|
|
@ -1477,12 +1477,11 @@ typedef enum {
|
|||
Note that setting multiple bits may cause extra network round-trips. */
|
||||
CURLOPT(CURLOPT_PROXYAUTH, CURLOPTTYPE_VALUES, 111),
|
||||
|
||||
/* FTP option that changes the timeout, in seconds, associated with
|
||||
getting a response. This is different from transfer timeout time and
|
||||
essentially places a demand on the FTP server to acknowledge commands
|
||||
in a timely manner. */
|
||||
CURLOPT(CURLOPT_FTP_RESPONSE_TIMEOUT, CURLOPTTYPE_LONG, 112),
|
||||
#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
|
||||
/* Option that changes the timeout, in seconds, associated with getting a
|
||||
response. This is different from transfer timeout time and essentially
|
||||
places a demand on the server to acknowledge commands in a timely
|
||||
manner. For FTP, SMTP, IMAP and POP3. */
|
||||
CURLOPT(CURLOPT_SERVER_RESPONSE_TIMEOUT, CURLOPTTYPE_LONG, 112),
|
||||
|
||||
/* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to
|
||||
tell libcurl to use those IP versions only. This only has effect on
|
||||
|
@ -2179,6 +2178,9 @@ typedef enum {
|
|||
#define CURLOPT_SSLCERTPASSWD CURLOPT_KEYPASSWD
|
||||
#define CURLOPT_KRB4LEVEL CURLOPT_KRBLEVEL
|
||||
|
||||
/* */
|
||||
#define CURLOPT_FTP_RESPONSE_TIMEOUT CURLOPT_SERVER_RESPONSE_TIMEOUT
|
||||
|
||||
#else
|
||||
/* This is set if CURL_NO_OLDIES is defined at compile-time */
|
||||
#undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */
|
||||
|
@ -2193,7 +2195,7 @@ typedef enum {
|
|||
#define CURL_IPRESOLVE_V4 1 /* uses only IPv4 addresses/connections */
|
||||
#define CURL_IPRESOLVE_V6 2 /* uses only IPv6 addresses/connections */
|
||||
|
||||
/* three convenient "aliases" that follow the name scheme better */
|
||||
/* Convenient "aliases" */
|
||||
#define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER
|
||||
|
||||
/* These enums are for use with the CURLOPT_HTTP_VERSION option. */
|
||||
|
|
|
@ -107,7 +107,8 @@ struct curl_easyoption Curl_easyopts[] = {
|
|||
{"FTP_CREATE_MISSING_DIRS", CURLOPT_FTP_CREATE_MISSING_DIRS,
|
||||
CURLOT_LONG, 0},
|
||||
{"FTP_FILEMETHOD", CURLOPT_FTP_FILEMETHOD, CURLOT_VALUES, 0},
|
||||
{"FTP_RESPONSE_TIMEOUT", CURLOPT_FTP_RESPONSE_TIMEOUT, CURLOT_LONG, 0},
|
||||
{"FTP_RESPONSE_TIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT,
|
||||
CURLOT_LONG, CURLOT_FLAG_ALIAS},
|
||||
{"FTP_SKIP_PASV_IP", CURLOPT_FTP_SKIP_PASV_IP, CURLOT_LONG, 0},
|
||||
{"FTP_SSL", CURLOPT_USE_SSL, CURLOT_VALUES, CURLOT_FLAG_ALIAS},
|
||||
{"FTP_SSL_CCC", CURLOPT_FTP_SSL_CCC, CURLOT_LONG, 0},
|
||||
|
@ -266,8 +267,8 @@ struct curl_easyoption Curl_easyopts[] = {
|
|||
{"SASL_IR", CURLOPT_SASL_IR, CURLOT_LONG, 0},
|
||||
{"SEEKDATA", CURLOPT_SEEKDATA, CURLOT_CBPTR, 0},
|
||||
{"SEEKFUNCTION", CURLOPT_SEEKFUNCTION, CURLOT_FUNCTION, 0},
|
||||
{"SERVER_RESPONSE_TIMEOUT", CURLOPT_FTP_RESPONSE_TIMEOUT,
|
||||
CURLOT_LONG, CURLOT_FLAG_ALIAS},
|
||||
{"SERVER_RESPONSE_TIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT,
|
||||
CURLOT_LONG, 0},
|
||||
{"SERVICE_NAME", CURLOPT_SERVICE_NAME, CURLOT_STRING, 0},
|
||||
{"SHARE", CURLOPT_SHARE, CURLOT_OBJECT, 0},
|
||||
{"SOCKOPTDATA", CURLOPT_SOCKOPTDATA, CURLOT_CBPTR, 0},
|
||||
|
|
|
@ -1206,7 +1206,7 @@
|
|||
d c 00110
|
||||
d CURLOPT_PROXYAUTH...
|
||||
d c 00111
|
||||
d CURLOPT_FTP_RESPONSE_TIMEOUT...
|
||||
d CURLOPT_SERVER_RESPONSE_TIMEOUT...
|
||||
d c 00112
|
||||
d CURLOPT_SERVER_RESPONSE_TIMEOUT... Alias
|
||||
d c 00112
|
||||
|
|
Загрузка…
Ссылка в новой задаче