diff options
| author | Werner Koch <[email protected]> | 2017-04-03 18:56:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-04-03 18:56:12 +0000 |
| commit | 3533b854408fa93734742b2ee12b62aa0d55ff28 (patch) | |
| tree | 80e6b337fac1b54d7d3759913ff5aa931e4cdbd6 /dirmngr/ks-engine-http.c | |
| parent | dirmngr,w32: Silence the 'certificate already cached' message. (diff) | |
| download | gnupg-3533b854408fa93734742b2ee12b62aa0d55ff28.tar.gz gnupg-3533b854408fa93734742b2ee12b62aa0d55ff28.zip | |
dirmngr: New option --disable-ipv6
* dirmngr/dirmngr.h (struct opt): Add field 'disable_ipv6'.
* dirmngr/dirmngr.c (oDisableIPv6): New const.
(opts): New option --disable-ipv6.
(parse_rereadable_options): Set that option.
* dirmngr/dns-stuff.c (opt_disable_ipv6): New var.
(set_dns_disable_ipv6): New.
(resolve_name_standard): Make use of it.
* dirmngr/ks-engine-finger.c (ks_finger_fetch): Take care of
OPT.DISABLE_IPV6.
* dirmngr/ks-engine-hkp.c (map_host): Ditto.
(send_request): Ditto.
* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
* dirmngr/ocsp.c (do_ocsp_request): Ditto.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/ks-engine-http.c')
| -rw-r--r-- | dirmngr/ks-engine-http.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dirmngr/ks-engine-http.c b/dirmngr/ks-engine-http.c index d4a6c8a63..02269da6e 100644 --- a/dirmngr/ks-engine-http.c +++ b/dirmngr/ks-engine-http.c @@ -92,7 +92,8 @@ ks_http_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp) /* fixme: AUTH */ NULL, ((opt.honor_http_proxy? HTTP_FLAG_TRY_PROXY:0) | (dirmngr_use_tor ()? HTTP_FLAG_FORCE_TOR:0) - | (opt.disable_ipv4? HTTP_FLAG_IGNORE_IPv4 : 0)), + | (opt.disable_ipv4? HTTP_FLAG_IGNORE_IPv4 : 0) + | (opt.disable_ipv6? HTTP_FLAG_IGNORE_IPv6 : 0)), ctrl->http_proxy, session, NULL, |