gnupg/keyserver (ChangeLog gpgkeys_http.c gpgkeys_oldhkp.c)

[cvs user dshaw]

    Date: Wednesday, June 22, 2005 @ 06:16:29
  Author: dshaw
    Path: /cvs/gnupg/gnupg/keyserver

Modified: ChangeLog gpgkeys_http.c gpgkeys_oldhkp.c

* gpgkeys_http.c (get_key), gpgkeys_oldhkp.c (send_key, get_key,
search_key): Fix http_open/http_open_document calls to pass NULL for
auth and proxyauth since these programs pass them in the URL.


------------------+
 ChangeLog        |    6 ++++++
 gpgkeys_http.c   |    2 +-
 gpgkeys_oldhkp.c |    7 ++++---
 3 files changed, 11 insertions(+), 4 deletions(-)


Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.132 gnupg/keyserver/ChangeLog:1.133
--- gnupg/keyserver/ChangeLog:1.132	Tue Jun 21 06:24:10 2005
+++ gnupg/keyserver/ChangeLog	Wed Jun 22 06:16:29 2005
@@ -1,3 +1,9 @@
+2005-06-21  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_http.c (get_key), gpgkeys_oldhkp.c (send_key, get_key,
+	search_key): Fix http_open/http_open_document calls to pass NULL
+	for auth and proxyauth since these programs pass them in the URL.
+
 2005-06-20  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_hkp.c (append_path, send_key, get_key, search_key,
Index: gnupg/keyserver/gpgkeys_http.c
diff -u gnupg/keyserver/gpgkeys_http.c:1.16 gnupg/keyserver/gpgkeys_http.c:1.17
--- gnupg/keyserver/gpgkeys_http.c:1.16	Tue May 31 10:39:15 2005
+++ gnupg/keyserver/gpgkeys_http.c	Wed Jun 22 06:16:29 2005
@@ -76,7 +76,7 @@
   sprintf(request,"http://%s%s%s%s%s%s%s",auth[0]?auth:"",auth[0]?"@":"",
 	  host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path);
 
-  rc=http_open_document(&hd,request,http_flags,proxy[0]?proxy:NULL);
+  rc=http_open_document(&hd,request,NULL,http_flags,proxy[0]?proxy:NULL,NULL);
   if(rc!=0)
     {
       fprintf(console,"gpgkeys: HTTP fetch error: %s\n",
Index: gnupg/keyserver/gpgkeys_oldhkp.c
diff -u gnupg/keyserver/gpgkeys_oldhkp.c:1.5 gnupg/keyserver/gpgkeys_oldhkp.c:1.6
--- gnupg/keyserver/gpgkeys_oldhkp.c:1.5	Tue Jun 21 06:24:10 2005
+++ gnupg/keyserver/gpgkeys_oldhkp.c	Wed Jun 22 06:16:29 2005
@@ -148,7 +148,8 @@
   if(verbose>2)
     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
 
-  rc=http_open(&hd,HTTP_REQ_POST,request,http_flags,proxy[0]?proxy:NULL);
+  rc=http_open(&hd,HTTP_REQ_POST,request,NULL,http_flags,
+	       proxy[0]?proxy:NULL,NULL);
   if(rc)
     {
       fprintf(console,"gpgkeys: unable to connect to `%s'\n",host);
@@ -252,7 +253,7 @@
   if(verbose>2)
     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
 
-  rc=http_open_document(&hd,request,http_flags,proxy[0]?proxy:NULL);
+  rc=http_open_document(&hd,request,NULL,http_flags,proxy[0]?proxy:NULL,NULL);
   if(rc!=0)
     {
       fprintf(console,"gpgkeys: HKP fetch error: %s\n",
@@ -675,7 +676,7 @@
   if(verbose>2)
     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
 
-  rc=http_open_document(&hd,request,http_flags,proxy[0]?proxy:NULL);
+  rc=http_open_document(&hd,request,NULL,http_flags,proxy[0]?proxy:NULL,NULL);
   if(rc)
     {
       fprintf(console,"gpgkeys: can't search keyserver `%s': %s\n",