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

+Mon Sep 20 10:44:35 BST 2004 (trog)

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

+* libclamav/htmlnorm.c: Simplify handling of NL chars, treat as a space.

+

 Mon Sep 20 10:09:55 BST 2004 (njh)

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

   * clamav-milter:	Change to clamd.conf

@@ -490,14 +490,8 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 		}

 		while (*ptr) {

 			if (*ptr == '\n') {

-				if (state == HTML_COMMENT) {

-					html_output_c(file_buff_o1, NULL, ' ');

-				} else if ((state != HTML_SKIP_WS) && 

-						(state != HTML_TRIM_WS) &&

-						(state != HTML_PROCESS_TAG)) {

-					html_output_c(file_buff_o1, file_buff_o2, ' ');

-				}

-				ptr++;

+				/* Convert it to a space and re-process */

+				*ptr = ' ';

 				continue;

 			}

 			if (*ptr == '\r') {