Unverified Commit 5ffbb63e authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl: --doh-url added

parent abff1833

docs/cmdline-opts/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


DPAGES = abstract-unix-socket.d anyauth.d append.d basic.d cacert.d capath.d cert.d \

  cert-status.d cert-type.d ciphers.d compressed.d compressed-ssh.d     \

  config.d                                                              \

  config.d doh-url.d                                                    \

  connect-timeout.d connect-to.d continue-at.d cookie.d cookie-jar.d    \

  create-dirs.d crlf.d crlfile.d data-ascii.d data-binary.d data.d      \

  data-raw.d data-urlencode.d delegation.d digest.d disable.d           \

docs/cmdline-opts/doh-url.d

0 → 100644
+9 −0
Original line number Diff line number Diff line 
Long: doh-url

Arg: <URL>

Help: Resolve host names over DOH

Protocols: all

---

Specifies which DNS-over-HTTPS (DOH) server to use to resolve hostnames,

instead of using the default name resolver mechanism. The URL must be HTTPS.



If this option is used several times, the last one will be used.

src/tool_cfgable.c

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static void free_config_fields(struct OperationConfig *config) 
  config->url_get = NULL;

  config->url_out = NULL;



  Curl_safefree(config->doh_url);

  Curl_safefree(config->cipher_list);

  Curl_safefree(config->proxy_cipher_list);

  Curl_safefree(config->cert);

src/tool_cfgable.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ struct OperationConfig { 
  struct getout *url_get;   /* point to the node to fill in URL */

  struct getout *url_out;   /* point to the node to fill in outfile */

  struct getout *url_ul;    /* point to the node to fill in upload */

  char *doh_url;

  char *cipher_list;

  char *proxy_cipher_list;

  char *cipher13_list;

src/tool_getparam.c

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static const struct LongShort aliases[]= { 
  {"*b", "egd-file",                 ARG_STRING},

  {"*B", "oauth2-bearer",            ARG_STRING},

  {"*c", "connect-timeout",          ARG_STRING},

  {"*C", "doh-url"        ,          ARG_STRING},

  {"*d", "ciphers",                  ARG_STRING},

  {"*D", "dns-interface",            ARG_STRING},

  {"*e", "disable-epsv",             ARG_BOOL},
@@ -619,6 +620,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ 
        if(err)

          return err;

        break;

      case 'C': /* doh-url */

        GetStr(&config->doh_url, nextarg);

        break;

      case 'd': /* ciphers */

        GetStr(&config->cipher_list, nextarg);

        break;