diff options
| author | David Shaw <[email protected]> | 2004-05-22 03:35:57 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-05-22 03:35:57 +0000 |
| commit | 50f4faee4abf30aeb2a55c0b0733b4f07bdc9628 (patch) | |
| tree | e29940533d399da22966210f16c23a534ed6da45 | |
| parent | * gpg.sgml: Document --edit-key "keyserver" command, --keyid-format, (diff) | |
| download | gnupg-50f4faee4abf30aeb2a55c0b0733b4f07bdc9628.tar.gz gnupg-50f4faee4abf30aeb2a55c0b0733b4f07bdc9628.zip | |
* gpgkeys_http.c (get_key): Cosmetic fix - make sure that URLs with no
path use a path of "/".
Diffstat (limited to '')
| -rw-r--r-- | keyserver/ChangeLog | 3 | ||||
| -rw-r--r-- | keyserver/gpgkeys_http.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 5ff4cc204..b3d2348a5 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,8 @@ 2004-05-21 David Shaw <[email protected]> + * gpgkeys_http.c (get_key): Cosmetic fix - make sure that URLs + with no path use a path of "/". + * gpgkeys_ldap.c (ldap2epochtime): We can always rely on timegm() being available now, since it's a replacement function. diff --git a/keyserver/gpgkeys_http.c b/keyserver/gpgkeys_http.c index 8c750d1a4..e6190b8ff 100644 --- a/keyserver/gpgkeys_http.c +++ b/keyserver/gpgkeys_http.c @@ -66,8 +66,8 @@ get_key(char *getkey) fprintf(output,"KEY 0x%s BEGIN\n",getkey); if(verbose) - fprintf(console,"gpgkeys: requesting key 0x%s from http://%s%s%s/%s\n", - getkey,host,port[0]?":":"",port[0]?port:"",path); + fprintf(console,"gpgkeys: requesting key 0x%s from http://%s%s%s%s%s\n", + getkey,host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); request=malloc(strlen(scheme)+3+strlen(host)+1+strlen(port)+strlen(path)+99); if(!request) @@ -76,8 +76,8 @@ get_key(char *getkey) return KEYSERVER_NO_MEMORY; } - sprintf(request,"%s://%s%s%s%s",scheme,host, - port[0]?":":"",port[0]?port:"",path); + sprintf(request,"%s://%s%s%s%s%s",scheme,host, + port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); if(verbose>2) fprintf(console,"gpgkeys: HTTP URL is \"%s\"\n",request); |