Unverified Commit ae4adae9 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

doh: CURL_DISABLE_DOH

parent 52dfab65

lib/doh.c

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 


#include "curl_setup.h"



#ifndef CURL_DISABLE_DOH



#include "urldata.h"

#include "curl_addrinfo.h"

#include "doh.h"
@@ -960,3 +962,5 @@ CURLcode Curl_doh_is_resolved(struct connectdata *conn, 


  return CURLE_OK;

}



#endif /* CURL_DISABLE_DOH */

lib/doh.h

+9 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2018 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -25,6 +25,8 @@ 
#include "urldata.h"

#include "curl_addrinfo.h"



#ifndef CURL_DISABLE_DOH



/*

 * Curl_doh() resolve a name using DoH (DNS-over-HTTPS). It resolves a name

 * and returns a 'Curl_addrinfo *' with the address information.
@@ -102,4 +104,10 @@ DOHcode doh_decode(unsigned char *doh, 
                   struct dohentry *d);

void de_cleanup(struct dohentry *d);

#endif



#else /* if DOH is disabled */

#define Curl_doh(a,b,c,d) NULL

#define Curl_doh_is_resolved(x,y) CURLE_COULDNT_RESOLVE_HOST

#endif



#endif /* HEADER_CURL_DOH_H */

lib/urldata.h

+2 −0
Original line number Diff line number Diff line
@@ -604,7 +604,9 @@ struct SingleRequest { 
  char *upload_fromhere;

  void *protop;       /* Allocated protocol-specific data. Each protocol

                         handler makes sure this points to data it needs. */

#ifndef CURL_DISABLE_DOH

  struct dohdata doh; /* DoH specific data for this request */

#endif

  bit header:1;       /* incoming data has HTTP header */

  bit content_range:1; /* set TRUE if Content-Range: was found */

  bit upload_done:1;  /* set to TRUE when doing chunked transfer-encoding