security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* keyserver.c (parse_keyserver_options): Accept honor-http-proxy as an

Browse Source 
alias for http-proxy.
This commit is contained in:
David Shaw 2005-03-10 19:34:40 +00:00
parent 04f02174e1
commit 9bf9389179
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2005-03-10 David Shaw <dshaw@jabberwocky.com> 2005-03-10 David Shaw <dshaw@jabberwocky.com>
* 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 * delkey.c (do_delete_key, delete_keys): Fix problem with --expert
preventing --delete-secret-and-public-keys from deleting secret preventing --delete-secret-and-public-keys from deleting secret
keys. keys.

8
g10/keyserver.c
View File

@ -83,6 +83,14 @@ parse_keyserver_options(char *options)
if(tok[0]=='\0') if(tok[0]=='\0')
continue; 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 /* We accept quite a few possible options here - some options to
handle specially, the keyserver_options list, and import and handle specially, the keyserver_options list, and import and
export options that pertain to keyserver operations. Note export options that pertain to keyserver operations. Note