SSLSocket write and send methods check for empty input

Closes gevent#719
ninchat · Feb 18, 2016 · 1656884 · 1656884
1 parent ca60c7a
commit 1656884
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/gevent/_ssl2.py b/gevent/_ssl2.py
@@ -135,6 +135,8 @@ def read(self, len=1024):
     def write(self, data):
         """Write DATA to the underlying SSL channel.  Returns
         number of bytes of DATA actually transmitted."""
+        if len(data) == 0:
+            return 0
         while True:
             try:
                 return self._sslobj.write(data)
@@ -173,6 +175,8 @@ def send(self, data, flags=0, timeout=timeout_default):
                 raise ValueError(
                     "non-zero flags not allowed in calls to send() on %s" %
                     self.__class__)
+            if len(data) == 0:
+                return 0
             while True:
                 try:
                     v = self._sslobj.write(data)

diff --git a/gevent/_ssl3.py b/gevent/_ssl3.py
@@ -253,6 +253,8 @@ def write(self, data):
         if not self._sslobj:
             raise ValueError("Write on closed or unwrapped SSL socket.")
 
+        if len(data) == 0:
+            return 0
         while True:
             try:
                 return self._sslobj.write(data)
@@ -332,6 +334,8 @@ def send(self, data, flags=0, timeout=timeout_default):
                 raise ValueError(
                     "non-zero flags not allowed in calls to send() on %s" %
                     self.__class__)
+            if len(data) == 0:
+                return 0
             while True:
                 try:
                     return self._sslobj.write(data)

diff --git a/gevent/_sslgte279.py b/gevent/_sslgte279.py
@@ -327,6 +327,8 @@ def write(self, data):
         self._checkClosed()
         if not self._sslobj:
             raise ValueError("Write on closed or unwrapped SSL socket.")
+        if len(data) == 0:
+            return 0
         while True:
             try:
                 return self._sslobj.write(data)
@@ -398,6 +400,8 @@ def send(self, data, flags=0, timeout=timeout_default):
         if not self._sslobj:
             return socket.send(self, data, flags, timeout)
 
+        if len(data) == 0:
+            return 0
         while True:
             try:
                 return self._sslobj.write(data)