Merge branch 'master' into Arduino_1.5.5

Conflicts: UIPEthernet/src/utility/Enc28J60Network.cpp UIPEthernet/src/utility/Enc28J60Network.h
ntruchsess · Jan 14, 2014 · f387143 · f387143
2 parents 0e5f9fa + a69c7a4
commit f387143
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/UIPEthernet/src/UIPClient.cpp b/UIPEthernet/src/UIPClient.cpp
@@ -212,7 +212,7 @@ UIPClient::available()
 {
   if (*this)
     return _available(data);
-  return -1;
+  return 0;
 }
 
 int
@@ -251,7 +251,14 @@ UIPClient::read(uint8_t *buf, size_t size)
               if (uip_stopped(&uip_conns[data->state & UIP_CLIENT_SOCKETS]) && !(data->state & (UIP_CLIENT_CLOSE | UIP_CLIENT_CLOSED)))
                 data->state |= UIP_CLIENT_RESTART;
               if (*p == NOBLOCK)
-                return size-remain;
+                {
+                  if (data->state & UIP_CLIENT_CLOSED)
+                    {
+                      data->state = 0;
+                      data = NULL;
+                    }
+                  return size-remain;
+                }
             }
           else
             {