[svn] GnuPG - r4197 - trunk/keyserver

[svn author dshaw]

Author: dshaw
Date: 2006-07-21 04:19:43 +0200 (Fri, 21 Jul 2006)
New Revision: 4197

Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/curl-shim.c
Log:
 * curl-shim.c (curl_easy_perform): Minor cleanup of proxy code.


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2006-07-20 22:26:29 UTC (rev 4196)
+++ trunk/keyserver/ChangeLog	2006-07-21 02:19:43 UTC (rev 4197)
@@ -1,3 +1,7 @@
+2006-07-20  David Shaw  <dshaw at jabberwocky.com>
+
+	* curl-shim.c (curl_easy_perform): Minor cleanup of proxy code.
+
 2006-07-16  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key,

Modified: trunk/keyserver/curl-shim.c
===================================================================
--- trunk/keyserver/curl-shim.c	2006-07-20 22:26:29 UTC (rev 4196)
+++ trunk/keyserver/curl-shim.c	2006-07-21 02:19:43 UTC (rev 4197)
@@ -164,13 +164,11 @@
   /* 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);