diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2008-09-29 17:41:54 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2008-09-29 17:41:54 +0000 |
| commit | 66739da16407a8e56accc236bd3996c1963a6bcf (patch) | |
| tree | 2b8e1d8b4560880b8427231dec5f8c11a6ab5ec0 /indra/test | |
| parent | 13c96cc47ba104483fa6a5f2c2c197f7b66fdecf (diff) | |
Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/lliohttpserver_tut.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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"); |