gnupg/g10 (ChangeLog keyserver.c)

[cvs user dshaw]

    Date: Thursday, March 10, 2005 @ 20:34:40
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog keyserver.c

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


-------------+
 ChangeLog   |    3 +++
 keyserver.c |    8 ++++++++
 2 files changed, 11 insertions(+)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.702 gnupg/g10/ChangeLog:1.703
--- gnupg/g10/ChangeLog:1.702	Thu Mar 10 19:43:36 2005
+++ gnupg/g10/ChangeLog	Thu Mar 10 20:34:40 2005
@@ -1,5 +1,8 @@
 2005-03-10  David Shaw  <dshaw at 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.
Index: gnupg/g10/keyserver.c
diff -u gnupg/g10/keyserver.c:1.80 gnupg/g10/keyserver.c:1.81
--- gnupg/g10/keyserver.c:1.80	Sun Feb  6 18:38:43 2005
+++ gnupg/g10/keyserver.c	Thu Mar 10 20:34:40 2005
@@ -83,6 +83,14 @@
       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