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

[cvs user dshaw]

    Date: Thursday, June 23, 2005 @ 06:26:01
  Author: dshaw
    Path: /cvs/gnupg/gnupg/keyserver

Modified: ChangeLog gpgkeys_http.c gpgkeys_oldhkp.c

* gpgkeys_http.c (get_key), gpgkeys_oldhkp (send_key, get_key,
search_key): No longer need to pass a proxyauth.

* gpgkeys_http.c (get_key): Pass auth outside of the URL.


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


Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.133 gnupg/keyserver/ChangeLog:1.134
--- gnupg/keyserver/ChangeLog:1.133	Wed Jun 22 06:16:29 2005
+++ gnupg/keyserver/ChangeLog	Thu Jun 23 06:26:01 2005
@@ -1,3 +1,10 @@
+2005-06-23  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_http.c (get_key), gpgkeys_oldhkp (send_key, get_key,
+	search_key): No longer need to pass a proxyauth.
+
+	* gpgkeys_http.c (get_key): Pass auth outside of the URL.
+
 2005-06-21  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_http.c (get_key), gpgkeys_oldhkp.c (send_key, get_key,
Index: gnupg/keyserver/gpgkeys_http.c
diff -u gnupg/keyserver/gpgkeys_http.c:1.17 gnupg/keyserver/gpgkeys_http.c:1.18
--- gnupg/keyserver/gpgkeys_http.c:1.17	Wed Jun 22 06:16:29 2005
+++ gnupg/keyserver/gpgkeys_http.c	Thu Jun 23 06:26:01 2005
@@ -73,10 +73,11 @@
       return KEYSERVER_NO_MEMORY;
     }
 
-  sprintf(request,"http://%s%s%s%s%s%s%s",auth[0]?auth:"",auth[0]?"@":"",
-	  host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path);
+  sprintf(request,"http://%s%s%s%s%s",host,
+	  port[0]?":":"",port[0]?port:"",path[0]?"":"/",path);
 
-  rc=http_open_document(&hd,request,NULL,http_flags,proxy[0]?proxy:NULL,NULL);
+  rc=http_open_document(&hd,request,auth[0]?auth:NULL,
+			http_flags,proxy[0]?proxy: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.6 gnupg/keyserver/gpgkeys_oldhkp.c:1.7
--- gnupg/keyserver/gpgkeys_oldhkp.c:1.6	Wed Jun 22 06:16:29 2005
+++ gnupg/keyserver/gpgkeys_oldhkp.c	Thu Jun 23 06:26:01 2005
@@ -149,7 +149,7 @@
     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
 
   rc=http_open(&hd,HTTP_REQ_POST,request,NULL,http_flags,
-	       proxy[0]?proxy:NULL,NULL);
+	       proxy[0]?proxy:NULL);
   if(rc)
     {
       fprintf(console,"gpgkeys: unable to connect to `%s'\n",host);
@@ -253,7 +253,7 @@
   if(verbose>2)
     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
 
-  rc=http_open_document(&hd,request,NULL,http_flags,proxy[0]?proxy:NULL,NULL);
+  rc=http_open_document(&hd,request,NULL,http_flags,proxy[0]?proxy:NULL);
   if(rc!=0)
     {
       fprintf(console,"gpgkeys: HKP fetch error: %s\n",
@@ -676,7 +676,7 @@
   if(verbose>2)
     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
 
-  rc=http_open_document(&hd,request,NULL,http_flags,proxy[0]?proxy:NULL,NULL);
+  rc=http_open_document(&hd,request,NULL,http_flags,proxy[0]?proxy:NULL);
   if(rc)
     {
       fprintf(console,"gpgkeys: can't search keyserver `%s': %s\n",