diff options
| author | David Shaw <[email protected]> | 2004-12-22 19:19:10 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-12-22 19:19:10 +0000 |
| commit | 97b8f41b08c378ab20dbd00be1ab23453c8d3670 (patch) | |
| tree | 2632e18ac44c2f9a363a80f8bd1f3c0947a2836d /keyserver/gpgkeys_hkp.c | |
| parent | * options.h, keyserver.c (parse_keyserver_uri): Properly parse auth data (diff) | |
| download | gnupg-97b8f41b08c378ab20dbd00be1ab23453c8d3670.tar.gz gnupg-97b8f41b08c378ab20dbd00be1ab23453c8d3670.zip | |
* gpgkeys_curl.c (main): New "follow-redirects" option. Takes an optional
numeric value for the maximum number of redirects to allow. Defaults to
5.
* gpgkeys_curl.c (main), gpgkeys_finger.c (main), gpgkeys_hkp.c (main),
gpgkeys_http.c (main), gpgkeys_ldap.c (main): Make sure that a "timeout"
option passed with no arguments is properly handled.
Diffstat (limited to 'keyserver/gpgkeys_hkp.c')
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index 506513835..db1e7ea0e 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -949,8 +949,10 @@ main(int argc,char *argv[]) { if(no) timeout=0; - else + else if(start[7]=='=') timeout=atoi(&start[8]); + else if(start[7]=='\0') + timeout=DEFAULT_KEYSERVER_TIMEOUT; } continue; |