Thanks to visit codestin.com
Credit goes to github.com

Skip to content

http: support empty http.proxy config setting #6744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2024
Merged

http: support empty http.proxy config setting #6744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libgit2/transports/http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ static int lookup_proxy(
return 0;
}

if (!proxy ||
if (!proxy || !*proxy ||
(error = git_net_url_parse_http(&transport->proxy.url, proxy)) < 0)
goto done;

Expand Down
2 changes: 1 addition & 1 deletion src/libgit2/transports/winhttp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ static int winhttp_stream_connect(winhttp_stream *s)
GIT_ERROR_CHECK_ALLOC(proxy_url);
}

if (proxy_url) {
if (proxy_url && *proxy_url) {
git_str processed_url = GIT_STR_INIT;
WINHTTP_PROXY_INFO proxy_info;
wchar_t *proxy_wide;
Expand Down
20 changes: 20 additions & 0 deletions tests/libgit2/online/fetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,26 @@ void test_online_fetch__fetch_twice(void)
git_remote_free(remote);
}

void test_online_fetch__fetch_with_empty_http_proxy(void)
{
git_remote *remote;
git_config *config;
git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;

opts.proxy_opts.type = GIT_PROXY_AUTO;

cl_git_pass(git_repository_config(&config, _repo));
cl_git_pass(git_config_set_string(config, "http.proxy", ""));

cl_git_pass(git_remote_create(&remote, _repo, "test",
"https://github.com/libgit2/TestGitRepository"));
cl_git_pass(git_remote_fetch(remote, NULL, &opts, NULL));

git_remote_disconnect(remote);
git_remote_free(remote);
git_config_free(config);
}

static int transferProgressCallback(const git_indexer_progress *stats, void *payload)
{
bool *invoked = (bool *)payload;
Expand Down