1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00

* 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.
This commit is contained in:
David Shaw 2005-06-22 04:16:29 +00:00
parent 1684bda54e
commit 7f4d49b470
3 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2005-06-21 David Shaw <dshaw@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@jabberwocky.com> 2005-06-20 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (append_path, send_key, get_key, search_key, * gpgkeys_hkp.c (append_path, send_key, get_key, search_key,

View File

@ -76,7 +76,7 @@ get_key(char *getkey)
sprintf(request,"http://%s%s%s%s%s%s%s",auth[0]?auth:"",auth[0]?"@":"", sprintf(request,"http://%s%s%s%s%s%s%s",auth[0]?auth:"",auth[0]?"@":"",
host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); 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) if(rc!=0)
{ {
fprintf(console,"gpgkeys: HTTP fetch error: %s\n", fprintf(console,"gpgkeys: HTTP fetch error: %s\n",

View File

@ -148,7 +148,8 @@ send_key(int *eof)
if(verbose>2) if(verbose>2)
fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request); 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) if(rc)
{ {
fprintf(console,"gpgkeys: unable to connect to `%s'\n",host); fprintf(console,"gpgkeys: unable to connect to `%s'\n",host);
@ -252,7 +253,7 @@ get_key(char *getkey)
if(verbose>2) if(verbose>2)
fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request); 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) if(rc!=0)
{ {
fprintf(console,"gpgkeys: HKP fetch error: %s\n", fprintf(console,"gpgkeys: HKP fetch error: %s\n",
@ -675,7 +676,7 @@ search_key(char *searchkey)
if(verbose>2) if(verbose>2)
fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request); 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) if(rc)
{ {
fprintf(console,"gpgkeys: can't search keyserver `%s': %s\n", fprintf(console,"gpgkeys: can't search keyserver `%s': %s\n",