From a7205a080cf1b17d385453c8ec244d3bf67bf537 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 28 May 2009 04:25:25 +0000 Subject: * http.h, http.c (send_request): Pass in srvtag and make its presence sufficient to turn the feature on. (http_open): From here. (http_document): And here. * gpgkeys_hkp.c (srv_replace): New function to transform a SRV hostname to a real hostname. (main): Call it from here for the HAVE_LIBCURL case (without libcurl is handled via the curl-shim). * curl-shim.h, curl-shim.c (curl_easy_setopt, curl_easy_perform): Add a CURLOPT_SRVTAG_GPG_HACK (passed through the the http engine). --- common/http.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'common/http.h') diff --git a/common/http.h b/common/http.h index c92bbf1e6..3b049a7f2 100644 --- a/common/http.h +++ b/common/http.h @@ -63,9 +63,8 @@ enum { HTTP_FLAG_TRY_PROXY = 1, HTTP_FLAG_NO_SHUTDOWN = 2, - HTTP_FLAG_TRY_SRV = 4, - HTTP_FLAG_LOG_RESP = 8, - HTTP_FLAG_NEED_HEADER = 16 + HTTP_FLAG_LOG_RESP = 4, + HTTP_FLAG_NEED_HEADER = 8 }; struct http_context_s; @@ -82,7 +81,8 @@ gpg_error_t http_open (http_t *r_hd, http_req_t reqtype, const char *auth, unsigned int flags, const char *proxy, - void *tls_context); + void *tls_context, + const char *srvtag); void http_start_data (http_t hd); @@ -95,7 +95,8 @@ gpg_error_t http_open_document (http_t *r_hd, const char *auth, unsigned int flags, const char *proxy, - void *tls_context); + void *tls_context, + const char *srvtag); #ifdef HTTP_USE_ESTREAM estream_t http_get_read_ptr (http_t hd); -- cgit v1.2.3