diff options
| author | Werner Koch <wk@gnupg.org> | 2006-07-27 16:18:55 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2006-07-27 16:18:55 +0200 |
| commit | de5070caf07854852a36722a0d85453cbbc93c84 (patch) | |
| tree | 39ae89adce5a02311686d4b86bedc1e05b9fbaca /keyserver/curl-shim.c | |
| parent | Create bag attributes so that Mozilla will accept these files. (diff) | |
| download | gnupg2-de5070caf07854852a36722a0d85453cbbc93c84.tar.xz gnupg2-de5070caf07854852a36722a0d85453cbbc93c84.zip | |
Preparing a new releasegnupg-1.9.22
Diffstat (limited to 'keyserver/curl-shim.c')
| -rw-r--r-- | keyserver/curl-shim.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c index 4a4d18f56..c71c655b5 100644 --- a/keyserver/curl-shim.c +++ b/keyserver/curl-shim.c @@ -164,13 +164,11 @@ curl_easy_perform(CURL *curl) /* Emulate the libcurl proxy behavior. If the calling program set a proxy, use it. If it didn't set a proxy or set it to NULL, check for one in the environment. If the calling program explicitly - set a null-string proxy, don't set a proxy at all. */ + set a null-string proxy the http code doesn't use a proxy at + all. */ if(curl->proxy) - { - if(*curl->proxy) - proxy=curl->proxy; - } + proxy=curl->proxy; else proxy=getenv(HTTP_PROXY_ENV); |