diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2006-07-21 00:26:29 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2006-07-21 00:26:29 +0200 |
| commit | 4fbf91ad9eab07b1315143873a94868a114c85ac (patch) | |
| tree | a69819eb6429f92a4770984daa701377bf7629a2 | |
| parent | * gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key, (diff) | |
| download | gnupg2-4fbf91ad9eab07b1315143873a94868a114c85ac.tar.xz gnupg2-4fbf91ad9eab07b1315143873a94868a114c85ac.zip | |
* http.c (send_request): A zero-length proxy is the same as no proxy at
all. Suggested by J. Scott Berg.
Diffstat (limited to '')
| -rw-r--r-- | util/ChangeLog | 5 | ||||
| -rw-r--r-- | util/http.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 914b04c21..d5bfefdc2 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2006-07-20 David Shaw <dshaw@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@jabberwocky.com> * miscutil.c (make_printable_string): Fix bug where some control diff --git a/util/http.c b/util/http.c index b5dc682e4..41000024f 100644 --- a/util/http.c +++ b/util/http.c @@ -574,7 +574,7 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy ) 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": |