pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 22:06:38 +02:00
Code Activity

core: add Curl options for versions 7.50.0 to 7.52.0

Browse Source
This commit is contained in:
Sébastien Helleu
2017-04-06 07:23:52 +02:00
parent 2ab0b3b0a9
commit fab7a8bdfd
7 changed files with 265 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/de/autogen/plugin_api/url_options.adoc
+38 -2
View File
@@ -18,19 +18,23 @@
| failonerror | long |
| keep_sending_on_error | long |
| proxy | string |
| proxyport | long |
| port | long |
| pre_proxy | string |
| httpproxytunnel | long |
| interface | string |
| dns_cache_timeout | long |
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0, https
| buffersize | long |
@@ -278,7 +282,7 @@
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| ssl_verifypeer | long |
@@ -330,6 +334,38 @@
| ssl_falsestart | long |
| proxy_cainfo | string |
| proxy_capath | string |
| proxy_crlfile | string |
| proxy_keypasswd | string |
| proxy_pinnedpublickey | string |
| proxy_sslcert | string |
| proxy_sslcerttype | string |
| proxy_sslkey | string |
| proxy_sslkeytype | string |
| proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| proxy_ssl_options | long | allow_beast, no_revoke
| proxy_ssl_verifyhost | long |
| proxy_ssl_verifypeer | long |
| proxy_tlsauth_password | string |
| proxy_tlsauth_type | string |
| proxy_tlsauth_username | string |
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
doc/en/autogen/plugin_api/url_options.adoc
+38 -2
View File
@@ -18,19 +18,23 @@
| failonerror | long |
| keep_sending_on_error | long |
| proxy | string |
| proxyport | long |
| port | long |
| pre_proxy | string |
| httpproxytunnel | long |
| interface | string |
| dns_cache_timeout | long |
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0, https
| buffersize | long |
@@ -278,7 +282,7 @@
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| ssl_verifypeer | long |
@@ -330,6 +334,38 @@
| ssl_falsestart | long |
| proxy_cainfo | string |
| proxy_capath | string |
| proxy_crlfile | string |
| proxy_keypasswd | string |
| proxy_pinnedpublickey | string |
| proxy_sslcert | string |
| proxy_sslcerttype | string |
| proxy_sslkey | string |
| proxy_sslkeytype | string |
| proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| proxy_ssl_options | long | allow_beast, no_revoke
| proxy_ssl_verifyhost | long |
| proxy_ssl_verifypeer | long |
| proxy_tlsauth_password | string |
| proxy_tlsauth_type | string |
| proxy_tlsauth_username | string |
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
doc/fr/autogen/plugin_api/url_options.adoc
+38 -2
View File
@@ -18,19 +18,23 @@
| failonerror | long |
| keep_sending_on_error | long |
| proxy | string |
| proxyport | long |
| port | long |
| pre_proxy | string |
| httpproxytunnel | long |
| interface | string |
| dns_cache_timeout | long |
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0, https
| buffersize | long |
@@ -278,7 +282,7 @@
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| ssl_verifypeer | long |
@@ -330,6 +334,38 @@
| ssl_falsestart | long |
| proxy_cainfo | string |
| proxy_capath | string |
| proxy_crlfile | string |
| proxy_keypasswd | string |
| proxy_pinnedpublickey | string |
| proxy_sslcert | string |
| proxy_sslcerttype | string |
| proxy_sslkey | string |
| proxy_sslkeytype | string |
| proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| proxy_ssl_options | long | allow_beast, no_revoke
| proxy_ssl_verifyhost | long |
| proxy_ssl_verifypeer | long |
| proxy_tlsauth_password | string |
| proxy_tlsauth_type | string |
| proxy_tlsauth_username | string |
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
doc/it/autogen/plugin_api/url_options.adoc
+38 -2
View File
@@ -18,19 +18,23 @@
| failonerror | long |
| keep_sending_on_error | long |
| proxy | string |
| proxyport | long |
| port | long |
| pre_proxy | string |
| httpproxytunnel | long |
| interface | string |
| dns_cache_timeout | long |
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0, https
| buffersize | long |
@@ -278,7 +282,7 @@
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| ssl_verifypeer | long |
@@ -330,6 +334,38 @@
| ssl_falsestart | long |
| proxy_cainfo | string |
| proxy_capath | string |
| proxy_crlfile | string |
| proxy_keypasswd | string |
| proxy_pinnedpublickey | string |
| proxy_sslcert | string |
| proxy_sslcerttype | string |
| proxy_sslkey | string |
| proxy_sslkeytype | string |
| proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| proxy_ssl_options | long | allow_beast, no_revoke
| proxy_ssl_verifyhost | long |
| proxy_ssl_verifypeer | long |
| proxy_tlsauth_password | string |
| proxy_tlsauth_type | string |
| proxy_tlsauth_username | string |
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
doc/ja/autogen/plugin_api/url_options.adoc
+38 -2
View File
@@ -18,19 +18,23 @@
| failonerror | long |
| keep_sending_on_error | long |
| proxy | string |
| proxyport | long |
| port | long |
| pre_proxy | string |
| httpproxytunnel | long |
| interface | string |
| dns_cache_timeout | long |
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0, https
| buffersize | long |
@@ -278,7 +282,7 @@
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| ssl_verifypeer | long |
@@ -330,6 +334,38 @@
| ssl_falsestart | long |
| proxy_cainfo | string |
| proxy_capath | string |
| proxy_crlfile | string |
| proxy_keypasswd | string |
| proxy_pinnedpublickey | string |
| proxy_sslcert | string |
| proxy_sslcerttype | string |
| proxy_sslkey | string |
| proxy_sslkeytype | string |
| proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| proxy_ssl_options | long | allow_beast, no_revoke
| proxy_ssl_verifyhost | long |
| proxy_ssl_verifypeer | long |
| proxy_tlsauth_password | string |
| proxy_tlsauth_type | string |
| proxy_tlsauth_username | string |
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
doc/pl/autogen/plugin_api/url_options.adoc
+38 -2
View File
@@ -18,19 +18,23 @@
| failonerror | long |
| keep_sending_on_error | long |
| proxy | string |
| proxyport | long |
| port | long |
| pre_proxy | string |
| httpproxytunnel | long |
| interface | string |
| dns_cache_timeout | long |
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0, https
| buffersize | long |
@@ -278,7 +282,7 @@
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| ssl_verifypeer | long |
@@ -330,6 +334,38 @@
| ssl_falsestart | long |
| proxy_cainfo | string |
| proxy_capath | string |
| proxy_crlfile | string |
| proxy_keypasswd | string |
| proxy_pinnedpublickey | string |
| proxy_sslcert | string |
| proxy_sslcerttype | string |
| proxy_sslkey | string |
| proxy_sslkeytype | string |
| proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
| proxy_ssl_options | long | allow_beast, no_revoke
| proxy_ssl_verifyhost | long |
| proxy_ssl_verifypeer | long |
| proxy_tlsauth_password | string |
| proxy_tlsauth_type | string |
| proxy_tlsauth_username | string |
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
src/core/wee-url.c
+37 -1
View File
@@ -46,7 +46,7 @@
char *url_type_string[] = { "string", "long", "long long", "mask" };
/*
* Constants/options for Curl 7.49.0
* Constants/options for Curl 7.52.0
* (this list of options must be updated on every new Curl release)
*/
@@ -63,6 +63,9 @@ struct t_url_constant url_proxy_types[] =
#endif
#if LIBCURL_VERSION_NUM >= 0x071304 /* 7.19.4 */
URL_DEF_CONST(PROXY, HTTP_1_0),
#endif
#if LIBCURL_VERSION_NUM >= 0x073400 /* 7.52.0 */
URL_DEF_CONST(PROXY, HTTPS),
#endif
{ NULL, 0 },
};
@@ -278,6 +281,14 @@ struct t_url_constant url_ssl_version[] =
URL_DEF_CONST(_SSLVERSION, TLSv1),
URL_DEF_CONST(_SSLVERSION, SSLv2),
URL_DEF_CONST(_SSLVERSION, SSLv3),
#endif
#if LIBCURL_VERSION_NUM >= 0x072200 /* 7.34.0 */
URL_DEF_CONST(_SSLVERSION, TLSv1_0),
URL_DEF_CONST(_SSLVERSION, TLSv1_1),
URL_DEF_CONST(_SSLVERSION, TLSv1_2),
#endif
#if LIBCURL_VERSION_NUM >= 0x073400 /* 7.52.0 */
URL_DEF_CONST(_SSLVERSION, TLSv1_3),
#endif
{ NULL, 0 },
};
@@ -352,6 +363,9 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x070100 /* 7.1.0 */
URL_DEF_OPTION(FAILONERROR, LONG, NULL),
#endif
#if LIBCURL_VERSION_NUM >= 0x073300 /* 7.51.0 */
URL_DEF_OPTION(KEEP_SENDING_ON_ERROR, LONG, NULL),
#endif
/*
* network options
@@ -361,6 +375,9 @@ struct t_url_option url_options[] =
URL_DEF_OPTION(PROXYPORT, LONG, NULL),
URL_DEF_OPTION(PORT, LONG, NULL),
#endif
#if LIBCURL_VERSION_NUM >= 0x073400 /* 7.52.0 */
URL_DEF_OPTION(PRE_PROXY, STRING, NULL),
#endif
#if LIBCURL_VERSION_NUM >= 0x070300 /* 7.3.0 */
URL_DEF_OPTION(HTTPPROXYTUNNEL, LONG, NULL),
URL_DEF_OPTION(INTERFACE, STRING, NULL),
@@ -755,6 +772,25 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x072A00 /* 7.42.0 */
URL_DEF_OPTION(SSL_FALSESTART, LONG, NULL),
#endif
#if LIBCURL_VERSION_NUM >= 0x073400 /* 7.52.0 */
URL_DEF_OPTION(PROXY_CAINFO, STRING, NULL),
URL_DEF_OPTION(PROXY_CAPATH, STRING, NULL),
URL_DEF_OPTION(PROXY_CRLFILE, STRING, NULL),
URL_DEF_OPTION(PROXY_KEYPASSWD, STRING, NULL),
URL_DEF_OPTION(PROXY_PINNEDPUBLICKEY, STRING, NULL),
URL_DEF_OPTION(PROXY_SSLCERT, STRING, NULL),
URL_DEF_OPTION(PROXY_SSLCERTTYPE, STRING, NULL),
URL_DEF_OPTION(PROXY_SSLKEY, STRING, NULL),
URL_DEF_OPTION(PROXY_SSLKEYTYPE, STRING, NULL),
URL_DEF_OPTION(PROXY_SSLVERSION, LONG, url_ssl_version),
/*URL_DEF_OPTION(PROXY_SSL_CIPHER_LIST, LIST, NULL),*/
URL_DEF_OPTION(PROXY_SSL_OPTIONS, LONG, url_ssl_options),
URL_DEF_OPTION(PROXY_SSL_VERIFYHOST, LONG, NULL),
URL_DEF_OPTION(PROXY_SSL_VERIFYPEER, LONG, NULL),
URL_DEF_OPTION(PROXY_TLSAUTH_PASSWORD, STRING, NULL),
URL_DEF_OPTION(PROXY_TLSAUTH_TYPE, STRING, NULL),
URL_DEF_OPTION(PROXY_TLSAUTH_USERNAME, STRING, NULL),
#endif
/*
* SSH options