From 48238805b9a767c2ecbfa36575520cc3cebd8940 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sun, 28 Dec 2003 16:08:04 +0000 Subject: * options.h, g10.c (main), keyserver.c (keyserver_opts, parse_keyserver_uri): honor-http-proxy is no longer an option since we can do the same thing with http-proxy with no arguments. Also remove broken-http-proxy since it can be better handled in the HTTP helper. --- g10/g10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'g10/g10.c') diff --git a/g10/g10.c b/g10/g10.c index 531506284..60c52672b 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -1983,11 +1983,10 @@ main( int argc, char **argv ) case oNoLiteral: opt.no_literal = 1; break; case oSetFilesize: opt.set_filesize = pargs.r.ret_ulong; break; case oHonorHttpProxy: - opt.keyserver_options.honor_http_proxy = 1; + add_to_strlist(&opt.keyserver_options.other,"http-proxy"); deprecated_warning(configname,configlineno, "--honor-http-proxy", - "--keyserver-options ", - "honor-http-proxy"); + "--keyserver-options ","http-proxy"); break; case oFastListMode: opt.fast_list_mode = 1; break; case oFixedListMode: opt.fixed_list_mode = 1; break; -- cgit v1.2.3