Permalink
Browse files

rewrite the URI parser to update to rfc3986 (from 2396) removed the e…

…rror

* uri.c include/libxml/uri.h: rewrite the URI parser to update to
  rfc3986 (from 2396)
* test/errors/webdav.xml result/errors/webdav.xml*: removed the
  error test, 'DAV:' is a correct URI under 3986
* Makefile.am: small cleanup in make check
Daniel

svn path=/trunk/; revision=3763
  • Loading branch information...
1 parent ae0765b commit d7af555327843a9938a913205ac703c13c225603 Daniel Veillard committed Aug 4, 2008
Showing with 1,652 additions and 1,721 deletions.
  1. +8 −0 ChangeLog
  2. +1 −1 Makefile.am
  3. +18 −18 include/libxml/uri.h
  4. +0 −8 result/errors/webdav.xml
  5. +0 −15 result/errors/webdav.xml.err
  6. +0 −16 result/errors/webdav.xml.str
  7. +0 −9 test/errors/webdav.xml
  8. +1 −1 testapi.c
  9. +1,624 −1,653 uri.c
View
@@ -1,3 +1,11 @@
+Mon Aug 4 17:27:27 CEST 2008 Daniel Veillard <daniel@veillard.com>
+
+ * uri.c include/libxml/uri.h: rewrite the URI parser to update to
+ rfc3986 (from 2396)
+ * test/errors/webdav.xml result/errors/webdav.xml*: removed the
+ error test, 'DAV:' is a correct URI under 3986
+ * Makefile.am: small cleanup in make check
+
Thu Jul 31 21:49:45 CEST 2008 Daniel Veillard <daniel@veillard.com>
* runxmlconf.c: more progresses against the official regression tests
View
@@ -167,7 +167,7 @@ runxmlconf_LDADD= $(LDADDS)
#testOOM_LDADD= $(LDADDS)
runtests:
- runtest$(EXEEXT) && testapi$(EXEEXT) && runxmlconf$(EXEEXT)
+ ./runtest$(EXEEXT) && ./testapi$(EXEEXT) && ./runxmlconf$(EXEEXT)
check: all runtests
View
@@ -49,43 +49,43 @@ struct _xmlURI {
* xmlChar * xmlNodeGetBase (xmlDocPtr doc,
* xmlNodePtr cur);
*/
-XMLPUBFUN xmlURIPtr XMLCALL
+XMLPUBFUN xmlURIPtr XMLCALL
xmlCreateURI (void);
-XMLPUBFUN xmlChar * XMLCALL
+XMLPUBFUN xmlChar * XMLCALL
xmlBuildURI (const xmlChar *URI,
- const xmlChar *base);
-XMLPUBFUN xmlChar * XMLCALL
+ const xmlChar *base);
+XMLPUBFUN xmlChar * XMLCALL
xmlBuildRelativeURI (const xmlChar *URI,
- const xmlChar *base);
-XMLPUBFUN xmlURIPtr XMLCALL
+ const xmlChar *base);
+XMLPUBFUN xmlURIPtr XMLCALL
xmlParseURI (const char *str);
-XMLPUBFUN xmlURIPtr XMLCALL
+XMLPUBFUN xmlURIPtr XMLCALL
xmlParseURIRaw (const char *str,
int raw);
-XMLPUBFUN int XMLCALL
+XMLPUBFUN int XMLCALL
xmlParseURIReference (xmlURIPtr uri,
const char *str);
-XMLPUBFUN xmlChar * XMLCALL
+XMLPUBFUN xmlChar * XMLCALL
xmlSaveUri (xmlURIPtr uri);
-XMLPUBFUN void XMLCALL
+XMLPUBFUN void XMLCALL
xmlPrintURI (FILE *stream,
xmlURIPtr uri);
-XMLPUBFUN xmlChar * XMLCALL
+XMLPUBFUN xmlChar * XMLCALL
xmlURIEscapeStr (const xmlChar *str,
- const xmlChar *list);
-XMLPUBFUN char * XMLCALL
+ const xmlChar *list);
+XMLPUBFUN char * XMLCALL
xmlURIUnescapeString (const char *str,
int len,
char *target);
-XMLPUBFUN int XMLCALL
+XMLPUBFUN int XMLCALL
xmlNormalizeURIPath (char *path);
-XMLPUBFUN xmlChar * XMLCALL
+XMLPUBFUN xmlChar * XMLCALL
xmlURIEscape (const xmlChar *str);
-XMLPUBFUN void XMLCALL
+XMLPUBFUN void XMLCALL
xmlFreeURI (xmlURIPtr uri);
-XMLPUBFUN xmlChar* XMLCALL
+XMLPUBFUN xmlChar* XMLCALL
xmlCanonicPath (const xmlChar *path);
-XMLPUBFUN xmlChar* XMLCALL
+XMLPUBFUN xmlChar* XMLCALL
xmlPathToURI (const xmlChar *path);
#ifdef __cplusplus
View
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<propfind xmlns="DAV:"><prop>
-<getcontentlength xmlns="DAV:"/>
-<getlastmodified xmlns="DAV:"/>
-<displayname xmlns="DAV:"/>
-<executable xmlns="http://apache.org/dav/props/"/>
-<resourcetype xmlns="DAV:"/>
-</prop></propfind>
@@ -1,15 +0,0 @@
-./test/errors/webdav.xml:2: namespace error : xmlns: 'DAV:' is not a valid URI
-<propfind xmlns="DAV:"><prop>
- ^
-./test/errors/webdav.xml:3: namespace error : xmlns: 'DAV:' is not a valid URI
-<getcontentlength xmlns="DAV:"/>
- ^
-./test/errors/webdav.xml:4: namespace error : xmlns: 'DAV:' is not a valid URI
-<getlastmodified xmlns="DAV:"/>
- ^
-./test/errors/webdav.xml:5: namespace error : xmlns: 'DAV:' is not a valid URI
-<displayname xmlns="DAV:"/>
- ^
-./test/errors/webdav.xml:7: namespace error : xmlns: 'DAV:' is not a valid URI
-<resourcetype xmlns="DAV:"/>
- ^
@@ -1,16 +0,0 @@
-./test/errors/webdav.xml:2: namespace error : xmlns: 'DAV:' is not a valid URI
-<propfind xmlns="DAV:"><prop>
- ^
-./test/errors/webdav.xml:3: namespace error : xmlns: 'DAV:' is not a valid URI
-<getcontentlength xmlns="DAV:"/>
- ^
-./test/errors/webdav.xml:4: namespace error : xmlns: 'DAV:' is not a valid URI
-<getlastmodified xmlns="DAV:"/>
- ^
-./test/errors/webdav.xml:5: namespace error : xmlns: 'DAV:' is not a valid URI
-<displayname xmlns="DAV:"/>
- ^
-./test/errors/webdav.xml:7: namespace error : xmlns: 'DAV:' is not a valid URI
-<resourcetype xmlns="DAV:"/>
- ^
-./test/errors/webdav.xml : failed to parse
View
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<propfind xmlns="DAV:"><prop>
-<getcontentlength xmlns="DAV:"/>
-<getlastmodified xmlns="DAV:"/>
-<displayname xmlns="DAV:"/>
-<executable xmlns="http://apache.org/dav/props/"/>
-<resourcetype xmlns="DAV:"/>
-</prop></propfind>
-
View
@@ -212,7 +212,7 @@ void xmlErrMemory(xmlParserCtxtPtr ctxt, const char *extra);
name resolution delays, so we use these
*/
#define REMOTE1GOOD "http://localhost/"
-#define REMOTE1BAD "http://missing. example.org/"
+#define REMOTE1BAD "http:http://http"
#define REMOTE2GOOD "ftp://localhost/foo"
#define gen_nb_void_ptr 2
Oops, something went wrong.

0 comments on commit d7af555

Please sign in to comment.