8000 Backports for v1.7 by ethomson · Pull Request #6614 · libgit2/libgit2 · GitHub
[go: up one dir, main page]
Skip to content

Backports for v1.7 #6614

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 14 commits into from
Aug 8, 2023
Merged

Backports for v1.7 #6614

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
03b0642
stransport: macos: replace errSSLNetworkTimeout, with hard-coded value
mascguy Jul 25, 2023
085a169
fix: Add missing include for oidarray.
dvzrv Jul 21, 2023
86a4a26
repository: make cleanup safe for re-use with grafts
carlosmn Jul 18, 2023
ec2439b
ssh: fix known_hosts leak in _git_ssh_setup_conn
steven9724 Jun 20, 2023
0ddc077
Merge branch 'v1.7_backports' into maint/v1.7
ethomson Aug 2, 2023
402f63a
Return an error for invalid proxy URLs instead of crashing.
lrm29 Jul 17, 2023
5a13d4c
Validate proxy URL on Windows.
lrm29 Jul 19, 2023
a3d2922
httpclient: safety
ethomson Jul 31, 2023
95d4cb6
net: refactor url parsing
ethomson Aug 1, 2023
1d7d6ff
net: introduce http-biased url parsing
ethomson Aug 1, 2023
7a901fb
http: allow proxies to be specified in common format
ethomson Aug 1, 2023
00c62ab
http: test proxies in url and host:port format
ethomson Aug 1, 2023
38a3a37
winhttp: use new http-style url parser for proxies
ethomson Aug 2, 2023
393dd49
Merge branch 'v1.7_proxy' into maint/v1.7
ethomson Aug 2, 2023
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
1 change: 1 addition & 0 deletions include/git2/sys/transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define INCLUDE_sys_git_transport_h

#include "git2/net.h"
#include "git2/oidarray.h"
#include "git2/proxy.h"
#include "git2/remote.h"
#include "git2/strarray.h"
Expand Down
2 changes: 2 additions & 0 deletions src/libgit2/repository.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ int git_repository__cleanup(git_repository *repo)
git_cache_clear(&repo->objects);
git_attr_cache_flush(repo);
git_grafts_free(repo->grafts);
repo->grafts = NULL;
git_grafts_free(repo->shallow_grafts);
repo->shallow_grafts = NULL;

set_config(repo, NULL);
set_index(repo, NULL);
Expand Down
4 changes: 2 additions & 2 deletions src/libgit2/streams/stransport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static OSStatus write_cb(SSLConnectionRef conn, const void *data, size_t *len)
if (ret < 0) {
st->error = ret;
return (ret == GIT_TIMEOUT) ?
errSSLNetworkTimeout :
-9853 /* errSSLNetworkTimeout */:
-36 /* ioErr */;
}

Expand Down Expand Up @@ -214,7 +214,7 @@ static OSStatus read_cb(SSLConnectionRef conn, void *data, size_t *len)
if (ret < 0) {
st->error = ret;
error = (ret == GIT_TIMEOUT) ?
errSSLNetworkTimeout :
-9853 /* errSSLNetworkTimeout */:
-36 /* ioErr */;
break;
} else if (ret == 0) {
Expand Down
5 changes: 3 additions & 2 deletions src/libgit2/transports/ssh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,11 +877,12 @@ static int _git_ssh_setup_conn(
t->current_stream = s;

done:
if (known_hosts)
libssh2_knownhost_free(known_hosts);

if (error < 0) {
ssh_stream_free(*stream);

if (known_hosts)
libssh2_knownhost_free(known_hosts);
if (session)
libssh2_session_free(session);
}
Expand Down
0