[svn] GnuPG - r4196 - trunk/util

[svn author dshaw]

Author: dshaw
Date: 2006-07-21 00:26:29 +0200 (Fri, 21 Jul 2006)
New Revision: 4196

Modified:
   trunk/util/ChangeLog
   trunk/util/http.c
Log:
* http.c (send_request): A zero-length proxy is the same as no proxy at
all.  Suggested by J. Scott Berg.


Modified: trunk/util/ChangeLog
===================================================================
--- trunk/util/ChangeLog	2006-07-17 04:11:30 UTC (rev 4195)
+++ trunk/util/ChangeLog	2006-07-20 22:26:29 UTC (rev 4196)
@@ -1,3 +1,8 @@
+2006-07-20  David Shaw  <dshaw at jabberwocky.com>
+
+	* http.c (send_request): A zero-length proxy is the same as no
+	proxy at all.  Suggested by J. Scott Berg.
+
 2006-04-17  David Shaw  <dshaw at jabberwocky.com>
 
 	* miscutil.c (make_printable_string): Fix bug where some control

Modified: trunk/util/http.c
===================================================================
--- trunk/util/http.c	2006-07-17 04:11:30 UTC (rev 4195)
+++ trunk/util/http.c	2006-07-20 22:26:29 UTC (rev 4196)
@@ -574,7 +574,7 @@
     request=xmalloc(strlen(server)*2 + strlen(p)
 		    + (authstr?strlen(authstr):0)
 		    + (proxy_authstr?strlen(proxy_authstr):0) + 65);
-    if( proxy )
+    if( proxy && *proxy )
       sprintf( request, "%s http://%s:%hu%s%s HTTP/1.0\r\n%s%s",
 	       hd->req_type == HTTP_REQ_GET ? "GET" :
 	       hd->req_type == HTTP_REQ_HEAD? "HEAD":