Merge commit '4ba6cba' into cg_merges_20130602

Conflicts:
	driver-icarus.c

driver-icarus.c

@@ -250,13 +250,6 @@ int icarus_gets(unsigned char *buf, int fd, struct timeval *tv_finish, struct th
 			return ICA_GETS_OK;
 		}
 
-		if (ret > 0) {
-			buf += ret;
-			read_amount -= ret;
-			first = false;
-			continue;
-		}
-			
 		if (thr && thr->work_restart) {
 			if (epollfd != -1)
 				close(epollfd);
@@ -278,6 +271,13 @@ int icarus_gets(unsigned char *buf, int fd, struct timeval *tv_finish, struct th
 			}
 			return ICA_GETS_TIMEOUT;
 		}
+		
+		if (ret > 0) {
+			buf += ret;
+			read_amount -= ret;
+			first = false;
+			continue;
+		}
 	}
 }