From a73740b3040854601f9f4e0b75b117f506bec13e Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Sun, 1 Nov 2015 09:04:31 +0100
Subject: [PATCH 1/2] Backported fix for #1399

Problem: asserts if EINVAL recieved on read/write

This causes assertion failures after network reconnects.

Solution: allow EINVAL as a possible condition after read/write.

Fixes #829
Fixes #1399

Patch provided by Michele Dionisio @mdionisio, thanks :)
---
 src/tcp.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tcp.cpp b/src/tcp.cpp
index 21814104..cc9e7c64 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -192,7 +192,6 @@ int zmq::tcp_write (fd_t s_, const void *data_, size_t size_)
                    && errno != EBADF
                    && errno != EDESTADDRREQ
                    && errno != EFAULT
-                   && errno != EINVAL
                    && errno != EISCONN
                    && errno != EMSGSIZE
                    && errno != ENOMEM
@@ -241,7 +240,6 @@ int zmq::tcp_read (fd_t s_, void *data_, size_t size_)
     if (rc == -1) {
         errno_assert (errno != EBADF
                    && errno != EFAULT
-                   && errno != EINVAL
                    && errno != ENOMEM
                    && errno != ENOTSOCK);
         if (errno == EWOULDBLOCK || errno == EINTR)

From c41d8aa12b4addf84366faf04be0284e49b5ef8b Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Sun, 1 Nov 2015 09:06:22 +0100
Subject: [PATCH 2/2] Updated version number for next release

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 34ef53f8..835615a8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 0MQ version 4.1.4 stable, released on 2015/xx/xx
 ================================================
 
+* Fixed #1399 - assertion failure in tcp.cpp after network reconnect.
+
 
 0MQ version 4.1.3 stable, released on 2015/08/17
 ================================================