- TODO: updated adding cleanup of generated doc
- configure.in: prepared to release 2.3.11
- xmllint.c: added --version for bug reporting
- doc/html/*.html: rebuilt the doc
Daniel
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index 757e2d5..702fe90 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -122,7 +122,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN9689"
+NAME="AEN9740"
></A
><H2
>Name</H2
@@ -130,7 +130,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN9692"
+NAME="AEN9743"
></A
><H2
>Synopsis</H2
@@ -210,6 +210,20 @@
HREF="libxml-uri.html#XMLURIPTR"
>xmlURIPtr</A
> uri);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>* <A
+HREF="libxml-uri.html#XMLURIESCAPESTR"
+>xmlURIEscapeStr</A
+> (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *str,
+ const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *list);
char* <A
HREF="libxml-uri.html#XMLURIUNESCAPESTRING"
>xmlURIUnescapeString</A
@@ -244,7 +258,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN9720"
+NAME="AEN9775"
></A
><H2
>Description</H2
@@ -254,14 +268,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN9723"
+NAME="AEN9778"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9725"
+NAME="AEN9780"
></A
><H3
><A
@@ -278,16 +292,26 @@
><PRE
CLASS="PROGRAMLISTING"
>struct xmlURI {
- char *scheme; /* the URI scheme */
- char *opaque; /* opaque part */
- char *authority; /* the authority part */
- char *server; /* the server part */
- char *user; /* the user part */
- int port; /* the port number */
- char *path; /* the path string */
- char *query; /* the query string */
- char *fragment; /* the fragment identifier */
-};</PRE
+
+ char *scheme;
+
+ char *opaque;
+
+ char *authority;
+
+ char *server;
+
+ char *user;
+
+ int port;
+
+ char *path;
+
+ char *query;
+
+ char *fragment;
+
+}; </PRE
></TD
></TR
></TABLE
@@ -300,33 +324,20 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9731"
+NAME="AEN9786"
></A
><H3
><A
NAME="XMLURIPTR"
></A
>xmlURIPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlURI *xmlURIPtr;</PRE
-></TD
-></TR
-></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9736"
+NAME="AEN9790"
></A
><H3
><A
@@ -356,7 +367,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9743"
+NAME="AEN9797"
></A
><P
></P
@@ -381,7 +392,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->the new structure or NULL in case of error</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -392,7 +403,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9752"
+NAME="AEN9806"
></A
><H3
><A
@@ -434,7 +445,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9762"
+NAME="AEN9816"
></A
><P
></P
@@ -461,7 +472,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the URI instance found in the document</TD
+> </TD
></TR
><TR
><TD
@@ -478,7 +489,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the base value</TD
+> </TD
></TR
><TR
><TD
@@ -493,8 +504,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->a new URI string (to be freed by the caller) or NULL in case
-of error.</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -505,7 +515,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9779"
+NAME="AEN9833"
></A
><H3
><A
@@ -537,7 +547,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9787"
+NAME="AEN9841"
></A
><P
></P
@@ -579,7 +589,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->a newly build xmlURIPtr or NULL in case of error</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -590,7 +600,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9800"
+NAME="AEN9854"
></A
><H3
><A
@@ -629,7 +639,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9809"
+NAME="AEN9863"
></A
><P
></P
@@ -656,7 +666,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> pointer to an URI structure</TD
+> </TD
></TR
><TR
><TD
@@ -673,7 +683,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the string to analyze</TD
+> </TD
></TR
><TR
><TD
@@ -688,7 +698,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->0 or the error code</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -699,7 +709,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9826"
+NAME="AEN9880"
></A
><H3
><A
@@ -732,7 +742,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9834"
+NAME="AEN9888"
></A
><P
></P
@@ -759,7 +769,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> pointer to an xmlURI</TD
+> </TD
></TR
><TR
><TD
@@ -774,7 +784,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->a new string (to be deallocated by caller)</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -785,7 +795,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9847"
+NAME="AEN9901"
></A
><H3
><A
@@ -824,7 +834,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9856"
+NAME="AEN9910"
></A
><P
></P
@@ -851,7 +861,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> a FILE* for the output</TD
+> </TD
></TR
><TR
><TD
@@ -868,7 +878,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> pointer to an xmlURI</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -879,7 +889,115 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9869"
+NAME="AEN9923"
+></A
+><H3
+><A
+NAME="XMLURIESCAPESTR"
+></A
+>xmlURIEscapeStr ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>* xmlURIEscapeStr (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *str,
+ const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *list);</PRE
+></TD
+></TR
+></TABLE
+><P
+>This routine escapes a string to hex, ignoring reserved characters (a-z)
+and the characters in the exception list.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN9932"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>str</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> </TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>list</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> </TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> </TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9949"
></A
><H3
><A
@@ -912,7 +1030,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9876"
+NAME="AEN9956"
></A
><P
></P
@@ -939,7 +1057,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the string to unescape</TD
+> </TD
></TR
><TR
><TD
@@ -956,7 +1074,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the lenght in bytes to unescape (or <= 0 to indicate full string)</TD
+> </TD
></TR
><TR
><TD
@@ -973,7 +1091,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> optionnal destination buffer</TD
+> </TD
></TR
><TR
><TD
@@ -988,7 +1106,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->an copy of the string, but unescaped</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -999,7 +1117,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9897"
+NAME="AEN9977"
></A
><H3
><A
@@ -1029,7 +1147,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9904"
+NAME="AEN9984"
></A
><P
></P
@@ -1056,7 +1174,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> pointer to the path string</TD
+> </TD
></TR
><TR
><TD
@@ -1071,7 +1189,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->0 or an error code</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -1082,7 +1200,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9917"
+NAME="AEN9997"
></A
><H3
><A
@@ -1113,18 +1231,11 @@
It will try to escape the chars needing this, but this is heuristic
based it's impossible to be sure.</P
><P
->TODO: make the proper implementation of this function by calling
-<A
-HREF="libxml-uri.html#XMLPARSEURIREFERENCE"
->xmlParseURIReference</A
->() and escaping each section accordingly
-to the rules (c.f. bug 51876)</P
-><P
></P
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9927"
+NAME="AEN10005"
></A
><P
></P
@@ -1151,7 +1262,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the string of the URI to escape</TD
+> </TD
></TR
><TR
><TD
@@ -1166,7 +1277,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
->an copy of the string, but escaped</TD
+> </TD
></TR
></TBODY
></TABLE
@@ -1177,7 +1288,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9940"
+NAME="AEN10018"
></A
><H3
><A
@@ -1207,7 +1318,7 @@
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN9947"
+NAME="AEN10025"
></A
><P
></P
@@ -1234,7 +1345,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> pointer to an xmlURI</TD
+> </TD
></TR
></TBODY
></TABLE