@@ -1,3 +1,7 @@

+Tue Apr  7 16:53:18 CEST 2009 (acab)

+------------------------------------

+ * clamav-milter/netcode.c: honour ReadTimeout=0

+

 Tue Apr  7 12:32:14 CEST 2009 (tk)

 ----------------------------------

  * etc/clamd.conf: remove deprecated ArchiveLimitMemoryUsage (bb#1551)

@@ -237,7 +237,7 @@ char *nc_recv(int s) {

 	FD_ZERO(&fds);

 	FD_SET(s, &fds);

-	res = select(s+1, &fds, NULL, NULL, &tv);

+	res = select(s+1, &fds, NULL, NULL, readtimeout ? &tv : NULL);

 	if(res<1) {

 	    if (res != -1 || errno != EINTR)

 		timeout = 0;