4 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d5d672f..5423a24f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 22 15:36:45 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* parser.c: fixed a reported bug in NOTATION parsing
+	* uri.c: accepted but not fixed bug 51876, added TODO 
+	* Makefile.am: fixed bug 51876
+
 Thu Mar 22 13:41:22 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* config.h.in configure.in error.c: fix a compilation problem
diff --git a/Makefile.am b/Makefile.am
index 41238ce9..fb9efd5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,7 +75,7 @@ testURI_LDADD= $(LDADDS)
 check-local: tests
 
 $(srcdir)/libxml:
-	-$(RM) $(srcdir)/libxml
+	-$(RM) -f $(srcdir)/libxml
 	ln -s $(srcdir)/. $(srcdir)/libxml
 
 install-data: $(srcdir)/libxml
diff --git a/parser.c b/parser.c
index e1de3115..c967768e 100644
--- a/parser.c
+++ b/parser.c
@@ -2588,6 +2588,8 @@ xmlParseExternalID(xmlParserCtxtPtr ctxt, xmlChar **publicID, int strict) {
     xmlChar *URI = NULL;
 
     SHRINK;
+
+    *publicID = NULL;
     if ((RAW == 'S') && (NXT(1) == 'Y') &&
          (NXT(2) == 'S') && (NXT(3) == 'T') &&
 	 (NXT(4) == 'E') && (NXT(5) == 'M')) {
diff --git a/uri.c b/uri.c
index 51c18041..2334ec9c 100644
--- a/uri.c
+++ b/uri.c
@@ -987,6 +987,10 @@ xmlURIUnescapeString(const char *str, int len, char *target) {
  * It will try to escape the chars needing this, but this is heuristic
  * based it's impossible to be sure.
  *
+ * TODO: make the proper implementation of this function by calling
+ *       xmlParseURIReference() and escaping each section accordingly
+ *       to the rules (c.f. bug 51876)
+ *
  * Returns an copy of the string, but escaped
  */
 xmlChar *