* gpgkeys_http.c (get_key), gpgkeys_oldhkp (send_key, get_key,
authorDavid Shaw <dshaw@jabberwocky.com>
Thu, 23 Jun 2005 04:26:01 +0000 (04:26 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Thu, 23 Jun 2005 04:26:01 +0000 (04:26 +0000)
search_key): No longer need to pass a proxyauth.

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

keyserver/ChangeLog
keyserver/gpgkeys_http.c
keyserver/gpgkeys_oldhkp.c

index 2f5e529..0539dd3 100644 (file)
@@ -1,3 +1,10 @@
+2005-06-23  David Shaw  <dshaw@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@jabberwocky.com>
 
        * gpgkeys_http.c (get_key), gpgkeys_oldhkp.c (send_key, get_key,
index 10178b8..158fec9 100644 (file)
@@ -73,10 +73,11 @@ get_key(char *getkey)
       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 3b89bd6..38865a7 100644 (file)
@@ -149,7 +149,7 @@ send_key(int *eof)
     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 @@ get_key(char *getkey)
   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 @@ search_key(char *searchkey)
   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",