diff options
| author | Werner Koch <[email protected]> | 2015-04-21 15:14:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-04-21 15:15:34 +0000 |
| commit | a0dead5edce07838cf5ff3ec7205a3bff2a6ef70 (patch) | |
| tree | 9cde273c57c7f1e97260f0da17d2475130849fd2 /dirmngr/crlfetch.c | |
| parent | gpg: Do not use honor-keyserver-url sub-option by default. (diff) | |
| download | gnupg-a0dead5edce07838cf5ff3ec7205a3bff2a6ef70.tar.gz gnupg-a0dead5edce07838cf5ff3ec7205a3bff2a6ef70.zip | |
dirmngr: Add http proxy support for keyservers.
* dirmngr/dirmngr.h (server_control_s): Add field http_proxy.
* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Copy http_proxy value
from OPT.
(dirmngr_deinit_default_ctrl): New.
(main): Call dirmngr_deinit_default_ctrl.
* dirmngr/server.c (start_command_handler): Ditto.
(option_handler): Add option "http-proxy".
* dirmngr/crlfetch.c (crl_fetch): Take http_proxy from CTRL.
* dirmngr/ocsp.c (do_ocsp_request): Ditto.
* dirmngr/ks-engine-hkp.c (send_request): Add proxy support.
* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/crlfetch.c')
| -rw-r--r-- | dirmngr/crlfetch.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/dirmngr/crlfetch.c b/dirmngr/crlfetch.c index 2c4a24783..3b3916a23 100644 --- a/dirmngr/crlfetch.c +++ b/dirmngr/crlfetch.c @@ -157,10 +157,6 @@ crl_fetch (ctrl_t ctrl, const char *url, ksba_reader_t *reader) char *free_this = NULL; int redirects_left = 2; /* We allow for 2 redirect levels. */ -#ifndef USE_LDAP - (void)ctrl; -#endif - *reader = NULL; if (!url) @@ -202,7 +198,7 @@ crl_fetch (ctrl_t ctrl, const char *url, ksba_reader_t *reader) err = http_open_document (&hd, url, NULL, (opt.honor_http_proxy? HTTP_FLAG_TRY_PROXY:0) |(DBG_LOOKUP? HTTP_FLAG_LOG_RESP:0), - opt.http_proxy, NULL, NULL, NULL); + ctrl->http_proxy, NULL, NULL, NULL); switch ( err? 99999 : http_get_status_code (hd) ) { |