diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2005-06-22 06:16:29 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2005-06-22 06:16:29 +0200 |
| commit | 7f4d49b470f35c71bdaa70332345c9b8002b59a3 (patch) | |
| tree | 13652c1bd1839f54512d202c73563991b6127894 /keyserver | |
| parent | * http.h: Fix prototypes for http_open_document and http_open to pass (diff) | |
| download | gnupg2-7f4d49b470f35c71bdaa70332345c9b8002b59a3.tar.xz gnupg2-7f4d49b470f35c71bdaa70332345c9b8002b59a3.zip | |
* 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.
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 6 | ||||
| -rw-r--r-- | keyserver/gpgkeys_http.c | 2 | ||||
| -rw-r--r-- | keyserver/gpgkeys_oldhkp.c | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index f751fed18..2f5e5297b 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -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> * gpgkeys_hkp.c (append_path, send_key, get_key, search_key, diff --git a/keyserver/gpgkeys_http.c b/keyserver/gpgkeys_http.c index b11970989..10178b878 100644 --- a/keyserver/gpgkeys_http.c +++ b/keyserver/gpgkeys_http.c @@ -76,7 +76,7 @@ get_key(char *getkey) 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", diff --git a/keyserver/gpgkeys_oldhkp.c b/keyserver/gpgkeys_oldhkp.c index 30c0773af..3b89bd66e 100644 --- a/keyserver/gpgkeys_oldhkp.c +++ b/keyserver/gpgkeys_oldhkp.c @@ -148,7 +148,8 @@ send_key(int *eof) 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 @@ get_key(char *getkey) 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 @@ search_key(char *searchkey) 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", |