From 291d99bc66c4c2b8009ba723a43e2e97d24313f9 Mon Sep 17 00:00:00 2001 From: Tess Chu Date: Thu, 15 Nov 2007 19:22:19 +0000 Subject: svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6 --- indra/llcommon/lluri.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/llcommon/lluri.h') diff --git a/indra/llcommon/lluri.h b/indra/llcommon/lluri.h index 3246dcd81f..bfe673c2f7 100644 --- a/indra/llcommon/lluri.h +++ b/indra/llcommon/lluri.h @@ -107,7 +107,7 @@ public: BOOL defaultPort() const; // true if port is default for scheme const std::string& escapedPath() const { return mEscapedPath; } std::string path() const; // ex.: "/abc/def", includes leading slash - // LLSD pathArray() const; // above decoded into an array of strings + LLSD pathArray() const; // above decoded into an array of strings std::string query() const; // ex.: "x=34", section after "?" const std::string& escapedQuery() const { return mEscapedQuery; } LLSD queryMap() const; // above decoded into a map @@ -135,6 +135,11 @@ public: //@} private: + // only "http", "https", "ftp", and "secondlife" schemes are parsed + // secondlife scheme parses authority as "" and includes it as part of + // the path. See lluri_tut.cpp + // i.e. secondlife://app/login has mAuthority = "" and mPath = "/app/login" + void parseAuthorityAndPathUsingOpaque(); std::string mScheme; std::string mEscapedOpaque; std::string mEscapedAuthority; -- cgit v1.2.3