@@ -1,3 +1,8 @@

+Wed Mar  7 21:35:21 GMT 2007 (njh)

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

+  * libclamav/mbox.c:	mail-follow-urls: handle HTTP headers and body being

+				received in separate packets

+

 Tue Mar  6 22:24:37 CET 2007 (tk)

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

   * libclamav/readdb.c: load daily.cfg before any other files (when loading

@@ -4370,7 +4370,6 @@ getURL(struct arg *arg)

 #else

 	int sd;

 #endif

-	int n;

 	struct sockaddr_in server;

 #ifdef	HAVE_IN_ADDR_T

 	in_addr_t ip;

@@ -4555,6 +4554,7 @@ getURL(struct arg *arg)

 	for(;;) {

 		fd_set set;

 		struct timeval tv;

+		int n;

 		FD_ZERO(&set);

 		FD_SET(sd, &set);

@@ -4641,7 +4641,7 @@ getURL(struct arg *arg)

 		} else

 			ptr = buf;

-		if(fwrite(ptr, n, 1, fp) != 1) {

+		if(n && (fwrite(ptr, n, 1, fp) != 1)) {

 			cli_warnmsg("Error writing %d bytes to %s\n",

 				n, fout);

 			break;