diff --git a/ChangeLog b/ChangeLog
index 893882ff..f78f30ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 11 11:55:59 CEST 2004 Daniel Veillard <daniel@veillard.com>
+
+	* xmlIO.c: fix to the fix for #141864 from Paul Elseth  
+	* HTMLparser.c result/HTML/doc3.htm: apply fix from David Gatwood for
+	  #141195 about text between comments.
+
 Tue May 11 23:04:47 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
 	* xmlschemas.c, include/libxml/schemasInternals.h,
diff --git a/HTMLparser.c b/HTMLparser.c
index bf671a11..2e7984d4 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -2027,6 +2027,8 @@ static int areBlanks(htmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
 	return(1);
     if (ctxt->node == NULL) return(0);
     lastChild = xmlGetLastChild(ctxt->node);
+    while ((lastChild) && (lastChild->type == XML_COMMENT_NODE))
+	lastChild = lastChild->prev;
     if (lastChild == NULL) {
         if ((ctxt->node->type != XML_ELEMENT_NODE) &&
             (ctxt->node->content != NULL)) return(0);
diff --git a/result/HTML/doc3.htm b/result/HTML/doc3.htm
index fad60cbc..ef6fddd4 100644
--- a/result/HTML/doc3.htm
+++ b/result/HTML/doc3.htm
@@ -367,7 +367,8 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
 						<INPUT TYPE="TEXT" NAME="email" SIZE="10" VALUE="ur@email.com"><BR>
 						<INPUT TYPE="HIDDEN" NAME="subscribe" SIZE="-1" VALUE="subscribe"><INPUT TYPE="IMAGE" SRC="/images/subscribe.gif" WIDTH="80"
 						HEIGHT="27" ALIGN="BOTTOM" BORDER="0"></FONT>
-						</FORM> --><form action="http://bp6.gamesquad.net/cgi-bin/news/viewnews.cgi?emaillist" method="post">
+						</FORM> -->
+            <form action="http://bp6.gamesquad.net/cgi-bin/news/viewnews.cgi?emaillist" method="post">
 <img height="1" src="doc3_files/spacer.gif" width="111"><br><font size="1">Newsletter<br><input name="npemail" size="13" value="e-mail addr."><br><input name="npsubscribe" style="BACKGROUND-COLOR: #000000; COLOR: #ffffff; FONT-FAMILY: Verdana; FONT-SIZE: xx-small; FONT-WEIGHT: bold" type="submit" value="Subscribe"><br><!-- <input type="submit" name="npunsubscribe" value="Unsubscribe" style="font-size: xx-small; font-family: Verdana; font-weight: bold; color: #ffffff; background-color: #000000;"> --></font>
 </form>
 <font size="1">
@@ -384,7 +385,8 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
 					</TR>
 				</TABLE> 
 --><table bgcolor="silver" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td align="middle" width="100%">
-<!-- BEGIN GoTo.com Search Box --><script language="javascript" type="text/javascript">
+<!-- BEGIN GoTo.com Search Box -->
+            <script language="javascript" type="text/javascript">
 							<!--
 							if ((parseInt(navigator.appVersion) >= 3)
 							&& (navigator.appName != "Netscape")) {
@@ -414,7 +416,8 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
 							}
 							// -->
 							</script><b><noscript></noscript></b><a href="http://www.goto.com/d/search/ssn/?fromGIF=true" target="_blank"><img align="bottom" border="0" height="90" ismap src="doc3_files/100x90.gif" width="100"></a><b><a href="http://www.goto.com/d/search/ssn/?fromGIF=true" target="_blank"> 
-            </a></b><b></b><b><!-- END GoTo.com Search Box --></b><!-- Pricewatch Search Box --><form action="http://www.pricewatch.com/search/search.asp" method="get" target="_Blank">
+            </a></b><b></b><b><!-- END GoTo.com Search Box --></b><!-- Pricewatch Search Box -->
+            <form action="http://www.pricewatch.com/search/search.asp" method="get" target="_Blank">
             <center>
             <p><b><font color="white" face="ARIAL, HELVETICA" size="1">PC Price 
             Search<br></font></b><input maxlength="30" name="criteria" size="10"><br><input name="submit" style="BACKGROUND-COLOR: #000000; COLOR: #ffffff; FONT-FAMILY: Verdana; FONT-SIZE: xx-small; FONT-WEIGHT: bold" type="submit" value="Search"></p>
diff --git a/xmlIO.c b/xmlIO.c
index cb67fb83..1093622e 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -2230,8 +2230,8 @@ xmlOutputBufferCreateFilename(const char *URI,
 
     puri = xmlParseURI(URI);
     if (puri != NULL) {
-        if ((puri->scheme == NULL) ||
-	    (xmlStrEqual(BAD_CAST puri->scheme, BAD_CAST "file")))
+        if ((puri->scheme != NULL) &&
+	    (!xmlStrEqual(BAD_CAST puri->scheme, BAD_CAST "file")))
 	    is_file_uri = 0;
 	/*
 	 * try to limit the damages of the URI unescaping code.