From da57956327d601aa489392cd94e3f976dca29739 Mon Sep 17 00:00:00 2001 From: Matthew Leeds Date: Tue, 2 Apr 2019 13:40:11 -0700 Subject: [PATCH] lib: Check for http_proxy being the empty string On at least one user's computer, g_getenv("http_proxy") returns the empty string, so check for that and treat it as no proxy rather than printing a warning. See https://github.com/flatpak/flatpak/issues/2790 Closes: #1835 Approved by: cgwalters --- src/libostree/ostree-fetcher-soup.c | 4 ++-- src/libostree/ostree-repo-pull.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libostree/ostree-fetcher-soup.c b/src/libostree/ostree-fetcher-soup.c index 3951a927..970ac7a4 100644 --- a/src/libostree/ostree-fetcher-soup.c +++ b/src/libostree/ostree-fetcher-soup.c @@ -645,7 +645,7 @@ _ostree_fetcher_constructed (GObject *object) } http_proxy = g_getenv ("http_proxy"); - if (http_proxy != NULL) + if (http_proxy != NULL && http_proxy[0] != '\0') _ostree_fetcher_set_proxy (self, http_proxy); /* FIXME Maybe implement GInitableIface and use g_thread_try_new() @@ -711,7 +711,7 @@ _ostree_fetcher_set_proxy (OstreeFetcher *self, SoupURI *proxy_uri; g_return_if_fail (OSTREE_IS_FETCHER (self)); - g_return_if_fail (http_proxy != NULL); + g_return_if_fail (http_proxy != NULL && http_proxy[0] != '\0'); proxy_uri = soup_uri_new (http_proxy); diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 1377ee92..5d77bc7e 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -3034,7 +3034,7 @@ _ostree_repo_remote_new_fetcher (OstreeRepo *self, &http_proxy, error)) goto out; - if (http_proxy != NULL) + if (http_proxy != NULL && http_proxy[0] != '\0') _ostree_fetcher_set_proxy (fetcher, http_proxy); }