summaryrefslogtreecommitdiff
path: root/indra/llui/tests/llurlentry_test.cpp
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-03-08 13:32:28 -0800
committerGlenn Glazer <coyot@lindenlab.com>2016-03-08 13:32:28 -0800
commitec683bb9cf6688633d8bc7ecbdf72f7cbc14d349 (patch)
tree59ada405958cd7764a96cfa35ccc89e83706b5af /indra/llui/tests/llurlentry_test.cpp
parentdaf8b882a12cf903d180f6303065d7b83f7a1958 (diff)
parent5a5c023e291990a463b1a91846ce82c70da8daab (diff)
pull from trunk
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
-rwxr-xr-xindra/llui/tests/llurlentry_test.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 96e94c0f80..dde54c78c4 100755
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -838,17 +838,21 @@ namespace tut
"search something https://marketplace.secondlife.com/products/search on marketplace and test the https",
"https://marketplace.secondlife.com/products/search");
- testRegex("match urls with port", url,
- "let's specify some port http://secondlife.com:888/status",
- "http://secondlife.com:888/status");
+ testRegex("match HTTPS urls with port", url,
+ "let's specify some port https://secondlife.com:888/status",
+ "https://secondlife.com:888/status");
+
+ testRegex("don't match HTTP urls with port", url,
+ "let's specify some port for HTTP http://secondlife.com:888/status",
+ "");
testRegex("don't match urls w/o protocol", url,
"looks like an url something www.marketplace.secondlife.com/products but no https prefix",
"");
testRegex("but with a protocol www is fine", url,
- "so let's add a protocol http://www.marketplace.secondlife.com:8888/products",
- "http://www.marketplace.secondlife.com:8888/products");
+ "so let's add a protocol https://www.marketplace.secondlife.com:8888/products",
+ "https://www.marketplace.secondlife.com:8888/products");
testRegex("don't match urls w/o protocol", url,
"and even no www something secondlife.com/status",