summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.adoc1
-rw-r--r--doc/de/includes/autogen_api_url_options.de.adoc66
-rw-r--r--doc/en/includes/autogen_api_url_options.en.adoc66
-rw-r--r--doc/fr/includes/autogen_api_url_options.fr.adoc66
-rw-r--r--doc/it/includes/autogen_api_url_options.it.adoc66
-rw-r--r--doc/ja/includes/autogen_api_url_options.ja.adoc66
-rw-r--r--doc/pl/includes/autogen_api_url_options.pl.adoc66
-rw-r--r--doc/sr/includes/autogen_api_url_options.sr.adoc66
-rw-r--r--src/core/wee-url.c147
9 files changed, 458 insertions, 152 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index d2658167b..0382994b7 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -31,6 +31,7 @@ New features::
* core: add signals "buffer_user_input_xxx" and "buffer_user_closing_xxx" for buffers created with `/buffer add` (issue #1848)
* core: add identifier in buffer lines (issue #901)
* core: add option `unicode` in command `/debug`
+ * api: add Curl options for versions 7.64.0 to 7.87.0
* api: add functions string_strcmp and string_strncmp
* api: rename char comparison functions "utf8_char*" to "string_char*"
* api: return arithmetic difference between chars in functions string_charcmp, string_charcasecmp, string_charcasecmp_range, string_strcasecmp, string_strcasecmp_range, string_strncasecmp, string_strncasecmp_range, string_strcmp_ignore_chars
diff --git a/doc/de/includes/autogen_api_url_options.de.adoc b/doc/de/includes/autogen_api_url_options.de.adoc
index 0a8679ef4..1c0daa7e9 100644
--- a/doc/de/includes/autogen_api_url_options.de.adoc
+++ b/doc/de/includes/autogen_api_url_options.de.adoc
@@ -48,10 +48,6 @@
| address_scope | 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, smb, smbs
-
-| 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, smb, smbs
-
| noproxy | string |
| socks5_gssapi_nec | long |
@@ -82,15 +78,19 @@
| doh_url | string |
+| protocols_str | string |
+
+| redir_protocols_str | string |
+
| netrc | long | ignored, optional, required
| userpwd | string |
| proxyuserpwd | string |
-| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
-| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
| netrc_file | string |
@@ -108,6 +108,8 @@
| tlsauth_password | string |
+| sasl_authzid | string |
+
| sasl_ir | long |
| xoauth2_bearer | string |
@@ -120,8 +122,6 @@
| followlocation | long |
-| put | long |
-
| post | long |
| postfields | string |
@@ -144,7 +144,7 @@
| cookiejar | string |
-| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge, 3
| cookiesession | long |
@@ -182,12 +182,20 @@
| request_target | string |
+| http09_allowed | long |
+
+| hsts | string |
+
+| hsts_ctrl | mask | enable, readonlyfile
+
| mail_from | string |
| mail_rcpt | list |
| mail_auth | string |
+| mail_rcpt_alllowfails | long |
+
| tftp_blksize | long |
| tftp_no_options | long |
@@ -206,8 +214,6 @@
| ftp_create_missing_dirs | long |
-| ftp_response_timeout | long |
-
| ftpsslauth | long | default, ssl, tls
| ftp_account | string |
@@ -238,6 +244,8 @@
| rtsp_server_cseq | long |
+| aws_sigv4 | string |
+
| crlf | long |
| range | string |
@@ -274,6 +282,8 @@
| upload_buffersize | long |
+| mime_options | mask | formescape
+
| timeout | long |
| low_speed_limit | long |
@@ -298,6 +308,8 @@
| connecttimeout_ms | long |
+| maxage_conn | long |
+
| maxconnects | long |
| use_ssl | long | none, try, control, all
@@ -322,6 +334,8 @@
| upkeep_interval_ms | long |
+| maxlifetime_conn | long |
+
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
@@ -330,10 +344,6 @@
| cainfo | string |
-| random_file | string |
-
-| egdsocket | string |
-
| ssl_verifyhost | long |
| ssl_cipher_list | string |
@@ -364,12 +374,10 @@
| gssapi_delegation | long | none, policy_flag, flag
-| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| ssl_enable_alpn | long |
-| ssl_enable_npn | long |
-
| pinnedpublickey | string |
| ssl_verifystatus | long |
@@ -398,7 +406,7 @@
| proxy_ssl_cipher_list | list |
-| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| proxy_ssl_verifyhost | long |
@@ -414,6 +422,18 @@
| proxy_tls13_ciphers | list |
+| proxy_issuercert | string |
+
+| ssl_ec_curves | string |
+
+| doh_ssl_verifyhost | long |
+
+| doh_ssl_verifypeer | long |
+
+| doh_ssl_verifystatus | long |
+
+| ca_cache_timeout | long |
+
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
@@ -426,11 +446,17 @@
| ssh_compression | long |
+| ssh_host_public_key_sha256 | string |
+
+| telnetoptions | list |
+
+| ws_options | mask | binary, close, cont, offset, ping, pong, raw_mode, text
+
| new_file_perms | long |
| new_directory_perms | long |
-| telnetoptions | list |
+| quick_exit | long |
|===
// end::url_options[]
diff --git a/doc/en/includes/autogen_api_url_options.en.adoc b/doc/en/includes/autogen_api_url_options.en.adoc
index fbe64650b..aa3e29e8f 100644
--- a/doc/en/includes/autogen_api_url_options.en.adoc
+++ b/doc/en/includes/autogen_api_url_options.en.adoc
@@ -48,10 +48,6 @@
| address_scope | 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, smb, smbs
-
-| 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, smb, smbs
-
| noproxy | string |
| socks5_gssapi_nec | long |
@@ -82,15 +78,19 @@
| doh_url | string |
+| protocols_str | string |
+
+| redir_protocols_str | string |
+
| netrc | long | ignored, optional, required
| userpwd | string |
| proxyuserpwd | string |
-| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
-| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
| netrc_file | string |
@@ -108,6 +108,8 @@
| tlsauth_password | string |
+| sasl_authzid | string |
+
| sasl_ir | long |
| xoauth2_bearer | string |
@@ -120,8 +122,6 @@
| followlocation | long |
-| put | long |
-
| post | long |
| postfields | string |
@@ -144,7 +144,7 @@
| cookiejar | string |
-| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge, 3
| cookiesession | long |
@@ -182,12 +182,20 @@
| request_target | string |
+| http09_allowed | long |
+
+| hsts | string |
+
+| hsts_ctrl | mask | enable, readonlyfile
+
| mail_from | string |
| mail_rcpt | list |
| mail_auth | string |
+| mail_rcpt_alllowfails | long |
+
| tftp_blksize | long |
| tftp_no_options | long |
@@ -206,8 +214,6 @@
| ftp_create_missing_dirs | long |
-| ftp_response_timeout | long |
-
| ftpsslauth | long | default, ssl, tls
| ftp_account | string |
@@ -238,6 +244,8 @@
| rtsp_server_cseq | long |
+| aws_sigv4 | string |
+
| crlf | long |
| range | string |
@@ -274,6 +282,8 @@
| upload_buffersize | long |
+| mime_options | mask | formescape
+
| timeout | long |
| low_speed_limit | long |
@@ -298,6 +308,8 @@
| connecttimeout_ms | long |
+| maxage_conn | long |
+
| maxconnects | long |
| use_ssl | long | none, try, control, all
@@ -322,6 +334,8 @@
| upkeep_interval_ms | long |
+| maxlifetime_conn | long |
+
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
@@ -330,10 +344,6 @@
| cainfo | string |
-| random_file | string |
-
-| egdsocket | string |
-
| ssl_verifyhost | long |
| ssl_cipher_list | string |
@@ -364,12 +374,10 @@
| gssapi_delegation | long | none, policy_flag, flag
-| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| ssl_enable_alpn | long |
-| ssl_enable_npn | long |
-
| pinnedpublickey | string |
| ssl_verifystatus | long |
@@ -398,7 +406,7 @@
| proxy_ssl_cipher_list | list |
-| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| proxy_ssl_verifyhost | long |
@@ -414,6 +422,18 @@
| proxy_tls13_ciphers | list |
+| proxy_issuercert | string |
+
+| ssl_ec_curves | string |
+
+| doh_ssl_verifyhost | long |
+
+| doh_ssl_verifypeer | long |
+
+| doh_ssl_verifystatus | long |
+
+| ca_cache_timeout | long |
+
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
@@ -426,11 +446,17 @@
| ssh_compression | long |
+| ssh_host_public_key_sha256 | string |
+
+| telnetoptions | list |
+
+| ws_options | mask | binary, close, cont, offset, ping, pong, raw_mode, text
+
| new_file_perms | long |
| new_directory_perms | long |
-| telnetoptions | list |
+| quick_exit | long |
|===
// end::url_options[]
diff --git a/doc/fr/includes/autogen_api_url_options.fr.adoc b/doc/fr/includes/autogen_api_url_options.fr.adoc
index 7722806c2..8cda4c4ab 100644
--- a/doc/fr/includes/autogen_api_url_options.fr.adoc
+++ b/doc/fr/includes/autogen_api_url_options.fr.adoc
@@ -48,10 +48,6 @@
| address_scope | 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, smb, smbs
-
-| 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, smb, smbs
-
| noproxy | string |
| socks5_gssapi_nec | long |
@@ -82,15 +78,19 @@
| doh_url | string |
+| protocols_str | string |
+
+| redir_protocols_str | string |
+
| netrc | long | ignored, optional, required
| userpwd | string |
| proxyuserpwd | string |
-| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
-| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
| netrc_file | string |
@@ -108,6 +108,8 @@
| tlsauth_password | string |
+| sasl_authzid | string |
+
| sasl_ir | long |
| xoauth2_bearer | string |
@@ -120,8 +122,6 @@
| followlocation | long |
-| put | long |
-
| post | long |
| postfields | string |
@@ -144,7 +144,7 @@
| cookiejar | string |
-| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge, 3
| cookiesession | long |
@@ -182,12 +182,20 @@
| request_target | string |
+| http09_allowed | long |
+
+| hsts | string |
+
+| hsts_ctrl | mask | enable, readonlyfile
+
| mail_from | string |
| mail_rcpt | list |
| mail_auth | string |
+| mail_rcpt_alllowfails | long |
+
| tftp_blksize | long |
| tftp_no_options | long |
@@ -206,8 +214,6 @@
| ftp_create_missing_dirs | long |
-| ftp_response_timeout | long |
-
| ftpsslauth | long | default, ssl, tls
| ftp_account | string |
@@ -238,6 +244,8 @@
| rtsp_server_cseq | long |
+| aws_sigv4 | string |
+
| crlf | long |
| range | string |
@@ -274,6 +282,8 @@
| upload_buffersize | long |
+| mime_options | mask | formescape
+
| timeout | long |
| low_speed_limit | long |
@@ -298,6 +308,8 @@
| connecttimeout_ms | long |
+| maxage_conn | long |
+
| maxconnects | long |
| use_ssl | long | none, try, control, all
@@ -322,6 +334,8 @@
| upkeep_interval_ms | long |
+| maxlifetime_conn | long |
+
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
@@ -330,10 +344,6 @@
| cainfo | string |
-| random_file | string |
-
-| egdsocket | string |
-
| ssl_verifyhost | long |
| ssl_cipher_list | string |
@@ -364,12 +374,10 @@
| gssapi_delegation | long | none, policy_flag, flag
-| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| ssl_enable_alpn | long |
-| ssl_enable_npn | long |
-
| pinnedpublickey | string |
| ssl_verifystatus | long |
@@ -398,7 +406,7 @@
| proxy_ssl_cipher_list | list |
-| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| proxy_ssl_verifyhost | long |
@@ -414,6 +422,18 @@
| proxy_tls13_ciphers | list |
+| proxy_issuercert | string |
+
+| ssl_ec_curves | string |
+
+| doh_ssl_verifyhost | long |
+
+| doh_ssl_verifypeer | long |
+
+| doh_ssl_verifystatus | long |
+
+| ca_cache_timeout | long |
+
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
@@ -426,11 +446,17 @@
| ssh_compression | long |
+| ssh_host_public_key_sha256 | string |
+
+| telnetoptions | list |
+
+| ws_options | mask | binary, close, cont, offset, ping, pong, raw_mode, text
+
| new_file_perms | long |
| new_directory_perms | long |
-| telnetoptions | list |
+| quick_exit | long |
|===
// end::url_options[]
diff --git a/doc/it/includes/autogen_api_url_options.it.adoc b/doc/it/includes/autogen_api_url_options.it.adoc
index 421b0c93d..de367e440 100644
--- a/doc/it/includes/autogen_api_url_options.it.adoc
+++ b/doc/it/includes/autogen_api_url_options.it.adoc
@@ -48,10 +48,6 @@
| address_scope | 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, smb, smbs
-
-| 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, smb, smbs
-
| noproxy | string |
| socks5_gssapi_nec | long |
@@ -82,15 +78,19 @@
| doh_url | string |
+| protocols_str | string |
+
+| redir_protocols_str | string |
+
| netrc | long | ignored, optional, required
| userpwd | string |
| proxyuserpwd | string |
-| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
-| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
| netrc_file | string |
@@ -108,6 +108,8 @@
| tlsauth_password | string |
+| sasl_authzid | string |
+
| sasl_ir | long |
| xoauth2_bearer | string |
@@ -120,8 +122,6 @@
| followlocation | long |
-| put | long |
-
| post | long |
| postfields | string |
@@ -144,7 +144,7 @@
| cookiejar | string |
-| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge, 3
| cookiesession | long |
@@ -182,12 +182,20 @@
| request_target | string |
+| http09_allowed | long |
+
+| hsts | string |
+
+| hsts_ctrl | mask | enable, readonlyfile
+
| mail_from | string |
| mail_rcpt | list |
| mail_auth | string |
+| mail_rcpt_alllowfails | long |
+
| tftp_blksize | long |
| tftp_no_options | long |
@@ -206,8 +214,6 @@
| ftp_create_missing_dirs | long |
-| ftp_response_timeout | long |
-
| ftpsslauth | long | default, ssl, tls
| ftp_account | string |
@@ -238,6 +244,8 @@
| rtsp_server_cseq | long |
+| aws_sigv4 | string |
+
| crlf | long |
| range | string |
@@ -274,6 +282,8 @@
| upload_buffersize | long |
+| mime_options | mask | formescape
+
| timeout | long |
| low_speed_limit | long |
@@ -298,6 +308,8 @@
| connecttimeout_ms | long |
+| maxage_conn | long |
+
| maxconnects | long |
| use_ssl | long | none, try, control, all
@@ -322,6 +334,8 @@
| upkeep_interval_ms | long |
+| maxlifetime_conn | long |
+
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
@@ -330,10 +344,6 @@
| cainfo | string |
-| random_file | string |
-
-| egdsocket | string |
-
| ssl_verifyhost | long |
| ssl_cipher_list | string |
@@ -364,12 +374,10 @@
| gssapi_delegation | long | none, policy_flag, flag
-| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| ssl_enable_alpn | long |
-| ssl_enable_npn | long |
-
| pinnedpublickey | string |
| ssl_verifystatus | long |
@@ -398,7 +406,7 @@
| proxy_ssl_cipher_list | list |
-| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| proxy_ssl_verifyhost | long |
@@ -414,6 +422,18 @@
| proxy_tls13_ciphers | list |
+| proxy_issuercert | string |
+
+| ssl_ec_curves | string |
+
+| doh_ssl_verifyhost | long |
+
+| doh_ssl_verifypeer | long |
+
+| doh_ssl_verifystatus | long |
+
+| ca_cache_timeout | long |
+
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
@@ -426,11 +446,17 @@
| ssh_compression | long |
+| ssh_host_public_key_sha256 | string |
+
+| telnetoptions | list |
+
+| ws_options | mask | binary, close, cont, offset, ping, pong, raw_mode, text
+
| new_file_perms | long |
| new_directory_perms | long |
-| telnetoptions | list |
+| quick_exit | long |
|===
// end::url_options[]
diff --git a/doc/ja/includes/autogen_api_url_options.ja.adoc b/doc/ja/includes/autogen_api_url_options.ja.adoc
index 305023429..67b82090b 100644
--- a/doc/ja/includes/autogen_api_url_options.ja.adoc
+++ b/doc/ja/includes/autogen_api_url_options.ja.adoc
@@ -48,10 +48,6 @@
| address_scope | 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, smb, smbs
-
-| 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, smb, smbs
-
| noproxy | string |
| socks5_gssapi_nec | long |
@@ -82,15 +78,19 @@
| doh_url | string |
+| protocols_str | string |
+
+| redir_protocols_str | string |
+
| netrc | long | ignored, optional, required
| userpwd | string |
| proxyuserpwd | string |
-| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
-| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
| netrc_file | string |
@@ -108,6 +108,8 @@
| tlsauth_password | string |
+| sasl_authzid | string |
+
| sasl_ir | long |
| xoauth2_bearer | string |
@@ -120,8 +122,6 @@
| followlocation | long |
-| put | long |
-
| post | long |
| postfields | string |
@@ -144,7 +144,7 @@
| cookiejar | string |
-| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge, 3
| cookiesession | long |
@@ -182,12 +182,20 @@
| request_target | string |
+| http09_allowed | long |
+
+| hsts | string |
+
+| hsts_ctrl | mask | enable, readonlyfile
+
| mail_from | string |
| mail_rcpt | list |
| mail_auth | string |
+| mail_rcpt_alllowfails | long |
+
| tftp_blksize | long |
| tftp_no_options | long |
@@ -206,8 +214,6 @@
| ftp_create_missing_dirs | long |
-| ftp_response_timeout | long |
-
| ftpsslauth | long | default, ssl, tls
| ftp_account | string |
@@ -238,6 +244,8 @@
| rtsp_server_cseq | long |
+| aws_sigv4 | string |
+
| crlf | long |
| range | string |
@@ -274,6 +282,8 @@
| upload_buffersize | long |
+| mime_options | mask | formescape
+
| timeout | long |
| low_speed_limit | long |
@@ -298,6 +308,8 @@
| connecttimeout_ms | long |
+| maxage_conn | long |
+
| maxconnects | long |
| use_ssl | long | none, try, control, all
@@ -322,6 +334,8 @@
| upkeep_interval_ms | long |
+| maxlifetime_conn | long |
+
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
@@ -330,10 +344,6 @@
| cainfo | string |
-| random_file | string |
-
-| egdsocket | string |
-
| ssl_verifyhost | long |
| ssl_cipher_list | string |
@@ -364,12 +374,10 @@
| gssapi_delegation | long | none, policy_flag, flag
-| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| ssl_enable_alpn | long |
-| ssl_enable_npn | long |
-
| pinnedpublickey | string |
| ssl_verifystatus | long |
@@ -398,7 +406,7 @@
| proxy_ssl_cipher_list | list |
-| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| proxy_ssl_verifyhost | long |
@@ -414,6 +422,18 @@
| proxy_tls13_ciphers | list |
+| proxy_issuercert | string |
+
+| ssl_ec_curves | string |
+
+| doh_ssl_verifyhost | long |
+
+| doh_ssl_verifypeer | long |
+
+| doh_ssl_verifystatus | long |
+
+| ca_cache_timeout | long |
+
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
@@ -426,11 +446,17 @@
| ssh_compression | long |
+| ssh_host_public_key_sha256 | string |
+
+| telnetoptions | list |
+
+| ws_options | mask | binary, close, cont, offset, ping, pong, raw_mode, text
+
| new_file_perms | long |
| new_directory_perms | long |
-| telnetoptions | list |
+| quick_exit | long |
|===
// end::url_options[]
diff --git a/doc/pl/includes/autogen_api_url_options.pl.adoc b/doc/pl/includes/autogen_api_url_options.pl.adoc
index bf1384d60..052b71023 100644
--- a/doc/pl/includes/autogen_api_url_options.pl.adoc
+++ b/doc/pl/includes/autogen_api_url_options.pl.adoc
@@ -48,10 +48,6 @@
| address_scope | 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, smb, smbs
-
-| 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, smb, smbs
-
| noproxy | string |
| socks5_gssapi_nec | long |
@@ -82,15 +78,19 @@
| doh_url | string |
+| protocols_str | string |
+
+| redir_protocols_str | string |
+
| netrc | long | ignored, optional, required
| userpwd | string |
| proxyuserpwd | string |
-| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
-| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
| netrc_file | string |
@@ -108,6 +108,8 @@
| tlsauth_password | string |
+| sasl_authzid | string |
+
| sasl_ir | long |
| xoauth2_bearer | string |
@@ -120,8 +122,6 @@
| followlocation | long |
-| put | long |
-
| post | long |
| postfields | string |
@@ -144,7 +144,7 @@
| cookiejar | string |
-| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge, 3
| cookiesession | long |
@@ -182,12 +182,20 @@
| request_target | string |
+| http09_allowed | long |
+
+| hsts | string |
+
+| hsts_ctrl | mask | enable, readonlyfile
+
| mail_from | string |
| mail_rcpt | list |
| mail_auth | string |
+| mail_rcpt_alllowfails | long |
+
| tftp_blksize | long |
| tftp_no_options | long |
@@ -206,8 +214,6 @@
| ftp_create_missing_dirs | long |
-| ftp_response_timeout | long |
-
| ftpsslauth | long | default, ssl, tls
| ftp_account | string |
@@ -238,6 +244,8 @@
| rtsp_server_cseq | long |
+| aws_sigv4 | string |
+
| crlf | long |
| range | string |
@@ -274,6 +282,8 @@
| upload_buffersize | long |
+| mime_options | mask | formescape
+
| timeout | long |
| low_speed_limit | long |
@@ -298,6 +308,8 @@
| connecttimeout_ms | long |
+| maxage_conn | long |
+
| maxconnects | long |
| use_ssl | long | none, try, control, all
@@ -322,6 +334,8 @@
| upkeep_interval_ms | long |
+| maxlifetime_conn | long |
+
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
@@ -330,10 +344,6 @@
| cainfo | string |
-| random_file | string |
-
-| egdsocket | string |
-
| ssl_verifyhost | long |
| ssl_cipher_list | string |
@@ -364,12 +374,10 @@
| gssapi_delegation | long | none, policy_flag, flag
-| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| ssl_enable_alpn | long |
-| ssl_enable_npn | long |
-
| pinnedpublickey | string |
| ssl_verifystatus | long |
@@ -398,7 +406,7 @@
| proxy_ssl_cipher_list | list |
-| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| proxy_ssl_verifyhost | long |
@@ -414,6 +422,18 @@
| proxy_tls13_ciphers | list |
+| proxy_issuercert | string |
+
+| ssl_ec_curves | string |
+
+| doh_ssl_verifyhost | long |
+
+| doh_ssl_verifypeer | long |
+
+| doh_ssl_verifystatus | long |
+
+| ca_cache_timeout | long |
+
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
@@ -426,11 +446,17 @@
| ssh_compression | long |
+| ssh_host_public_key_sha256 | string |
+
+| telnetoptions | list |
+
+| ws_options | mask | binary, close, cont, offset, ping, pong, raw_mode, text
+
| new_file_perms | long |
| new_directory_perms | long |
-| telnetoptions | list |
+| quick_exit | long |
|===
// end::url_options[]
diff --git a/doc/sr/includes/autogen_api_url_options.sr.adoc b/doc/sr/includes/autogen_api_url_options.sr.adoc
index 5072065cb..2e07274d9 100644
--- a/doc/sr/includes/autogen_api_url_options.sr.adoc
+++ b/doc/sr/includes/autogen_api_url_options.sr.adoc
@@ -48,10 +48,6 @@
| address_scope | 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, smb, smbs
-
-| 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, smb, smbs
-
| noproxy | string |
| socks5_gssapi_nec | long |
@@ -82,15 +78,19 @@
| doh_url | string |
+| protocols_str | string |
+
+| redir_protocols_str | string |
+
| netrc | long | ignored, optional, required
| userpwd | string |
| proxyuserpwd | string |
-| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
-| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer, aws_sigv4
| netrc_file | string |
@@ -108,6 +108,8 @@
| tlsauth_password | string |
+| sasl_authzid | string |
+
| sasl_ir | long |
| xoauth2_bearer | string |
@@ -120,8 +122,6 @@
| followlocation | long |
-| put | long |
-
| post | long |
| postfields | string |
@@ -144,7 +144,7 @@
| cookiejar | string |
-| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge, 3
| cookiesession | long |
@@ -182,12 +182,20 @@
| request_target | string |
+| http09_allowed | long |
+
+| hsts | string |
+
+| hsts_ctrl | mask | enable, readonlyfile
+
| mail_from | string |
| mail_rcpt | list |
| mail_auth | string |
+| mail_rcpt_alllowfails | long |
+
| tftp_blksize | long |
| tftp_no_options | long |
@@ -206,8 +214,6 @@
| ftp_create_missing_dirs | long |
-| ftp_response_timeout | long |
-
| ftpsslauth | long | default, ssl, tls
| ftp_account | string |
@@ -238,6 +244,8 @@
| rtsp_server_cseq | long |
+| aws_sigv4 | string |
+
| crlf | long |
| range | string |
@@ -274,6 +282,8 @@
| upload_buffersize | long |
+| mime_options | mask | formescape
+
| timeout | long |
| low_speed_limit | long |
@@ -298,6 +308,8 @@
| connecttimeout_ms | long |
+| maxage_conn | long |
+
| maxconnects | long |
| use_ssl | long | none, try, control, all
@@ -322,6 +334,8 @@
| upkeep_interval_ms | long |
+| maxlifetime_conn | long |
+
| sslcert | string |
| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
@@ -330,10 +344,6 @@
| cainfo | string |
-| random_file | string |
-
-| egdsocket | string |
-
| ssl_verifyhost | long |
| ssl_cipher_list | string |
@@ -364,12 +374,10 @@
| gssapi_delegation | long | none, policy_flag, flag
-| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| ssl_enable_alpn | long |
-| ssl_enable_npn | long |
-
| pinnedpublickey | string |
| ssl_verifystatus | long |
@@ -398,7 +406,7 @@
| proxy_ssl_cipher_list | list |
-| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend, no_partialchain, revoke_best_effort, native_ca, auto_client_cert
| proxy_ssl_verifyhost | long |
@@ -414,6 +422,18 @@
| proxy_tls13_ciphers | list |
+| proxy_issuercert | string |
+
+| ssl_ec_curves | string |
+
+| doh_ssl_verifyhost | long |
+
+| doh_ssl_verifypeer | long |
+
+| doh_ssl_verifystatus | long |
+
+| ca_cache_timeout | long |
+
| ssh_auth_types | mask | none, policy_flag, flag
| ssh_public_keyfile | string |
@@ -426,11 +446,17 @@
| ssh_compression | long |
+| ssh_host_public_key_sha256 | string |
+
+| telnetoptions | list |
+
+| ws_options | mask | binary, close, cont, offset, ping, pong, raw_mode, text
+
| new_file_perms | long |
| new_directory_perms | long |
-| telnetoptions | list |
+| quick_exit | long |
|===
// end::url_options[]
diff --git a/src/core/wee-url.c b/src/core/wee-url.c
index 5a49a9a18..600a47c53 100644
--- a/src/core/wee-url.c
+++ b/src/core/wee-url.c
@@ -47,7 +47,7 @@
char *url_type_string[] = { "string", "long", "long long", "mask", "list" };
/*
- * Constants/options for Curl 7.63.0
+ * Constants/options for Curl 7.87.0
* (this list of options must be updated on every new Curl release)
*/
@@ -112,6 +112,12 @@ struct t_url_constant url_protocols[] =
URL_DEF_CONST(PROTO, SMB),
URL_DEF_CONST(PROTO, SMBS),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074700 /* 7.71.0 */
+ URL_DEF_CONST(PROTO, MQTT),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x074B00 /* 7.75.0 */
+ URL_DEF_CONST(PROTO, GOPHERS),
+#endif
{ NULL, 0 },
};
@@ -156,6 +162,9 @@ struct t_url_constant url_auth[] =
#if LIBCURL_VERSION_NUM >= 0x073D00 /* 7.61.0 */
URL_DEF_CONST(AUTH, BEARER),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074B00 /* 7.75.0 */
+ URL_DEF_CONST(AUTH, AWS_SIGV4),
+#endif
{ NULL, 0 },
};
@@ -196,6 +205,9 @@ struct t_url_constant url_http_version[] =
#if LIBCURL_VERSION_NUM >= 0x073100 /* 7.49.0 */
URL_DEF_CONST(_HTTP_VERSION, 2_PRIOR_KNOWLEDGE),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074200 /* 7.66.0 */
+ URL_DEF_CONST(_HTTP_VERSION, 3),
+#endif
{ NULL, 0 },
};
@@ -322,6 +334,18 @@ struct t_url_constant url_ssl_options[] =
URL_DEF_CONST(SSLSET, TOO_LATE),
URL_DEF_CONST(SSLSET, UNKNOWN_BACKEND),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074400 /* 7.68.0 */
+ URL_DEF_CONST(SSLOPT, NO_PARTIALCHAIN),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x074600 /* 7.70.0 */
+ URL_DEF_CONST(SSLOPT, REVOKE_BEST_EFFORT),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x074700 /* 7.71.0 */
+ URL_DEF_CONST(SSLOPT, NATIVE_CA),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x074D00 /* 7.77.0 */
+ URL_DEF_CONST(SSLOPT, AUTO_CLIENT_CERT),
+#endif
{ NULL, 0 },
};
@@ -364,6 +388,38 @@ struct t_url_constant url_header[] =
{ NULL, 0 },
};
+struct t_url_constant url_hsts[] =
+{
+#if LIBCURL_VERSION_NUM >= 0x074A00 /* 7.74.0 */
+ URL_DEF_CONST(HSTS, ENABLE),
+ URL_DEF_CONST(HSTS, READONLYFILE),
+#endif
+ { NULL, 0 },
+};
+
+struct t_url_constant url_mime[] =
+{
+#if LIBCURL_VERSION_NUM >= 0x075100 /* 7.81.0 */
+ URL_DEF_CONST(MIMEOPT, FORMESCAPE),
+#endif
+ { NULL, 0 },
+};
+
+struct t_url_constant url_websocket[] =
+{
+#if LIBCURL_VERSION_NUM >= 0x075600 /* 7.86.0 */
+ URL_DEF_CONST(WS, BINARY),
+ URL_DEF_CONST(WS, CLOSE),
+ URL_DEF_CONST(WS, CONT),
+ URL_DEF_CONST(WS, OFFSET),
+ URL_DEF_CONST(WS, PING),
+ URL_DEF_CONST(WS, PONG),
+ URL_DEF_CONST(WS, RAW_MODE),
+ URL_DEF_CONST(WS, TEXT),
+#endif
+ { NULL, 0 },
+};
+
struct t_url_option url_options[] =
{
/*
@@ -423,9 +479,13 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x071300 /* 7.19.0 */
URL_DEF_OPTION(ADDRESS_SCOPE, LONG, NULL),
#endif
-#if LIBCURL_VERSION_NUM >= 0x071304 /* 7.19.4 */
+#if LIBCURL_VERSION_NUM >= 0x071304 && LIBCURL_VERSION_NUM < 0x075500 /* 7.19.4 - 7.84.0 */
URL_DEF_OPTION(PROTOCOLS, MASK, url_protocols),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071304 && LIBCURL_VERSION_NUM < 0x075500 /* 7.19.4 - 7.84.0 */
URL_DEF_OPTION(REDIR_PROTOCOLS, MASK, url_protocols),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071304 /* 7.19.4 */
URL_DEF_OPTION(NOPROXY, STRING, NULL),
URL_DEF_OPTION(SOCKS5_GSSAPI_NEC, LONG, NULL),
#endif
@@ -465,6 +525,12 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x073E00 /* 7.62.0 */
URL_DEF_OPTION(DOH_URL, STRING, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x075500 /* 7.85.0 */
+ URL_DEF_OPTION(PROTOCOLS_STR, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x075500 /* 7.85.0 */
+ URL_DEF_OPTION(REDIR_PROTOCOLS_STR, STRING, NULL),
+#endif
/*
* names and password options (authentication)
@@ -494,6 +560,10 @@ struct t_url_option url_options[] =
URL_DEF_OPTION(TLSAUTH_USERNAME, STRING, NULL),
URL_DEF_OPTION(TLSAUTH_PASSWORD, STRING, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074200 /* 7.66.0 */
+ URL_DEF_OPTION(SASL_AUTHZID, STRING, NULL),
+#endif
+
#if LIBCURL_VERSION_NUM >= 0x071F00 /* 7.31.0 */
URL_DEF_OPTION(SASL_IR, LONG, NULL),
#endif
@@ -513,7 +583,6 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x070100 /* 7.1.0 */
URL_DEF_OPTION(AUTOREFERER, LONG, NULL),
URL_DEF_OPTION(FOLLOWLOCATION, LONG, NULL),
- URL_DEF_OPTION(PUT, LONG, NULL),
URL_DEF_OPTION(POST, LONG, NULL),
URL_DEF_OPTION(POSTFIELDS, STRING, NULL),
URL_DEF_OPTION(REFERER, STRING, NULL),
@@ -583,9 +652,16 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x073700 /* 7.55.0 */
URL_DEF_OPTION(REQUEST_TARGET, STRING, NULL),
#endif
-#if LIBCURL_VERSION_NUM >= 0x070100 && LIBCURL_VERSION_NUM < 0x073800 /* 7.1.0 - 7.0.55 */
+#if LIBCURL_VERSION_NUM >= 0x070100 && LIBCURL_VERSION_NUM < 0x073800 /* 7.1.0 - 7.55.0 */
URL_DEF_OPTION(HTTPPOST, LIST, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074000 /* 7.64.0 */
+ URL_DEF_OPTION(HTTP09_ALLOWED, LONG, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x074A00 /* 7.64.0 */
+ URL_DEF_OPTION(HSTS, STRING, NULL),
+ URL_DEF_OPTION(HSTS_CTRL, MASK, url_hsts),
+#endif
/*
* SMTP options
@@ -597,6 +673,9 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x071900 /* 7.25.0 */
URL_DEF_OPTION(MAIL_AUTH, STRING, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074500 /* 7.69.0 */
+ URL_DEF_OPTION(MAIL_RCPT_ALLLOWFAILS, LONG, NULL),
+#endif
/*
* TFTP options
@@ -628,7 +707,7 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x070A07 /* 7.10.7 */
URL_DEF_OPTION(FTP_CREATE_MISSING_DIRS, LONG, NULL),
#endif
-#if LIBCURL_VERSION_NUM >= 0x070A08 /* 7.10.8 */
+#if LIBCURL_VERSION_NUM >= 0x070A08 && LIBCURL_VERSION_NUM < 0x075500 /* 7.10.8 - 7.84.0 */
URL_DEF_OPTION(FTP_RESPONSE_TIMEOUT, LONG, NULL),
#endif
#if LIBCURL_VERSION_NUM >= 0x070C02 /* 7.12.2 */
@@ -668,6 +747,9 @@ struct t_url_option url_options[] =
URL_DEF_OPTION(RTSP_CLIENT_CSEQ, LONG, NULL),
URL_DEF_OPTION(RTSP_SERVER_CSEQ, LONG, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074B00 /* 7.75.0 */
+ URL_DEF_OPTION(AWS_SIGV4, STRING, NULL),
+#endif
/*
* protocol options
@@ -706,6 +788,9 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x073E00 /* 7.62.0 */
URL_DEF_OPTION(UPLOAD_BUFFERSIZE, LONG, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x075100 /* 7.81.0 */
+ URL_DEF_OPTION(MIME_OPTIONS, MASK, url_mime),
+#endif
/*
* connection options
@@ -734,6 +819,9 @@ struct t_url_option url_options[] =
URL_DEF_OPTION(TIMEOUT_MS, LONG, NULL),
URL_DEF_OPTION(CONNECTTIMEOUT_MS, LONG, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074100 /* 7.65.0 */
+ URL_DEF_OPTION(MAXAGE_CONN, LONG, NULL),
+#endif
#if LIBCURL_VERSION_NUM >= 0x071003 /* 7.16.3 */
URL_DEF_OPTION(MAXCONNECTS, LONG, NULL),
#endif
@@ -764,6 +852,9 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x073E00 /* 7.62.0 */
URL_DEF_OPTION(UPKEEP_INTERVAL_MS, LONG, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
+ URL_DEF_OPTION(MAXLIFETIME_CONN, LONG, NULL),
+#endif
/*
* SSL and security options
@@ -776,8 +867,10 @@ struct t_url_option url_options[] =
URL_DEF_OPTION(SSL_VERIFYPEER, LONG, NULL),
URL_DEF_OPTION(CAINFO, STRING, NULL),
#endif
-#if LIBCURL_VERSION_NUM >= 0x070700 /* 7.7.0 */
+#if LIBCURL_VERSION_NUM >= 0x070700 && LIBCURL_VERSION_NUM < 0x075400 /* 7.7.0 - 7.83.0 */
URL_DEF_OPTION(RANDOM_FILE, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x070700 && LIBCURL_VERSION_NUM < 0x075400 /* 7.7.0 - 7.83.0 */
URL_DEF_OPTION(EGDSOCKET, STRING, NULL),
#endif
#if LIBCURL_VERSION_NUM >= 0x070801 /* 7.8.1 */
@@ -820,6 +913,8 @@ struct t_url_option url_options[] =
#endif
#if LIBCURL_VERSION_NUM >= 0x072400 /* 7.36.0 */
URL_DEF_OPTION(SSL_ENABLE_ALPN, LONG, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072400 && LIBCURL_VERSION_NUM < 0x075600 /* 7.36.0 - 7.85.0 */
URL_DEF_OPTION(SSL_ENABLE_NPN, LONG, NULL),
#endif
#if LIBCURL_VERSION_NUM >= 0x072700 /* 7.39.0 */
@@ -854,6 +949,20 @@ struct t_url_option url_options[] =
URL_DEF_OPTION(TLS13_CIPHERS, LIST, NULL),
URL_DEF_OPTION(PROXY_TLS13_CIPHERS, LIST, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x074700 /* 7.71.0 */
+ URL_DEF_OPTION(PROXY_ISSUERCERT, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x074900 /* 7.73.0 */
+ URL_DEF_OPTION(SSL_EC_CURVES, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x074C00 /* 7.76.0 */
+ URL_DEF_OPTION(DOH_SSL_VERIFYHOST, LONG, NULL),
+ URL_DEF_OPTION(DOH_SSL_VERIFYPEER, LONG, NULL),
+ URL_DEF_OPTION(DOH_SSL_VERIFYSTATUS, LONG, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x075700 /* 7.87.0 */
+ URL_DEF_OPTION(CA_CACHE_TIMEOUT, LONG, NULL),
+#endif
/*
* SSH options
@@ -872,6 +981,23 @@ struct t_url_option url_options[] =
#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */
URL_DEF_OPTION(SSH_COMPRESSION, LONG, NULL),
#endif
+#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
+ URL_DEF_OPTION(SSH_HOST_PUBLIC_KEY_SHA256, STRING, NULL),
+#endif
+
+ /*
+ * telnet options
+ */
+#if LIBCURL_VERSION_NUM >= 0x070700 /* 7.7 */
+ URL_DEF_OPTION(TELNETOPTIONS, LIST, NULL),
+#endif
+
+ /*
+ * websocket options
+ */
+#if LIBCURL_VERSION_NUM >= 0x075600 /* 7.86.0 */
+ URL_DEF_OPTION(WS_OPTIONS, MASK, url_websocket),
+#endif
/*
* other options
@@ -880,13 +1006,10 @@ struct t_url_option url_options[] =
URL_DEF_OPTION(NEW_FILE_PERMS, LONG, NULL),
URL_DEF_OPTION(NEW_DIRECTORY_PERMS, LONG, NULL),
#endif
-
- /*
- * telnet options
- */
-#if LIBCURL_VERSION_NUM >= 0x070700 /* 7.7 */
- URL_DEF_OPTION(TELNETOPTIONS, LIST, NULL),
+#if LIBCURL_VERSION_NUM >= 0x075700 /* 7.87.0 */
+ URL_DEF_OPTION(QUICK_EXIT, LONG, NULL),
#endif
+
{ NULL, 0, 0, NULL },
};