diff options
| author | David Shaw <[email protected]> | 2003-12-28 16:08:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-12-28 16:08:04 +0000 |
| commit | 48238805b9a767c2ecbfa36575520cc3cebd8940 (patch) | |
| tree | 6835e5d5eae150e2ad2634e06050789f38b745ba /g10/g10.c | |
| parent | * http.h: Pass the http proxy from outside rather than pulling it from the (diff) | |
| download | gnupg-48238805b9a767c2ecbfa36575520cc3cebd8940.tar.gz gnupg-48238805b9a767c2ecbfa36575520cc3cebd8940.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/g10.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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; |