diff options
| author | David Shaw <[email protected]> | 2005-03-10 19:34:40 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-03-10 19:34:40 +0000 |
| commit | 9bf9389179b7eed08b6f3ba107a546a03ac28eff (patch) | |
| tree | 831c2e262286b3461acbdf14b7c9af9d3254f2f2 | |
| parent | * delkey.c (do_delete_key, delete_keys): Fix problem with --expert (diff) | |
| download | gnupg-9bf9389179b7eed08b6f3ba107a546a03ac28eff.tar.gz gnupg-9bf9389179b7eed08b6f3ba107a546a03ac28eff.zip | |
* keyserver.c (parse_keyserver_options): Accept honor-http-proxy as an
alias for http-proxy.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/keyserver.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 4156ae744..c8fad2788 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2005-03-10 David Shaw <[email protected]> + * keyserver.c (parse_keyserver_options): Accept honor-http-proxy + as an alias for http-proxy. + * delkey.c (do_delete_key, delete_keys): Fix problem with --expert preventing --delete-secret-and-public-keys from deleting secret keys. diff --git a/g10/keyserver.c b/g10/keyserver.c index 7389d1e60..b6edae10f 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -83,6 +83,14 @@ parse_keyserver_options(char *options) if(tok[0]=='\0') continue; + /* For backwards compatibility. 1.2.x used honor-http-proxy and + there are a good number of documents published that recommend + it. */ + if(ascii_strcasecmp(tok,"honor-http-proxy")==0) + tok="http-proxy"; + else if(ascii_strcasecmp(tok,"no-honor-http-proxy")==0) + tok="no-http-proxy"; + /* We accept quite a few possible options here - some options to handle specially, the keyserver_options list, and import and export options that pertain to keyserver operations. Note |