diff options
| author |   Sebastien Helleu <flashcode@flashtux.org> | 2012-02-09 09:48:57 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2012-02-09 09:48:57 +0100 |
| commit | 96ecfdd9d16a00e39ff8acac870cefff7ec48afb (patch) | |
| tree | a9a90611e04c74d3c1585d0a589613732e42b496 | |
| parent | irc: add signal "irc_server_opened" (diff) | |
| download | weechat-96ecfdd9d16a00e39ff8acac870cefff7ec48afb.tar.xz weechat-96ecfdd9d16a00e39ff8acac870cefff7ec48afb.zip | |
core: add options "dns_servers" and "accepttimeout_ms" for curl (libcurl >= 7.24.0)
| -rw-r--r-- | doc/de/autogen/plugin_api/url_options.txt | 4 | ||||
| -rw-r--r-- | doc/en/autogen/plugin_api/url_options.txt | 4 | ||||
| -rw-r--r-- | doc/fr/autogen/plugin_api/url_options.txt | 4 | ||||
| -rw-r--r-- | doc/it/autogen/plugin_api/url_options.txt | 4 | ||||
| -rw-r--r-- | src/core/wee-url.c | 5 |
5 files changed, 21 insertions, 0 deletions
diff --git a/doc/de/autogen/plugin_api/url_options.txt b/doc/de/autogen/plugin_api/url_options.txt index b01d845c0..3806a98b0 100644 --- a/doc/de/autogen/plugin_api/url_options.txt +++ b/doc/de/autogen/plugin_api/url_options.txt @@ -228,6 +228,10 @@ | use_ssl | long | none, try, control, all +| dns_servers | string | + +| accepttimeout_ms | long | + | sslcert | string | | sslcerttype | string | diff --git a/doc/en/autogen/plugin_api/url_options.txt b/doc/en/autogen/plugin_api/url_options.txt index 2672ba32f..278150753 100644 --- a/doc/en/autogen/plugin_api/url_options.txt +++ b/doc/en/autogen/plugin_api/url_options.txt @@ -228,6 +228,10 @@ | use_ssl | long | none, try, control, all +| dns_servers | string | + +| accepttimeout_ms | long | + | sslcert | string | | sslcerttype | string | diff --git a/doc/fr/autogen/plugin_api/url_options.txt b/doc/fr/autogen/plugin_api/url_options.txt index 993230640..d6627b123 100644 --- a/doc/fr/autogen/plugin_api/url_options.txt +++ b/doc/fr/autogen/plugin_api/url_options.txt @@ -228,6 +228,10 @@ | use_ssl | long | none, try, control, all +| dns_servers | string | + +| accepttimeout_ms | long | + | sslcert | string | | sslcerttype | string | diff --git a/doc/it/autogen/plugin_api/url_options.txt b/doc/it/autogen/plugin_api/url_options.txt index 652b47fa2..44e549b4a 100644 --- a/doc/it/autogen/plugin_api/url_options.txt +++ b/doc/it/autogen/plugin_api/url_options.txt @@ -228,6 +228,10 @@ | use_ssl | long | none, try, control, all +| dns_servers | string | + +| accepttimeout_ms | long | + | sslcert | string | | sslcerttype | string | diff --git a/src/core/wee-url.c b/src/core/wee-url.c index 7bed1c49f..a1ae09cd2 100644 --- a/src/core/wee-url.c +++ b/src/core/wee-url.c @@ -729,6 +729,11 @@ struct t_url_option url_options[] = /* libcurl >= 7.21.3 */ /*URL_DEF_OPTION(RESOLVE, LIST, NULL),*/ #endif +#if LIBCURL_VERSION_NUM >= 0x071800 + /* libcurl >= 7.24.0 */ + URL_DEF_OPTION(DNS_SERVERS, STRING, NULL), + URL_DEF_OPTION(ACCEPTTIMEOUT_MS, LONG, NULL), +#endif /* * SSL and security options */ |