Skip to content
Snippets Groups Projects
Commit b10940e8 authored by Mnikolenko ProductEngine's avatar Mnikolenko ProductEngine
Browse files

MAINT-5019 FIXED Undesired http:// added to domains sent in chat

parent bd3ee81e
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "linden_common.h" #include "linden_common.h"
#include "lluriparser.h" #include "lluriparser.h"
LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mRes(0) LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mNormalizedTmp(false), mRes(0)
{ {
mState.uri = &mUri; mState.uri = &mUri;
...@@ -140,7 +140,7 @@ void LLUriParser::extractParts() ...@@ -140,7 +140,7 @@ void LLUriParser::extractParts()
return; return;
} }
if (mTmpScheme) if (mTmpScheme || mNormalizedTmp)
{ {
mScheme.clear(); mScheme.clear();
} }
...@@ -169,6 +169,7 @@ void LLUriParser::extractParts() ...@@ -169,6 +169,7 @@ void LLUriParser::extractParts()
S32 LLUriParser::normalize() S32 LLUriParser::normalize()
{ {
mNormalizedTmp = mTmpScheme;
if (!mRes) if (!mRes)
{ {
mRes = uriNormalizeSyntaxExA(&mUri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST); mRes = uriNormalizeSyntaxExA(&mUri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
......
...@@ -81,6 +81,7 @@ class LL_COMMON_API LLUriParser ...@@ -81,6 +81,7 @@ class LL_COMMON_API LLUriParser
S32 mRes; S32 mRes;
bool mTmpScheme; bool mTmpScheme;
bool mNormalizedTmp;
}; };
#endif // LL_LLURIPARSER_H #endif // LL_LLURIPARSER_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment