Commit 2db71194de87a83f1e504f9664dd3ca74fd0a6c4
2014-07-24T04:15:24
Set timeout on remote (WinHTTP) to infinite #2147
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index 1e46dfa..b328988 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -212,6 +212,8 @@ static int winhttp_stream_connect(winhttp_stream *s)
BOOL peerdist = FALSE;
int error = -1;
unsigned long disable_redirects = WINHTTP_DISABLE_REDIRECTS;
+ int default_timeout = -1;
+
/* Prepare URL */
git_buf_printf(&buf, "%s%s", t->connection_data.path, s->service_url);
@@ -240,6 +242,8 @@ static int winhttp_stream_connect(winhttp_stream *s)
goto on_error;
}
+ WinHttpSetTimeouts(s->request, default_timeout, default_timeout, default_timeout, default_timeout);
+
/* Set proxy if necessary */
if (git_remote__get_http_proxy(t->owner->owner, !!t->connection_data.use_ssl, &proxy_url) < 0)
goto on_error;
@@ -467,6 +471,7 @@ static int winhttp_connect(
int32_t port;
const char *default_port = "80";
int error = -1;
+ int default_timeout = -1;
/* Prepare port */
if (git__strtol32(&port, t->connection_data.port, NULL, 10) < 0)
@@ -491,6 +496,9 @@ static int winhttp_connect(
goto on_error;
}
+ WinHttpSetTimeouts(t->session, default_timeout, default_timeout, default_timeout, default_timeout);
+
+
/* Establish connection */
t->connection = WinHttpConnect(
t->session,