security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

* curl-shim.c (curl_easy_perform): Minor cleanup of proxy code.

Browse Source
This commit is contained in:
David Shaw 2006-07-21 02:19:43 +00:00
parent 4fbf91ad9e
commit c45f73774d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keyserver/ChangeLog
View File

@ -1,3 +1,7 @@
2006-07-20 David Shaw <dshaw@jabberwocky.com>
* curl-shim.c (curl_easy_perform): Minor cleanup of proxy code.
2006-07-16 David Shaw <dshaw@jabberwocky.com> 2006-07-16 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key, * gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key,

6
keyserver/curl-shim.c
View File

@ -164,13 +164,11 @@ curl_easy_perform(CURL *curl)
/* Emulate the libcurl proxy behavior. If the calling program set a /* 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 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 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)
{
if(*curl->proxy)
proxy=curl->proxy; proxy=curl->proxy;
}
else else
proxy=getenv(HTTP_PROXY_ENV); proxy=getenv(HTTP_PROXY_ENV);