From 66739da16407a8e56accc236bd3996c1963a6bcf Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Mon, 29 Sep 2008 17:41:54 +0000 Subject: Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824 --- indra/test/lliohttpserver_tut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/test') diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp index e5607cdad7..72d7936f20 100644 --- a/indra/test/lliohttpserver_tut.cpp +++ b/indra/test/lliohttpserver_tut.cpp @@ -191,7 +191,7 @@ namespace tut "HTTP/1.0 200 OK\r\n"); ensure_contains("web/hello content type", result, - "Content-Type: application/xml\r\n"); + "Content-Type: application/llsd+xml\r\n"); ensure_contains("web/hello content length", result, "Content-Length: 36\r\n"); @@ -232,7 +232,7 @@ namespace tut "HTTP/1.0 200 OK\r\n"); ensure_contains("web/echo content type", result, - "Content-Type: application/xml\r\n"); + "Content-Type: application/llsd+xml\r\n"); ensure_contains("web/echo content length", result, "Content-Length: 35\r\n"); -- cgit v1.2.3