Merge remote-tracking branch 'bfg-pull/242/head' into bfgminer

Conflicts:
	util.c

util.c

@@ -1381,8 +1381,11 @@ char *recv_line(struct pool *pool)
 				break;
 			}
 			if (n < 0) {
+				//Save errno from being overweitten bei socket_ commands 
+				int socket_recv_errno;
+				socket_recv_errno = errno;
 				if (!sock_blocks() || !socket_full(pool, false)) {
-					applog(LOG_DEBUG, "Failed to recv sock in recv_line");
+					applog(LOG_DEBUG, "Failed to recv sock in recv_line: %d", socket_recv_errno);
 					suspend_stratum(pool);
 					break;
 				}