diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /debian/patches/ssh1-keepalive.patch | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'debian/patches/ssh1-keepalive.patch')
-rw-r--r-- | debian/patches/ssh1-keepalive.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/ssh1-keepalive.patch b/debian/patches/ssh1-keepalive.patch index 87211e8a3..de61e1dd9 100644 --- a/debian/patches/ssh1-keepalive.patch +++ b/debian/patches/ssh1-keepalive.patch | |||
@@ -1,13 +1,13 @@ | |||
1 | Description: Partial server keep-alive implementation for SSH1 | 1 | Description: Partial server keep-alive implementation for SSH1 |
2 | Author: Colin Watson <cjwatson@debian.org> | 2 | Author: Colin Watson <cjwatson@debian.org> |
3 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1712 | 3 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1712 |
4 | Last-Update: 2013-05-07 | 4 | Last-Update: 2013-09-14 |
5 | 5 | ||
6 | Index: b/clientloop.c | 6 | Index: b/clientloop.c |
7 | =================================================================== | 7 | =================================================================== |
8 | --- a/clientloop.c | 8 | --- a/clientloop.c |
9 | +++ b/clientloop.c | 9 | +++ b/clientloop.c |
10 | @@ -565,16 +565,21 @@ | 10 | @@ -563,16 +563,21 @@ |
11 | static void | 11 | static void |
12 | server_alive_check(void) | 12 | server_alive_check(void) |
13 | { | 13 | { |
@@ -38,20 +38,20 @@ Index: b/clientloop.c | |||
38 | } | 38 | } |
39 | 39 | ||
40 | /* | 40 | /* |
41 | @@ -636,7 +641,7 @@ | 41 | @@ -634,7 +639,7 @@ |
42 | */ | 42 | */ |
43 | 43 | ||
44 | timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */ | 44 | timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */ |
45 | - if (options.server_alive_interval > 0 && compat20) | 45 | - if (options.server_alive_interval > 0 && compat20) { |
46 | + if (options.server_alive_interval > 0) | 46 | + if (options.server_alive_interval > 0) { |
47 | timeout_secs = options.server_alive_interval; | 47 | timeout_secs = options.server_alive_interval; |
48 | set_control_persist_exit_time(); | 48 | server_alive_time = now + options.server_alive_interval; |
49 | if (control_persist_exit_time > 0) { | 49 | } |
50 | Index: b/ssh_config.5 | 50 | Index: b/ssh_config.5 |
51 | =================================================================== | 51 | =================================================================== |
52 | --- a/ssh_config.5 | 52 | --- a/ssh_config.5 |
53 | +++ b/ssh_config.5 | 53 | +++ b/ssh_config.5 |
54 | @@ -1102,7 +1102,10 @@ | 54 | @@ -1130,7 +1130,10 @@ |
55 | .Cm ServerAliveCountMax | 55 | .Cm ServerAliveCountMax |
56 | is left at the default, if the server becomes unresponsive, | 56 | is left at the default, if the server becomes unresponsive, |
57 | ssh will disconnect after approximately 45 seconds. | 57 | ssh will disconnect after approximately 45 seconds. |