merge r58577:58578 Branch_1-13-3 to release

1 files changed, 19 insertions, 0 deletions

diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp
index 43ef6f4438..865af98761 100644
--- a/indra/test/llhttpclient_tut.cpp
+++ b/indra/test/llhttpclient_tut.cpp
@@ -294,4 +294,23 @@ namespace tut
 		ensureStatusError();
 		ensure_equals("reason", mReason, "STATUS_ERROR");
 	}
+
+	template<> template<>
+		void HTTPClientTestObject::test<7>()
+	{
+		// Can not use the little mini server.  The blocking request won't ever let it run.
+		// Instead get from a known LLSD source and compare results with the non-blocking get
+		// which is tested against the mini server earlier.
+		LLSD expected;
+
+		LLHTTPClient::get("http://secondlife.com/xmlhttp/homepage.php", newResult());
+		runThePump();
+		ensureStatusOK();
+		expected = getResult();
+
+		LLSD result;
+		result = LLHTTPClient::blockingGet("http://secondlife.com/xmlhttp/homepage.php");
+		LLSD body = result["body"];
+		ensure_equals("echoed result matches", body.size(), expected.size());
+	}
 }