diff options
author | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:18:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:32:50 +0000 |
commit | 0b372585c0026f78676f1414510ec9f87a383803 (patch) | |
tree | a3fa6b329a8a5e9841b526f30332d21fc110118a /debian/patches/ssh1-keepalive.patch | |
parent | 24ffa45372888d206f21e1864e3911024c6d5e62 (diff) | |
parent | 6d0faf6dc76ac8cc73d6f8e478db7c97f7013a2d (diff) |
New upstream release (7.0p1).
Diffstat (limited to 'debian/patches/ssh1-keepalive.patch')
-rw-r--r-- | debian/patches/ssh1-keepalive.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/ssh1-keepalive.patch b/debian/patches/ssh1-keepalive.patch index 705004567..cf414d4d5 100644 --- a/debian/patches/ssh1-keepalive.patch +++ b/debian/patches/ssh1-keepalive.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 634f3188e7f3c104cc7b13a078059f15f3f4a68a Mon Sep 17 00:00:00 2001 | 1 | From f1b6288dd90b72d4cad7e65f35d05148a5ba1874 Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:09:51 +0000 | 3 | Date: Sun, 9 Feb 2014 16:09:51 +0000 |
4 | Subject: Partial server keep-alive implementation for SSH1 | 4 | Subject: Partial server keep-alive implementation for SSH1 |
@@ -13,10 +13,10 @@ Patch-Name: ssh1-keepalive.patch | |||
13 | 2 files changed, 19 insertions(+), 11 deletions(-) | 13 | 2 files changed, 19 insertions(+), 11 deletions(-) |
14 | 14 | ||
15 | diff --git a/clientloop.c b/clientloop.c | 15 | diff --git a/clientloop.c b/clientloop.c |
16 | index 77d5498..964353d 100644 | 16 | index fba1b54..9e45d24 100644 |
17 | --- a/clientloop.c | 17 | --- a/clientloop.c |
18 | +++ b/clientloop.c | 18 | +++ b/clientloop.c |
19 | @@ -577,16 +577,21 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt) | 19 | @@ -578,16 +578,21 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt) |
20 | static void | 20 | static void |
21 | server_alive_check(void) | 21 | server_alive_check(void) |
22 | { | 22 | { |
@@ -47,7 +47,7 @@ index 77d5498..964353d 100644 | |||
47 | } | 47 | } |
48 | 48 | ||
49 | /* | 49 | /* |
50 | @@ -648,7 +653,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, | 50 | @@ -649,7 +654,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, |
51 | */ | 51 | */ |
52 | 52 | ||
53 | timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */ | 53 | timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */ |
@@ -57,10 +57,10 @@ index 77d5498..964353d 100644 | |||
57 | server_alive_time = now + options.server_alive_interval; | 57 | server_alive_time = now + options.server_alive_interval; |
58 | } | 58 | } |
59 | diff --git a/ssh_config.5 b/ssh_config.5 | 59 | diff --git a/ssh_config.5 b/ssh_config.5 |
60 | index 59ce400..e60a5b4 100644 | 60 | index b2dc49b..82dcf0c 100644 |
61 | --- a/ssh_config.5 | 61 | --- a/ssh_config.5 |
62 | +++ b/ssh_config.5 | 62 | +++ b/ssh_config.5 |
63 | @@ -1416,7 +1416,10 @@ If, for example, | 63 | @@ -1468,7 +1468,10 @@ If, for example, |
64 | .Cm ServerAliveCountMax | 64 | .Cm ServerAliveCountMax |
65 | is left at the default, if the server becomes unresponsive, | 65 | is left at the default, if the server becomes unresponsive, |
66 | ssh will disconnect after approximately 45 seconds. | 66 | ssh will disconnect after approximately 45 seconds. |