proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-06 07:00:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

http-transport: Properly cleanup the WSA context

Browse Source
This commit is contained in:
Vicent Marti 2011-10-01 12:58:55 +02:00
parent 1e5b263577
commit 657ce4b5b6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/transport-http.c
View File

@ -348,10 +348,6 @@ static int http_close(git_transport *transport)
if (error < 0) if (error < 0)
return git__throw(GIT_EOSERR, "Failed to close the socket: %s", strerror(errno)); return git__throw(GIT_EOSERR, "Failed to close the socket: %s", strerror(errno));
#ifdef GIT_WIN32
WSACleanup();
#endif
return GIT_SUCCESS; return GIT_SUCCESS;
} }
@ -363,6 +359,14 @@ static void http_free(git_transport *transport)
unsigned int i; unsigned int i;
git_pkt *p; git_pkt *p;
#ifdef GIT_WIN32
/* cleanup the WSA context. note that this context
* can be initialized more than once with WSAStartup(),
* and needs to be cleaned one time for each init call
*/
WSACleanup();
#endif
git_vector_foreach(refs, i, p) { git_vector_foreach(refs, i, p) {
git_pkt_free(p); git_pkt_free(p);
} }
@ -374,13 +378,9 @@ static void http_free(git_transport *transport)
free(t); free(t);
} }
int git_transport_http(git_transport **out) int git_transport_http(git_transport **out)
{ {
transport_http *t; transport_http *t;
#ifdef GIT_WIN32
int ret;
#endif
t = git__malloc(sizeof(transport_http)); t = git__malloc(sizeof(transport_http));
if (t == NULL) if (t == NULL)
@ -393,15 +393,15 @@ int git_transport_http(git_transport **out)
t->parent.close = http_close; t->parent.close = http_close;
t->parent.free = http_free; t->parent.free = http_free;
*out = (git_transport *) t;
#ifdef GIT_WIN32 #ifdef GIT_WIN32
ret = WSAStartup(MAKEWORD(2,2), &t->wsd); /* on win32, the WSA context needs to be initialized
if (ret != 0) { * before any socket calls can be performed */
http_free(*out); if (WSAStartup(MAKEWORD(2,2), &t->wsd) != 0) {
http_free(t);
return git__throw(GIT_EOSERR, "Winsock init failed"); return git__throw(GIT_EOSERR, "Winsock init failed");
} }
#endif #endif
*out = (git_transport *) t;
return GIT_SUCCESS; return GIT_SUCCESS;
} }