From a21c415687a855f84fbf10db91671b1341e8b990 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 21 Sep 2015 17:22:53 +1000
Subject: [PATCH] 4219.   [bug]           Set event->result to ISC_R_WOULDBLOCK
 on EWOULDBLOCK,                         EGAIN when these soft error are not
 retried for                         isc_socket_send*().

---
 CHANGES                      | 4 ++++
 lib/isc/include/isc/result.h | 3 ++-
 lib/isc/result.c             | 2 ++
 lib/isc/unix/socket.c        | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 627dcb7753..5abde3fc7d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4219.	[bug]		Set event->result to ISC_R_WOULDBLOCK on EWOULDBLOCK,
+			EGAIN when these soft error are not retried for
+			isc_socket_send*().
+
 4218.	[bug]		Potential null pointer dereference on out of memory
 			if mmap is not supported. [RT #40777]
 
diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index b1d351dcb5..e52c058909 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -89,9 +89,10 @@
 #define ISC_R_BADBASE32			60	/*%< bad base32 encoding */
 #define ISC_R_UNSET			61	/*%< unset */
 #define ISC_R_MULTIPLE			62	/*%< multiple */
+#define ISC_R_WOULDBLOCK		63	/*%< would block */
 
 /*% Not a result code: the number of results. */
-#define ISC_R_NRESULTS 			63
+#define ISC_R_NRESULTS 			64
 
 ISC_LANG_BEGINDECLS
 
diff --git a/lib/isc/result.c b/lib/isc/result.c
index d6bbad7a6d..854ff413b1 100644
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -104,6 +104,7 @@ static const char *description[ISC_R_NRESULTS] = {
 	"bad base32 encoding",			/*%< 60 */
 	"unset",				/*%< 61 */
 	"multiple",				/*%< 62 */
+	"would block",				/*%< 63 */
 };
 
 static const char *identifier[ISC_R_NRESULTS] = {
@@ -170,6 +171,7 @@ static const char *identifier[ISC_R_NRESULTS] = {
 	"ISC_R_BADBASE32",
 	"ISC_R_UNSET",
 	"ISC_R_MULTIPLE",
+	"ISC_R_WOULDBLOCK",
 };
 
 #define ISC_RESULT_RESULTSET			2
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index ad7aa5fef9..ea009134c5 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -2054,8 +2054,11 @@ doio_send(isc__socket_t *sock, isc_socketevent_t *dev) {
 		if (send_errno == EINTR && ++attempts < NRETRIES)
 			goto resend;
 
-		if (SOFT_ERROR(send_errno))
+		if (SOFT_ERROR(send_errno)) {
+			if (errno == EWOULDBLOCK || errno == EAGAIN)
+				dev->result = ISC_R_WOULDBLOCK;
 			return (DOIO_SOFT);
+		}
 
 #define SOFT_OR_HARD(_system, _isc) \
 	if (send_errno == _system) { \