diff --git a/ChangeLog b/ChangeLog index 6091b8d2..96959431 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jun 26 09:46:29 CEST 2001 Daniel Veillard + + * uri.c: fixed 2 uri normalization bugs on '//' reduction + Mon Jun 25 18:06:23 CEST 2001 Daniel Veillard * include/libxml/Makefile.am: Laszlo Peter pointed out that diff --git a/uri.c b/uri.c index 61d93636..bbd3c30f 100644 --- a/uri.c +++ b/uri.c @@ -774,6 +774,9 @@ xmlNormalizeURIPath(char *path) { */ if ((cur[0] == '.') && (cur[1] == '/')) { cur += 2; + /* '//' normalization should be done at this point too */ + while (cur[0] == '/') + cur++; continue; } @@ -790,6 +793,10 @@ xmlNormalizeURIPath(char *path) { goto done_cd; (out++)[0] = (cur++)[0]; } + /* nomalize // */ + while ((cur[0] == '/') && (cur[1] == '/')) + cur++; + (out++)[0] = (cur++)[0]; } done_cd: