* keyserver.c (parse_keyserver_options): Accept honor-http-proxy as an
authorDavid Shaw <dshaw@jabberwocky.com>
Thu, 10 Mar 2005 19:34:40 +0000 (19:34 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Thu, 10 Mar 2005 19:34:40 +0000 (19:34 +0000)
alias for http-proxy.

g10/ChangeLog
g10/keyserver.c

index 4156ae7..c8fad27 100644 (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
        preventing --delete-secret-and-public-keys from deleting secret
        keys.
        * delkey.c (do_delete_key, delete_keys): Fix problem with --expert
        preventing --delete-secret-and-public-keys from deleting secret
        keys.
index 7389d1e..b6edae1 100644 (file)
@@ -83,6 +83,14 @@ parse_keyserver_options(char *options)
       if(tok[0]=='\0')
        continue;
 
       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
       /* 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