diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 14:19:58 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 14:19:58 -0800 |
| commit | 40f9b9c7bc110523f7a6c18208e2c20220c1aeb4 (patch) | |
| tree | 4f633a8b2aa0b1f64ec03acd07a25654fb1b17fc | |
| parent | 99763d52fc649ffb300987a679c4c5924471bd3c (diff) | |
| parent | d8464088eb9ee89367c485a10f3b1b2fbb439b63 (diff) | |
Merge branch '1.15'
| -rw-r--r-- | paramiko/transport.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index db4c9577..18571fdb 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -277,7 +277,7 @@ class Transport (threading.Thread, ClosingContextManager): self._channels = ChannelMap() self.channel_events = {} # (id -> Event) self.channels_seen = {} # (id -> True) - self._channel_counter = 1 + self._channel_counter = 0 self.default_max_packet_size = default_max_packet_size self.default_window_size = default_window_size self._forward_agent_handler = None diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 1df4214e..79cf318b 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :bug:`266` Change numbering of `~paramiko.transport.Transport` channels to + start at 0 instead of 1 for better compatibility with OpenSSH & certain + server implementations which break on 1-indexed channels. Thanks to + ``@egroeper`` for catch & patch. * :bug:`459` Tighten up agent connection closure behavior to avoid spurious ``ResourceWarning`` display in some situations. Thanks to ``@tkrapp`` for the catch. |