From 4cc52142b82bae7cd5f0159ca8990b551fb15893 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Sun, 3 Apr 2005 03:48:08 +0000 Subject: [PATCH] Update wxURI for RFC 3986 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/uri.tex | 3 +-- include/wx/uri.h | 4 +--- src/common/uri.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/latex/wx/uri.tex b/docs/latex/wx/uri.tex index 3fcdb05674..04c3d0cd3a 100644 --- a/docs/latex/wx/uri.tex +++ b/docs/latex/wx/uri.tex @@ -15,8 +15,7 @@ wxURI is used to extract information from a URI (Uniform Resource Identifier). For information about URIs, see -\urlref{RFC 2396}{http://www.ietf.org/rfc/rfc2396.txt} or -\urlref{RFC 2396.bis (Updated draft of RFC 2396)}{http://www.gbiv.com/protocols/uri/rev-2002/rfc2396bis.html}. +\urlref{RFC 3986}{http://www.ietf.org/rfc/rfc3986.txt}. In short, a URL \em{is} a URI. In other words, URL is a subset of a URI - all diff --git a/include/wx/uri.h b/include/wx/uri.h index b81159a3af..c433a15ab9 100644 --- a/include/wx/uri.h +++ b/include/wx/uri.h @@ -49,9 +49,7 @@ enum wxURIFlags // Generic class for parsing URIs. // -// Originally based off of RFC 2396 - then -// extended to meet the newer RFC 2396.bis -// specifications. +// See RFC 3986 class WXDLLIMPEXP_BASE wxURI : public wxObject { public: diff --git a/src/common/uri.cpp b/src/common/uri.cpp index d7e42961a9..7fdac5d033 100644 --- a/src/common/uri.cpp +++ b/src/common/uri.cpp @@ -375,7 +375,7 @@ bool wxURI::IsReference() const // Master URI parsing method. Just calls the individual parsing methods // // URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ] -// URI-reference = URI / relative-URITestCase +// URI-reference = URI / relative // --------------------------------------------------------------------------- const wxChar* wxURI::Parse(const wxChar* uri) -- 2.50.0