From ea079d283de6bf4ac70d7530fac70938e7c5e8f5 Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Fri, 25 Sep 2015 11:43:16 +0200
Subject: [PATCH] dirmngr: Default to http protocol for http-proxy

* common/http.c (send_request): Fix handling for hostname:port string.

--
The first pass to parse_uri should already do a scheme check so
that a hostname:port string is detected as invlaid and the retry
code actually takes effect and adds a http://

GnuPG-bug-id: 2109
---
 common/http.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/http.c b/common/http.c
index be5bd308a..edd8a6d27 100644
--- a/common/http.c
+++ b/common/http.c
@@ -1513,7 +1513,7 @@ send_request (http_t hd, const char *httphost, const char *auth,
       if (proxy)
 	http_proxy = proxy;
 
-      err = parse_uri (&uri, http_proxy, 1, 0);
+      err = parse_uri (&uri, http_proxy, 0, 0);
       if (gpg_err_code (err) == GPG_ERR_INV_URI
           && is_hostname_port (http_proxy))
         {