dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.10' 

Conflicts:
	NEWS
This commit is contained in:
Jeff Forcier 2013-04-05 13:02:11 -07:00
parent 73a0d03bdc 02d071be07
commit b329512636
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -25,11 +25,15 @@ v1.11.0 (DD MM YYYY)
implementations of all functionality. Thanks to Jason R. Coombs for the implementations of all functionality. Thanks to Jason R. Coombs for the
patch. patch.
v1.10.1 (DD MM YYYY) v1.10.1 (5th Apr 2013)
-------------------- ----------------------
* #142: (Fabric #811) SFTP put of empty file will still return the attributes * #142: (Fabric #811) SFTP put of empty file will still return the attributes
of the put file. Thanks to Jason R. Coombs for the patch. of the put file. Thanks to Jason R. Coombs for the patch.
* #154: (Fabric #876) Forwarded SSH agent connections left stale local pipes
lying around, which could cause local (and sometimes remote or network)
resource starvation when running many agent-using remote commands. Thanks to
Kevin Tegtmeier for catch & patch.
v1.10.0 (1st Mar 2013) v1.10.0 (1st Mar 2013)
-------------------- --------------------

2
paramiko/__init__.py
View File

@ -55,7 +55,7 @@ if sys.version_info < (2, 5):
__author__ = "Jeff Forcier <jeff@bitprophet.org>" __author__ = "Jeff Forcier <jeff@bitprophet.org>"
__version__ = "1.10.0" __version__ = "1.10.1"
__license__ = "GNU Lesser General Public License (LGPL)" __license__ = "GNU Lesser General Public License (LGPL)"

7
paramiko/agent.py
View File

@ -130,15 +130,22 @@ class AgentProxyThread(threading.Thread):
if len(data) != 0: if len(data) != 0:
self.__inr.send(data) self.__inr.send(data)
else: else:
self._close()
break break
elif self.__inr == fd: elif self.__inr == fd:
data = self.__inr.recv(512) data = self.__inr.recv(512)
if len(data) != 0: if len(data) != 0:
self._agent._conn.send(data) self._agent._conn.send(data)
else: else:
self._close()
break break
time.sleep(io_sleep) time.sleep(io_sleep)
def _close(self):
self._exit = True
self.__inr.close()
self._agent._conn.close()
class AgentLocalProxy(AgentProxyThread): class AgentLocalProxy(AgentProxyThread):
""" """
Class to be used when wanting to ask a local SSH Agent being Class to be used when wanting to ask a local SSH Agent being

2
setup.py
View File

@ -52,7 +52,7 @@ if sys.platform == 'darwin':
setup(name = "paramiko", setup(name = "paramiko",
version = "1.10.0", version = "1.10.1",
description = "SSH2 protocol library", description = "SSH2 protocol library",
author = "Jeff Forcier", author = "Jeff Forcier",
author_email = "jeff@bitprophet.org", author_email = "jeff@bitprophet.org",