Index: tlsIO.c
==================================================================
--- tlsIO.c
+++ tlsIO.c
@@ -465,10 +465,15 @@
 		case SSL_ERROR_ZERO_RETURN:
 			dprintf("Got SSL_ERROR_ZERO_RETURN, this means an EOF has been reached");
 			bytesRead = 0;
 			*errorCodePtr = 0;
 			break;
+		case SSL_ERROR_WANT_READ:
+			dprintf("Got SSL_ERROR_WANT_READ, mapping this to EAGAIN");
+			bytesRead = -1;
+			*errorCodePtr = EAGAIN;
+			break;
 		default:
 			dprintf("Unknown error (err = %i), mapping to EOF", err);
 			*errorCodePtr = 0;
 			bytesRead = 0;
 			break;
@@ -568,11 +573,13 @@
 			if (written < 0) {
 				written = 0;
 			}
 			break;
 		case SSL_ERROR_WANT_WRITE:
-			dprintf(" write W BLOCK");
+			dprintf("Got SSL_ERROR_WANT_WRITE, mapping it to EAGAIN");
+			*errorCodePtr = EAGAIN;
+			written = -1;
 			break;
 		case SSL_ERROR_WANT_READ:
 			dprintf(" write R BLOCK");
 			break;
 		case SSL_ERROR_WANT_X509_LOOKUP: