Skip to content

Fix broken Connection.sendall (#12) #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wolever wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix broken Connection.sendall (#12) #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfb09b7
Fix broken Connection.sendall (#12)
wolever Mar 6, 2016
1d020a3
Catch EPIPE on connection shutdown
wolever Jun 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions gevent_openssl/SSL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ def send(self, data, flags=0):
return self.__send(self._connection.send, data, flags)

def sendall(self, data, flags=0):
return self.__send(self._connection.sendall, data, flags)
# Note: all of the types supported by OpenSSL's Connection.sendall,
# basestring, memoryview, and buffer, support len(...) and slicing,
# so they are safe to use here.
while len(data) > 0:
res = self.send(data, flags)
data = data[res:]

def __send(self, send_method, data, flags=0):
try:
Expand Down Expand Up @@ -74,4 +79,11 @@ def recv(self, bufsiz, flags=0):
raise

def shutdown(self):
return self.__iowait(self._connection.shutdown)
try:
return self.__iowait(self._connection.shutdown)
except OpenSSL.SSL.SysCallError as e:
# PyOpenSSL will raise an EPIPE if the connection was already
# closed, and that's safe to ignore here.
if e[1] == 'EPIPE':
return True
raise