summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2014-11-15 18:24:50 +0100
committerSébastien Helleu <flashcode@flashtux.org>2014-11-15 18:24:50 +0100
commit229a6c6342538fff1e19723b7fdbe8498e1e51e0 (patch)
tree9ef73a0a900e53588f9bf323b2287120bddbe94d /doc
parent91140b2ebc6bbbbce7e0944a7144fcb36311f9bd (diff)
downloadweechat-229a6c6342538fff1e19723b7fdbe8498e1e51e0.zip
doc: update auto-generated files with URL options
Diffstat (limited to 'doc')
-rw-r--r--doc/de/autogen/plugin_api/url_options.asciidoc212
-rw-r--r--doc/en/autogen/plugin_api/url_options.asciidoc212
-rw-r--r--doc/fr/autogen/plugin_api/url_options.asciidoc212
-rw-r--r--doc/it/autogen/plugin_api/url_options.asciidoc212
-rw-r--r--doc/ja/autogen/plugin_api/url_options.asciidoc212
-rw-r--r--doc/pl/autogen/plugin_api/url_options.asciidoc212
6 files changed, 636 insertions, 636 deletions
diff --git a/doc/de/autogen/plugin_api/url_options.asciidoc b/doc/de/autogen/plugin_api/url_options.asciidoc
index 7ef024f98..3b3595909 100644
--- a/doc/de/autogen/plugin_api/url_options.asciidoc
+++ b/doc/de/autogen/plugin_api/url_options.asciidoc
@@ -14,39 +14,39 @@
| failonerror | long |
-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
| proxy | string |
| proxyport | long |
-| proxytype | long | http, http_1_0, socks4, socks5, socks4a, socks5_hostname
-
-| noproxy | string |
+| port | long |
| httpproxytunnel | long |
-| socks5_gssapi_service | string |
+| interface | string |
-| socks5_gssapi_nec | long |
+| dns_cache_timeout | long |
-| interface | string |
+| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
+
+| buffersize | long |
+
+| tcp_nodelay | long |
| localport | long |
| localportrange | long |
-| dns_cache_timeout | long |
+| address_scope | long |
-| buffersize | long |
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| port | long |
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| tcp_nodelay | long |
+| noproxy | string |
-| address_scope | long |
+| socks5_gssapi_service | string |
+
+| socks5_gssapi_nec | long |
| tcp_keepalive | long |
@@ -56,12 +56,16 @@
| netrc | long | ignored, optional, required
-| netrc_file | string |
-
| userpwd | string |
| proxyuserpwd | string |
+| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| netrc_file | string |
+
| username | string |
| password | string |
@@ -70,76 +74,72 @@
| proxypassword | string |
-| login_options | string |
-
-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| tlsauth_type | mask | none, srp
| tlsauth_username | string |
| tlsauth_password | string |
-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| sasl_ir | long |
| xoauth2_bearer | string |
-| autoreferer | long |
-
-| accept_encoding | string |
+| login_options | string |
-| transfer_encoding | long |
+| autoreferer | long |
| followlocation | long |
-| unrestricted_auth | long |
-
-| maxredirs | long |
-
-| postredir | mask | post_301, post_302
-
| put | long |
| post | long |
| postfields | string |
-| postfieldsize | long |
-
-| postfieldsize_large | long long |
-
-| copypostfields | string |
-
| referer | string |
| useragent | string |
-| headeropt | mask | unified, separate
-
| cookie | string |
| cookiefile | string |
+| postfieldsize | long |
+
+| maxredirs | long |
+
+| httpget | long |
+
| cookiejar | string |
+| http_version | long | none, 1_0, 1_1
+
| cookiesession | long |
-| cookielist | string |
+| unrestricted_auth | long |
-| httpget | long |
+| postfieldsize_large | long long |
-| http_version | long | none, 1_0, 1_1
+| cookielist | string |
| ignore_content_length | long |
+| accept_encoding | string |
+
+| transfer_encoding | long |
+
| http_content_decoding | long |
| http_transfer_decoding | long |
+| copypostfields | string |
+
+| postredir | mask | post_301, post_302
+
| expect_100_timeout_ms | long |
+| headeropt | mask | unified, separate
+
| mail_from | string |
| mail_auth | string |
@@ -148,31 +148,31 @@
| ftpport | string |
-| dirlistonly | long |
-
-| append | long |
-
-| ftp_use_eprt | long |
-
| ftp_use_epsv | long |
-| ftp_use_pret | long |
+| ftp_use_eprt | long |
| ftp_create_missing_dirs | long |
| ftp_response_timeout | long |
-| ftp_alternative_to_user | string |
+| ftpsslauth | long | default, ssl, tls
+
+| ftp_account | string |
| ftp_skip_pasv_ip | long |
-| ftpsslauth | long | default, ssl, tls
+| ftp_filemethod | long | multicwd, nocwd, singlecwd
-| ftp_ssl_ccc | long | ccc_none, ccc_passive, ccc_active
+| ftp_alternative_to_user | string |
-| ftp_account | string |
+| ftp_ssl_ccc | long | ccc_none, ccc_active, ccc_passive
-| ftp_filemethod | long | multicwd, nocwd, singlecwd
+| dirlistonly | long |
+
+| append | long |
+
+| ftp_use_pret | long |
| rtsp_request | long | options, describe, announce, setup, play, pause, teardown, get_parameter, set_parameter, record, receive
@@ -186,51 +186,43 @@
| rtsp_server_cseq | long |
-| transfertext | long |
-
-| proxy_transfer_mode | long |
-
| crlf | long |
| range | string |
| resume_from | long |
-| resume_from_large | long long |
-
| customrequest | string |
-| filetime | long |
-
| nobody | long |
| infilesize | long |
-| infilesize_large | long long |
-
| upload | long |
-| maxfilesize | long |
-
-| maxfilesize_large | long long |
-
| timecondition | long | none, ifmodsince, ifunmodsince, lastmod
| timevalue | long |
-| timeout | long |
+| transfertext | long |
-| timeout_ms | long |
+| filetime | long |
-| low_speed_limit | long |
+| maxfilesize | long |
-| low_speed_time | long |
+| proxy_transfer_mode | long |
-| max_send_speed_large | long long |
+| resume_from_large | long long |
-| max_recv_speed_large | long long |
+| infilesize_large | long long |
-| maxconnects | long |
+| maxfilesize_large | long long |
+
+| timeout | long |
+
+| low_speed_limit | long |
+
+| low_speed_time | long |
| fresh_connect | long |
@@ -238,80 +230,88 @@
| connecttimeout | long |
-| connecttimeout_ms | long |
-
| ipresolve | long | whatever, v4, v6
| connect_only | long |
-| use_ssl | long | none, try, control, all
+| max_send_speed_large | long long |
-| dns_interface | string |
+| max_recv_speed_large | long long |
-| dns_local_ip4 | string |
+| timeout_ms | long |
-| dns_local_ip6 | string |
+| connecttimeout_ms | long |
+
+| maxconnects | long |
+
+| use_ssl | long | none, try, control, all
| dns_servers | string |
| accepttimeout_ms | long |
+| dns_interface | string |
+
+| dns_local_ip4 | string |
+
+| dns_local_ip6 | string |
+
| sslcert | string |
-| sslcerttype | string |
+| sslversion | long | default, tlsv1, sslv2, sslv3
-| sslkey | string |
+| ssl_verifypeer | long |
-| sslkeytype | string |
+| cainfo | string |
-| keypasswd | string |
+| random_file | string |
-| ssl_enable_alpn | long |
+| egdsocket | string |
-| ssl_enable_npn | long |
+| ssl_verifyhost | long |
-| sslengine | string |
+| ssl_cipher_list | string |
-| sslengine_default | long |
+| sslcerttype | string |
-| sslversion | long | default, tlsv1, sslv2, sslv3
+| sslkey | string |
-| ssl_verifypeer | long |
+| sslkeytype | string |
-| cainfo | string |
+| sslengine | string |
-| issuercert | string |
+| sslengine_default | long |
| capath | string |
-| crlfile | string |
+| ssl_sessionid_cache | long |
-| ssl_verifyhost | long |
+| krblevel | string |
-| certinfo | long |
+| keypasswd | string |
-| random_file | string |
+| issuercert | string |
-| egdsocket | string |
+| crlfile | string |
-| ssl_cipher_list | string |
+| certinfo | long |
-| ssl_sessionid_cache | long |
+| gssapi_delegation | long | none, policy_flag, flag
| ssl_options | long | allow_beast
-| krblevel | string |
+| ssl_enable_alpn | long |
-| gssapi_delegation | long | none, policy_flag, flag
+| ssl_enable_npn | long |
| ssh_auth_types | mask | none, policy_flag, flag
-| ssh_host_public_key_md5 | string |
-
| ssh_public_keyfile | string |
| ssh_private_keyfile | string |
+| ssh_host_public_key_md5 | string |
+
| ssh_knownhosts | string |
| new_file_perms | long |
diff --git a/doc/en/autogen/plugin_api/url_options.asciidoc b/doc/en/autogen/plugin_api/url_options.asciidoc
index 3399dcc16..f774ef2fa 100644
--- a/doc/en/autogen/plugin_api/url_options.asciidoc
+++ b/doc/en/autogen/plugin_api/url_options.asciidoc
@@ -14,39 +14,39 @@
| failonerror | long |
-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
| proxy | string |
| proxyport | long |
-| proxytype | long | http, http_1_0, socks4, socks5, socks4a, socks5_hostname
-
-| noproxy | string |
+| port | long |
| httpproxytunnel | long |
-| socks5_gssapi_service | string |
+| interface | string |
-| socks5_gssapi_nec | long |
+| dns_cache_timeout | long |
-| interface | string |
+| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
+
+| buffersize | long |
+
+| tcp_nodelay | long |
| localport | long |
| localportrange | long |
-| dns_cache_timeout | long |
+| address_scope | long |
-| buffersize | long |
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| port | long |
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| tcp_nodelay | long |
+| noproxy | string |
-| address_scope | long |
+| socks5_gssapi_service | string |
+
+| socks5_gssapi_nec | long |
| tcp_keepalive | long |
@@ -56,12 +56,16 @@
| netrc | long | ignored, optional, required
-| netrc_file | string |
-
| userpwd | string |
| proxyuserpwd | string |
+| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| netrc_file | string |
+
| username | string |
| password | string |
@@ -70,76 +74,72 @@
| proxypassword | string |
-| login_options | string |
-
-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| tlsauth_type | mask | none, srp
| tlsauth_username | string |
| tlsauth_password | string |
-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| sasl_ir | long |
| xoauth2_bearer | string |
-| autoreferer | long |
-
-| accept_encoding | string |
+| login_options | string |
-| transfer_encoding | long |
+| autoreferer | long |
| followlocation | long |
-| unrestricted_auth | long |
-
-| maxredirs | long |
-
-| postredir | mask | post_301, post_302
-
| put | long |
| post | long |
| postfields | string |
-| postfieldsize | long |
-
-| postfieldsize_large | long long |
-
-| copypostfields | string |
-
| referer | string |
| useragent | string |
-| headeropt | mask | unified, separate
-
| cookie | string |
| cookiefile | string |
+| postfieldsize | long |
+
+| maxredirs | long |
+
+| httpget | long |
+
| cookiejar | string |
+| http_version | long | none, 1_0, 1_1
+
| cookiesession | long |
-| cookielist | string |
+| unrestricted_auth | long |
-| httpget | long |
+| postfieldsize_large | long long |
-| http_version | long | none, 1_0, 1_1
+| cookielist | string |
| ignore_content_length | long |
+| accept_encoding | string |
+
+| transfer_encoding | long |
+
| http_content_decoding | long |
| http_transfer_decoding | long |
+| copypostfields | string |
+
+| postredir | mask | post_301, post_302
+
| expect_100_timeout_ms | long |
+| headeropt | mask | unified, separate
+
| mail_from | string |
| mail_auth | string |
@@ -148,31 +148,31 @@
| ftpport | string |
-| dirlistonly | long |
-
-| append | long |
-
-| ftp_use_eprt | long |
-
| ftp_use_epsv | long |
-| ftp_use_pret | long |
+| ftp_use_eprt | long |
| ftp_create_missing_dirs | long |
| ftp_response_timeout | long |
-| ftp_alternative_to_user | string |
+| ftpsslauth | long | default, ssl, tls
+
+| ftp_account | string |
| ftp_skip_pasv_ip | long |
-| ftpsslauth | long | default, ssl, tls
+| ftp_filemethod | long | multicwd, nocwd, singlecwd
-| ftp_ssl_ccc | long | ccc_none, ccc_passive, ccc_active
+| ftp_alternative_to_user | string |
-| ftp_account | string |
+| ftp_ssl_ccc | long | ccc_none, ccc_active, ccc_passive
-| ftp_filemethod | long | multicwd, nocwd, singlecwd
+| dirlistonly | long |
+
+| append | long |
+
+| ftp_use_pret | long |
| rtsp_request | long | options, describe, announce, setup, play, pause, teardown, get_parameter, set_parameter, record, receive
@@ -186,51 +186,43 @@
| rtsp_server_cseq | long |
-| transfertext | long |
-
-| proxy_transfer_mode | long |
-
| crlf | long |
| range | string |
| resume_from | long |
-| resume_from_large | long long |
-
| customrequest | string |
-| filetime | long |
-
| nobody | long |
| infilesize | long |
-| infilesize_large | long long |
-
| upload | long |
-| maxfilesize | long |
-
-| maxfilesize_large | long long |
-
| timecondition | long | none, ifmodsince, ifunmodsince, lastmod
| timevalue | long |
-| timeout | long |
+| transfertext | long |
-| timeout_ms | long |
+| filetime | long |
-| low_speed_limit | long |
+| maxfilesize | long |
-| low_speed_time | long |
+| proxy_transfer_mode | long |
-| max_send_speed_large | long long |
+| resume_from_large | long long |
-| max_recv_speed_large | long long |
+| infilesize_large | long long |
-| maxconnects | long |
+| maxfilesize_large | long long |
+
+| timeout | long |
+
+| low_speed_limit | long |
+
+| low_speed_time | long |
| fresh_connect | long |
@@ -238,80 +230,88 @@
| connecttimeout | long |
-| connecttimeout_ms | long |
-
| ipresolve | long | whatever, v4, v6
| connect_only | long |
-| use_ssl | long | none, try, control, all
+| max_send_speed_large | long long |
-| dns_interface | string |
+| max_recv_speed_large | long long |
-| dns_local_ip4 | string |
+| timeout_ms | long |
-| dns_local_ip6 | string |
+| connecttimeout_ms | long |
+
+| maxconnects | long |
+
+| use_ssl | long | none, try, control, all
| dns_servers | string |
| accepttimeout_ms | long |
+| dns_interface | string |
+
+| dns_local_ip4 | string |
+
+| dns_local_ip6 | string |
+
| sslcert | string |
-| sslcerttype | string |
+| sslversion | long | default, tlsv1, sslv2, sslv3
-| sslkey | string |
+| ssl_verifypeer | long |
-| sslkeytype | string |
+| cainfo | string |
-| keypasswd | string |
+| random_file | string |
-| ssl_enable_alpn | long |
+| egdsocket | string |
-| ssl_enable_npn | long |
+| ssl_verifyhost | long |
-| sslengine | string |
+| ssl_cipher_list | string |
-| sslengine_default | long |
+| sslcerttype | string |
-| sslversion | long | default, tlsv1, sslv2, sslv3
+| sslkey | string |
-| ssl_verifypeer | long |
+| sslkeytype | string |
-| cainfo | string |
+| sslengine | string |
-| issuercert | string |
+| sslengine_default | long |
| capath | string |
-| crlfile | string |
+| ssl_sessionid_cache | long |
-| ssl_verifyhost | long |
+| krblevel | string |
-| certinfo | long |
+| keypasswd | string |
-| random_file | string |
+| issuercert | string |
-| egdsocket | string |
+| crlfile | string |
-| ssl_cipher_list | string |
+| certinfo | long |
-| ssl_sessionid_cache | long |
+| gssapi_delegation | long | none, policy_flag, flag
| ssl_options | long | allow_beast
-| krblevel | string |
+| ssl_enable_alpn | long |
-| gssapi_delegation | long | none, policy_flag, flag
+| ssl_enable_npn | long |
| ssh_auth_types | mask | none, policy_flag, flag
-| ssh_host_public_key_md5 | string |
-
| ssh_public_keyfile | string |
| ssh_private_keyfile | string |
+| ssh_host_public_key_md5 | string |
+
| ssh_knownhosts | string |
| new_file_perms | long |
diff --git a/doc/fr/autogen/plugin_api/url_options.asciidoc b/doc/fr/autogen/plugin_api/url_options.asciidoc
index 6ff6c3a6c..345791e70 100644
--- a/doc/fr/autogen/plugin_api/url_options.asciidoc
+++ b/doc/fr/autogen/plugin_api/url_options.asciidoc
@@ -14,39 +14,39 @@
| failonerror | long |
-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
| proxy | string |
| proxyport | long |
-| proxytype | long | http, http_1_0, socks4, socks5, socks4a, socks5_hostname
-
-| noproxy | string |
+| port | long |
| httpproxytunnel | long |
-| socks5_gssapi_service | string |
+| interface | string |
-| socks5_gssapi_nec | long |
+| dns_cache_timeout | long |
-| interface | string |
+| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
+
+| buffersize | long |
+
+| tcp_nodelay | long |
| localport | long |
| localportrange | long |
-| dns_cache_timeout | long |
+| address_scope | long |
-| buffersize | long |
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| port | long |
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| tcp_nodelay | long |
+| noproxy | string |
-| address_scope | long |
+| socks5_gssapi_service | string |
+
+| socks5_gssapi_nec | long |
| tcp_keepalive | long |
@@ -56,12 +56,16 @@
| netrc | long | ignored, optional, required
-| netrc_file | string |
-
| userpwd | string |
| proxyuserpwd | string |
+| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| netrc_file | string |
+
| username | string |
| password | string |
@@ -70,76 +74,72 @@
| proxypassword | string |
-| login_options | string |
-
-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| tlsauth_type | mask | none, srp
| tlsauth_username | string |
| tlsauth_password | string |
-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| sasl_ir | long |
| xoauth2_bearer | string |
-| autoreferer | long |
-
-| accept_encoding | string |
+| login_options | string |
-| transfer_encoding | long |
+| autoreferer | long |
| followlocation | long |
-| unrestricted_auth | long |
-
-| maxredirs | long |
-
-| postredir | mask | post_301, post_302
-
| put | long |
| post | long |
| postfields | string |
-| postfieldsize | long |
-
-| postfieldsize_large | long long |
-
-| copypostfields | string |
-
| referer | string |
| useragent | string |
-| headeropt | mask | unified, separate
-
| cookie | string |
| cookiefile | string |
+| postfieldsize | long |
+
+| maxredirs | long |
+
+| httpget | long |
+
| cookiejar | string |
+| http_version | long | none, 1_0, 1_1
+
| cookiesession | long |
-| cookielist | string |
+| unrestricted_auth | long |
-| httpget | long |
+| postfieldsize_large | long long |
-| http_version | long | none, 1_0, 1_1
+| cookielist | string |
| ignore_content_length | long |
+| accept_encoding | string |
+
+| transfer_encoding | long |
+
| http_content_decoding | long |
| http_transfer_decoding | long |
+| copypostfields | string |
+
+| postredir | mask | post_301, post_302
+
| expect_100_timeout_ms | long |
+| headeropt | mask | unified, separate
+
| mail_from | string |
| mail_auth | string |
@@ -148,31 +148,31 @@
| ftpport | string |
-| dirlistonly | long |
-
-| append | long |
-
-| ftp_use_eprt | long |
-
| ftp_use_epsv | long |
-| ftp_use_pret | long |
+| ftp_use_eprt | long |
| ftp_create_missing_dirs | long |
| ftp_response_timeout | long |
-| ftp_alternative_to_user | string |
+| ftpsslauth | long | default, ssl, tls
+
+| ftp_account | string |
| ftp_skip_pasv_ip | long |
-| ftpsslauth | long | default, ssl, tls
+| ftp_filemethod | long | multicwd, nocwd, singlecwd
-| ftp_ssl_ccc | long | ccc_none, ccc_passive, ccc_active
+| ftp_alternative_to_user | string |
-| ftp_account | string |
+| ftp_ssl_ccc | long | ccc_none, ccc_active, ccc_passive
-| ftp_filemethod | long | multicwd, nocwd, singlecwd
+| dirlistonly | long |
+
+| append | long |
+
+| ftp_use_pret | long |
| rtsp_request | long | options, describe, announce, setup, play, pause, teardown, get_parameter, set_parameter, record, receive
@@ -186,51 +186,43 @@
| rtsp_server_cseq | long |
-| transfertext | long |
-
-| proxy_transfer_mode | long |
-
| crlf | long |
| range | string |
| resume_from | long |
-| resume_from_large | long long |
-
| customrequest | string |
-| filetime | long |
-
| nobody | long |
| infilesize | long |
-| infilesize_large | long long |
-
| upload | long |
-| maxfilesize | long |
-
-| maxfilesize_large | long long |
-
| timecondition | long | none, ifmodsince, ifunmodsince, lastmod
| timevalue | long |
-| timeout | long |
+| transfertext | long |
-| timeout_ms | long |
+| filetime | long |
-| low_speed_limit | long |
+| maxfilesize | long |
-| low_speed_time | long |
+| proxy_transfer_mode | long |
-| max_send_speed_large | long long |
+| resume_from_large | long long |
-| max_recv_speed_large | long long |
+| infilesize_large | long long |
-| maxconnects | long |
+| maxfilesize_large | long long |
+
+| timeout | long |
+
+| low_speed_limit | long |
+
+| low_speed_time | long |
| fresh_connect | long |
@@ -238,80 +230,88 @@
| connecttimeout | long |
-| connecttimeout_ms | long |
-
| ipresolve | long | whatever, v4, v6
| connect_only | long |
-| use_ssl | long | none, try, control, all
+| max_send_speed_large | long long |
-| dns_interface | string |
+| max_recv_speed_large | long long |
-| dns_local_ip4 | string |
+| timeout_ms | long |
-| dns_local_ip6 | string |
+| connecttimeout_ms | long |
+
+| maxconnects | long |
+
+| use_ssl | long | none, try, control, all
| dns_servers | string |
| accepttimeout_ms | long |
+| dns_interface | string |
+
+| dns_local_ip4 | string |
+
+| dns_local_ip6 | string |
+
| sslcert | string |
-| sslcerttype | string |
+| sslversion | long | default, tlsv1, sslv2, sslv3
-| sslkey | string |
+| ssl_verifypeer | long |
-| sslkeytype | string |
+| cainfo | string |
-| keypasswd | string |
+| random_file | string |
-| ssl_enable_alpn | long |
+| egdsocket | string |
-| ssl_enable_npn | long |
+| ssl_verifyhost | long |
-| sslengine | string |
+| ssl_cipher_list | string |
-| sslengine_default | long |
+| sslcerttype | string |
-| sslversion | long | default, tlsv1, sslv2, sslv3
+| sslkey | string |
-| ssl_verifypeer | long |
+| sslkeytype | string |
-| cainfo | string |
+| sslengine | string |
-| issuercert | string |
+| sslengine_default | long |
| capath | string |
-| crlfile | string |
+| ssl_sessionid_cache | long |
-| ssl_verifyhost | long |
+| krblevel | string |
-| certinfo | long |
+| keypasswd | string |
-| random_file | string |
+| issuercert | string |
-| egdsocket | string |
+| crlfile | string |
-| ssl_cipher_list | string |
+| certinfo | long |
-| ssl_sessionid_cache | long |
+| gssapi_delegation | long | none, policy_flag, flag
| ssl_options | long | allow_beast
-| krblevel | string |
+| ssl_enable_alpn | long |
-| gssapi_delegation | long | none, policy_flag, flag
+| ssl_enable_npn | long |
| ssh_auth_types | mask | none, policy_flag, flag
-| ssh_host_public_key_md5 | string |
-
| ssh_public_keyfile | string |
| ssh_private_keyfile | string |
+| ssh_host_public_key_md5 | string |
+
| ssh_knownhosts | string |
| new_file_perms | long |
diff --git a/doc/it/autogen/plugin_api/url_options.asciidoc b/doc/it/autogen/plugin_api/url_options.asciidoc
index eb6e96629..fc3e918a1 100644
--- a/doc/it/autogen/plugin_api/url_options.asciidoc
+++ b/doc/it/autogen/plugin_api/url_options.asciidoc
@@ -14,39 +14,39 @@
| failonerror | long |
-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
| proxy | string |
| proxyport | long |
-| proxytype | long | http, http_1_0, socks4, socks5, socks4a, socks5_hostname
-
-| noproxy | string |
+| port | long |
| httpproxytunnel | long |
-| socks5_gssapi_service | string |
+| interface | string |
-| socks5_gssapi_nec | long |
+| dns_cache_timeout | long |
-| interface | string |
+| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
+
+| buffersize | long |
+
+| tcp_nodelay | long |
| localport | long |
| localportrange | long |
-| dns_cache_timeout | long |
+| address_scope | long |
-| buffersize | long |
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| port | long |
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| tcp_nodelay | long |
+| noproxy | string |
-| address_scope | long |
+| socks5_gssapi_service | string |
+
+| socks5_gssapi_nec | long |
| tcp_keepalive | long |
@@ -56,12 +56,16 @@
| netrc | long | ignored, optional, required
-| netrc_file | string |
-
| userpwd | string |
| proxyuserpwd | string |
+| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| netrc_file | string |
+
| username | string |
| password | string |
@@ -70,76 +74,72 @@
| proxypassword | string |
-| login_options | string |
-
-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| tlsauth_type | mask | none, srp
| tlsauth_username | string |
| tlsauth_password | string |
-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| sasl_ir | long |
| xoauth2_bearer | string |
-| autoreferer | long |
-
-| accept_encoding | string |
+| login_options | string |
-| transfer_encoding | long |
+| autoreferer | long |
| followlocation | long |
-| unrestricted_auth | long |
-
-| maxredirs | long |
-
-| postredir | mask | post_301, post_302
-
| put | long |
| post | long |
| postfields | string |
-| postfieldsize | long |
-
-| postfieldsize_large | long long |
-
-| copypostfields | string |
-
| referer | string |
| useragent | string |
-| headeropt | mask | unified, separate
-
| cookie | string |
| cookiefile | string |
+| postfieldsize | long |
+
+| maxredirs | long |
+
+| httpget | long |
+
| cookiejar | string |
+| http_version | long | none, 1_0, 1_1
+
| cookiesession | long |
-| cookielist | string |
+| unrestricted_auth | long |
-| httpget | long |
+| postfieldsize_large | long long |
-| http_version | long | none, 1_0, 1_1
+| cookielist | string |
| ignore_content_length | long |
+| accept_encoding | string |
+
+| transfer_encoding | long |
+
| http_content_decoding | long |
| http_transfer_decoding | long |
+| copypostfields | string |
+
+| postredir | mask | post_301, post_302
+
| expect_100_timeout_ms | long |
+| headeropt | mask | unified, separate
+
| mail_from | string |
| mail_auth | string |
@@ -148,31 +148,31 @@
| ftpport | string |
-| dirlistonly | long |
-
-| append | long |
-
-| ftp_use_eprt | long |
-
| ftp_use_epsv | long |
-| ftp_use_pret | long |
+| ftp_use_eprt | long |
| ftp_create_missing_dirs | long |
| ftp_response_timeout | long |
-| ftp_alternative_to_user | string |
+| ftpsslauth | long | default, ssl, tls
+
+| ftp_account | string |
| ftp_skip_pasv_ip | long |
-| ftpsslauth | long | default, ssl, tls
+| ftp_filemethod | long | multicwd, nocwd, singlecwd
-| ftp_ssl_ccc | long | ccc_none, ccc_passive, ccc_active
+| ftp_alternative_to_user | string |
-| ftp_account | string |
+| ftp_ssl_ccc | long | ccc_none, ccc_active, ccc_passive
-| ftp_filemethod | long | multicwd, nocwd, singlecwd
+| dirlistonly | long |
+
+| append | long |
+
+| ftp_use_pret | long |
| rtsp_request | long | options, describe, announce, setup, play, pause, teardown, get_parameter, set_parameter, record, receive
@@ -186,51 +186,43 @@
| rtsp_server_cseq | long |
-| transfertext | long |
-
-| proxy_transfer_mode | long |
-
| crlf | long |
| range | string |
| resume_from | long |
-| resume_from_large | long long |
-
| customrequest | string |
-| filetime | long |
-
| nobody | long |
| infilesize | long |
-| infilesize_large | long long |
-
| upload | long |
-| maxfilesize | long |
-
-| maxfilesize_large | long long |
-
| timecondition | long | none, ifmodsince, ifunmodsince, lastmod
| timevalue | long |
-| timeout | long |
+| transfertext | long |
-| timeout_ms | long |
+| filetime | long |
-| low_speed_limit | long |
+| maxfilesize | long |
-| low_speed_time | long |
+| proxy_transfer_mode | long |
-| max_send_speed_large | long long |
+| resume_from_large | long long |
-| max_recv_speed_large | long long |
+| infilesize_large | long long |
-| maxconnects | long |
+| maxfilesize_large | long long |
+
+| timeout | long |
+
+| low_speed_limit | long |
+
+| low_speed_time | long |
| fresh_connect | long |
@@ -238,80 +230,88 @@
| connecttimeout | long |
-| connecttimeout_ms | long |
-
| ipresolve | long | whatever, v4, v6
| connect_only | long |
-| use_ssl | long | none, try, control, all
+| max_send_speed_large | long long |
-| dns_interface | string |
+| max_recv_speed_large | long long |
-| dns_local_ip4 | string |
+| timeout_ms | long |
-| dns_local_ip6 | string |
+| connecttimeout_ms | long |
+
+| maxconnects | long |
+
+| use_ssl | long | none, try, control, all
| dns_servers | string |
| accepttimeout_ms | long |
+| dns_interface | string |
+
+| dns_local_ip4 | string |
+
+| dns_local_ip6 | string |
+
| sslcert | string |
-| sslcerttype | string |
+| sslversion | long | default, tlsv1, sslv2, sslv3
-| sslkey | string |
+| ssl_verifypeer | long |
-| sslkeytype | string |
+| cainfo | string |
-| keypasswd | string |
+| random_file | string |
-| ssl_enable_alpn | long |
+| egdsocket | string |
-| ssl_enable_npn | long |
+| ssl_verifyhost | long |
-| sslengine | string |
+| ssl_cipher_list | string |
-| sslengine_default | long |
+| sslcerttype | string |
-| sslversion | long | default, tlsv1, sslv2, sslv3
+| sslkey | string |
-| ssl_verifypeer | long |
+| sslkeytype | string |
-| cainfo | string |
+| sslengine | string |
-| issuercert | string |
+| sslengine_default | long |
| capath | string |
-| crlfile | string |
+| ssl_sessionid_cache | long |
-| ssl_verifyhost | long |
+| krblevel | string |
-| certinfo | long |
+| keypasswd | string |
-| random_file | string |
+| issuercert | string |
-| egdsocket | string |
+| crlfile | string |
-| ssl_cipher_list | string |
+| certinfo | long |
-| ssl_sessionid_cache | long |
+| gssapi_delegation | long | none, policy_flag, flag
| ssl_options | long | allow_beast
-| krblevel | string |
+| ssl_enable_alpn | long |
-| gssapi_delegation | long | none, policy_flag, flag
+| ssl_enable_npn | long |
| ssh_auth_types | mask | none, policy_flag, flag
-| ssh_host_public_key_md5 | string |
-
| ssh_public_keyfile | string |
| ssh_private_keyfile | string |
+| ssh_host_public_key_md5 | string |
+
| ssh_knownhosts | string |
| new_file_perms | long |
diff --git a/doc/ja/autogen/plugin_api/url_options.asciidoc b/doc/ja/autogen/plugin_api/url_options.asciidoc
index 519c2a528..d00886237 100644
--- a/doc/ja/autogen/plugin_api/url_options.asciidoc
+++ b/doc/ja/autogen/plugin_api/url_options.asciidoc
@@ -14,39 +14,39 @@
| failonerror | long |
-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
| proxy | string |
| proxyport | long |
-| proxytype | long | http, http_1_0, socks4, socks5, socks4a, socks5_hostname
-
-| noproxy | string |
+| port | long |
| httpproxytunnel | long |
-| socks5_gssapi_service | string |
+| interface | string |
-| socks5_gssapi_nec | long |
+| dns_cache_timeout | long |
-| interface | string |
+| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
+
+| buffersize | long |
+
+| tcp_nodelay | long |
| localport | long |
| localportrange | long |
-| dns_cache_timeout | long |
+| address_scope | long |
-| buffersize | long |
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| port | long |
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| tcp_nodelay | long |
+| noproxy | string |
-| address_scope | long |
+| socks5_gssapi_service | string |
+
+| socks5_gssapi_nec | long |
| tcp_keepalive | long |
@@ -56,12 +56,16 @@
| netrc | long | ignored, optional, required
-| netrc_file | string |
-
| userpwd | string |
| proxyuserpwd | string |
+| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| netrc_file | string |
+
| username | string |
| password | string |
@@ -70,76 +74,72 @@
| proxypassword | string |
-| login_options | string |
-
-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| tlsauth_type | mask | none, srp
| tlsauth_username | string |
| tlsauth_password | string |
-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| sasl_ir | long |
| xoauth2_bearer | string |
-| autoreferer | long |
-
-| accept_encoding | string |
+| login_options | string |
-| transfer_encoding | long |
+| autoreferer | long |
| followlocation | long |
-| unrestricted_auth | long |
-
-| maxredirs | long |
-
-| postredir | mask | post_301, post_302
-
| put | long |
| post | long |
| postfields | string |
-| postfieldsize | long |
-
-| postfieldsize_large | long long |
-
-| copypostfields | string |
-
| referer | string |
| useragent | string |
-| headeropt | mask | unified, separate
-
| cookie | string |
| cookiefile | string |
+| postfieldsize | long |
+
+| maxredirs | long |
+
+| httpget | long |
+
| cookiejar | string |
+| http_version | long | none, 1_0, 1_1
+
| cookiesession | long |
-| cookielist | string |
+| unrestricted_auth | long |
-| httpget | long |
+| postfieldsize_large | long long |
-| http_version | long | none, 1_0, 1_1
+| cookielist | string |
| ignore_content_length | long |
+| accept_encoding | string |
+
+| transfer_encoding | long |
+
| http_content_decoding | long |
| http_transfer_decoding | long |
+| copypostfields | string |
+
+| postredir | mask | post_301, post_302
+
| expect_100_timeout_ms | long |
+| headeropt | mask | unified, separate
+
| mail_from | string |
| mail_auth | string |
@@ -148,31 +148,31 @@
| ftpport | string |
-| dirlistonly | long |
-
-| append | long |
-
-| ftp_use_eprt | long |
-
| ftp_use_epsv | long |
-| ftp_use_pret | long |
+| ftp_use_eprt | long |
| ftp_create_missing_dirs | long |
| ftp_response_timeout | long |
-| ftp_alternative_to_user | string |
+| ftpsslauth | long | default, ssl, tls
+
+| ftp_account | string |
| ftp_skip_pasv_ip | long |
-| ftpsslauth | long | default, ssl, tls
+| ftp_filemethod | long | multicwd, nocwd, singlecwd
-| ftp_ssl_ccc | long | ccc_none, ccc_passive, ccc_active
+| ftp_alternative_to_user | string |
-| ftp_account | string |
+| ftp_ssl_ccc | long | ccc_none, ccc_active, ccc_passive
-| ftp_filemethod | long | multicwd, nocwd, singlecwd
+| dirlistonly | long |
+
+| append | long |
+
+| ftp_use_pret | long |
| rtsp_request | long | options, describe, announce, setup, play, pause, teardown, get_parameter, set_parameter, record, receive
@@ -186,51 +186,43 @@
| rtsp_server_cseq | long |
-| transfertext | long |
-
-| proxy_transfer_mode | long |
-
| crlf | long |
| range | string |
| resume_from | long |
-| resume_from_large | long long |
-
| customrequest | string |
-| filetime | long |
-
| nobody | long |
| infilesize | long |
-| infilesize_large | long long |
-
| upload | long |
-| maxfilesize | long |
-
-| maxfilesize_large | long long |
-
| timecondition | long | none, ifmodsince, ifunmodsince, lastmod
| timevalue | long |
-| timeout | long |
+| transfertext | long |
-| timeout_ms | long |
+| filetime | long |
-| low_speed_limit | long |
+| maxfilesize | long |
-| low_speed_time | long |
+| proxy_transfer_mode | long |
-| max_send_speed_large | long long |
+| resume_from_large | long long |
-| max_recv_speed_large | long long |
+| infilesize_large | long long |
-| maxconnects | long |
+| maxfilesize_large | long long |
+
+| timeout | long |
+
+| low_speed_limit | long |
+
+| low_speed_time | long |
| fresh_connect | long |
@@ -238,80 +230,88 @@
| connecttimeout | long |
-| connecttimeout_ms | long |
-
| ipresolve | long | whatever, v4, v6
| connect_only | long |
-| use_ssl | long | none, try, control, all
+| max_send_speed_large | long long |
-| dns_interface | string |
+| max_recv_speed_large | long long |
-| dns_local_ip4 | string |
+| timeout_ms | long |
-| dns_local_ip6 | string |
+| connecttimeout_ms | long |
+
+| maxconnects | long |
+
+| use_ssl | long | none, try, control, all
| dns_servers | string |
| accepttimeout_ms | long |
+| dns_interface | string |
+
+| dns_local_ip4 | string |
+
+| dns_local_ip6 | string |
+
| sslcert | string |
-| sslcerttype | string |
+| sslversion | long | default, tlsv1, sslv2, sslv3
-| sslkey | string |
+| ssl_verifypeer | long |
-| sslkeytype | string |
+| cainfo | string |
-| keypasswd | string |
+| random_file | string |
-| ssl_enable_alpn | long |
+| egdsocket | string |
-| ssl_enable_npn | long |
+| ssl_verifyhost | long |
-| sslengine | string |
+| ssl_cipher_list | string |
-| sslengine_default | long |
+| sslcerttype | string |
-| sslversion | long | default, tlsv1, sslv2, sslv3
+| sslkey | string |
-| ssl_verifypeer | long |
+| sslkeytype | string |
-| cainfo | string |
+| sslengine | string |
-| issuercert | string |
+| sslengine_default | long |
| capath | string |
-| crlfile | string |
+| ssl_sessionid_cache | long |
-| ssl_verifyhost | long |
+| krblevel | string |
-| certinfo | long |
+| keypasswd | string |
-| random_file | string |
+| issuercert | string |
-| egdsocket | string |
+| crlfile | string |
-| ssl_cipher_list | string |
+| certinfo | long |
-| ssl_sessionid_cache | long |
+| gssapi_delegation | long | none, policy_flag, flag
| ssl_options | long | allow_beast
-| krblevel | string |
+| ssl_enable_alpn | long |
-| gssapi_delegation | long | none, policy_flag, flag
+| ssl_enable_npn | long |
| ssh_auth_types | mask | none, policy_flag, flag
-| ssh_host_public_key_md5 | string |
-
| ssh_public_keyfile | string |
| ssh_private_keyfile | string |
+| ssh_host_public_key_md5 | string |
+
| ssh_knownhosts | string |
| new_file_perms | long |
diff --git a/doc/pl/autogen/plugin_api/url_options.asciidoc b/doc/pl/autogen/plugin_api/url_options.asciidoc
index 4c39d5eb9..75a833c31 100644
--- a/doc/pl/autogen/plugin_api/url_options.asciidoc
+++ b/doc/pl/autogen/plugin_api/url_options.asciidoc
@@ -14,39 +14,39 @@
| failonerror | long |
-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
-
| proxy | string |
| proxyport | long |
-| proxytype | long | http, http_1_0, socks4, socks5, socks4a, socks5_hostname
-
-| noproxy | string |
+| port | long |
| httpproxytunnel | long |
-| socks5_gssapi_service | string |
+| interface | string |
-| socks5_gssapi_nec | long |
+| dns_cache_timeout | long |
-| interface | string |
+| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
+
+| buffersize | long |
+
+| tcp_nodelay | long |
| localport | long |
| localportrange | long |
-| dns_cache_timeout | long |
+| address_scope | long |
-| buffersize | long |
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| port | long |
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
-| tcp_nodelay | long |
+| noproxy | string |
-| address_scope | long |
+| socks5_gssapi_service | string |
+
+| socks5_gssapi_nec | long |
| tcp_keepalive | long |
@@ -56,12 +56,16 @@
| netrc | long | ignored, optional, required
-| netrc_file | string |
-
| userpwd | string |
| proxyuserpwd | string |
+| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| netrc_file | string |
+
| username | string |
| password | string |
@@ -70,76 +74,72 @@
| proxypassword | string |
-| login_options | string |
-
-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| tlsauth_type | mask | none, srp
| tlsauth_username | string |
| tlsauth_password | string |
-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
-
| sasl_ir | long |
| xoauth2_bearer | string |
-| autoreferer | long |
-
-| accept_encoding | string |
+| login_options | string |
-| transfer_encoding | long |
+| autoreferer | long |
| followlocation | long |
-| unrestricted_auth | long |
-
-| maxredirs | long |
-
-| postredir | mask | post_301, post_302
-
| put | long |
| post | long |
| postfields | string |
-| postfieldsize | long |
-
-| postfieldsize_large | long long |
-
-| copypostfields | string |
-
| referer | string |
| useragent | string |
-| headeropt | mask | unified, separate
-
| cookie | string |
| cookiefile | string |
+| postfieldsize | long |
+
+| maxredirs | long |
+
+| httpget | long |
+
| cookiejar | string |
+| http_version | long | none, 1_0, 1_1
+
| cookiesession | long |
-| cookielist | string |
+| unrestricted_auth | long |
-| httpget | long |
+| postfieldsize_large | long long |
-| http_version | long | none, 1_0, 1_1
+| cookielist | string |
| ignore_content_length | long |
+| accept_encoding | string |
+
+| transfer_encoding | long |
+
| http_content_decoding | long |
| http_transfer_decoding | long |
+| copypostfields | string |
+
+| postredir | mask | post_301, post_302
+
| expect_100_timeout_ms | long |
+| headeropt | mask | unified, separate
+
| mail_from | string |
| mail_auth | string |
@@ -148,31 +148,31 @@
| ftpport | string |
-| dirlistonly | long |
-
-| append | long |
-
-| ftp_use_eprt | long |
-
| ftp_use_epsv | long |
-| ftp_use_pret | long |
+| ftp_use_eprt | long |
| ftp_create_missing_dirs | long |
| ftp_response_timeout | long |
-| ftp_alternative_to_user | string |
+| ftpsslauth | long | default, ssl, tls
+
+| ftp_account | string |
| ftp_skip_pasv_ip | long |
-| ftpsslauth | long | default, ssl, tls
+| ftp_filemethod | long | multicwd, nocwd, singlecwd
-| ftp_ssl_ccc | long | ccc_none, ccc_passive, ccc_active
+| ftp_alternative_to_user | string |
-| ftp_account | string |
+| ftp_ssl_ccc | long | ccc_none, ccc_active, ccc_passive
-| ftp_filemethod | long | multicwd, nocwd, singlecwd
+| dirlistonly | long |
+
+| append | long |
+
+| ftp_use_pret | long |
| rtsp_request | long | options, describe, announce, setup, play, pause, teardown, get_parameter, set_parameter, record, receive
@@ -186,51 +186,43 @@
| rtsp_server_cseq | long |
-| transfertext | long |
-
-| proxy_transfer_mode | long |
-
| crlf | long |
| range | string |
| resume_from | long |
-| resume_from_large | long long |
-
| customrequest | string |
-| filetime | long |
-
| nobody | long |
| infilesize | long |
-| infilesize_large | long long |
-
| upload | long |
-| maxfilesize | long |
-
-| maxfilesize_large | long long |
-
| timecondition | long | none, ifmodsince, ifunmodsince, lastmod
| timevalue | long |
-| timeout | long |
+| transfertext | long |
-| timeout_ms | long |
+| filetime | long |
-| low_speed_limit | long |
+| maxfilesize | long |
-| low_speed_time | long |
+| proxy_transfer_mode | long |
-| max_send_speed_large | long long |
+| resume_from_large | long long |
-| max_recv_speed_large | long long |
+| infilesize_large | long long |
-| maxconnects | long |
+| maxfilesize_large | long long |
+
+| timeout | long |
+
+| low_speed_limit | long |
+
+| low_speed_time | long |
| fresh_connect | long |
@@ -238,80 +230,88 @@
| connecttimeout | long |
-| connecttimeout_ms | long |
-
| ipresolve | long | whatever, v4, v6
| connect_only | long |
-| use_ssl | long | none, try, control, all
+| max_send_speed_large | long long |
-| dns_interface | string |
+| max_recv_speed_large | long long |
-| dns_local_ip4 | string |
+| timeout_ms | long |
-| dns_local_ip6 | string |
+| connecttimeout_ms | long |
+
+| maxconnects | long |
+
+| use_ssl | long | none, try, control, all
| dns_servers | string |
| accepttimeout_ms | long |
+| dns_interface | string |
+
+| dns_local_ip4 | string |
+
+| dns_local_ip6 | string |
+
| sslcert | string |
-| sslcerttype | string |
+| sslversion | long | default, tlsv1, sslv2, sslv3
-| sslkey | string |
+| ssl_verifypeer | long |
-| sslkeytype | string |
+| cainfo | string |
-| keypasswd | string |
+| random_file | string |
-| ssl_enable_alpn | long |
+| egdsocket | string |
-| ssl_enable_npn | long |
+| ssl_verifyhost | long |
-| sslengine | string |
+| ssl_cipher_list | string |
-| sslengine_default | long |
+| sslcerttype | string |
-| sslversion | long | default, tlsv1, sslv2, sslv3
+| sslkey | string |
-| ssl_verifypeer | long |
+| sslkeytype | string |
-| cainfo | string |
+| sslengine | string |
-| issuercert | string |
+| sslengine_default | long |
| capath | string |
-| crlfile | string |
+| ssl_sessionid_cache | long |
-| ssl_verifyhost | long |
+| krblevel | string |
-| certinfo | long |
+| keypasswd | string |
-| random_file | string |
+| issuercert | string |
-| egdsocket | string |
+| crlfile | string |
-| ssl_cipher_list | string |
+| certinfo | long |
-| ssl_sessionid_cache | long |
+| gssapi_delegation | long | none, policy_flag, flag
| ssl_options | long | allow_beast
-| krblevel | string |
+| ssl_enable_alpn | long |
-| gssapi_delegation | long | none, policy_flag, flag
+| ssl_enable_npn | long |
| ssh_auth_types | mask | none, policy_flag, flag
-| ssh_host_public_key_md5 | string |
-
| ssh_public_keyfile | string |
| ssh_private_keyfile | string |
+| ssh_host_public_key_md5 | string |
+
| ssh_knownhosts | string |
| new_file_perms | long |