summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/_httpoprequest.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-24 16:36:31 -0500
committerGeenz <geenz@geenzo.com>2013-01-24 16:36:31 -0500
commitf39532c407229403f6d67312638bf5dc3514687d (patch)
treede0f376b3bbe03d585f989adf02c3eadb01347f2 /indra/llcorehttp/_httpoprequest.cpp
parenta82ff3fcb7556bd810ec37c0b74c565b42e92250 (diff)
parenta30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff)
Merged with latest viewer-dev.
Diffstat (limited to 'indra/llcorehttp/_httpoprequest.cpp')
-rw-r--r--indra/llcorehttp/_httpoprequest.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index 7db19b1841..51a8eaf998 100644
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -580,8 +580,13 @@ size_t HttpOpRequest::readCallback(void * data, size_t size, size_t nmemb, void
const size_t body_size(op->mReqBody->size());
if (body_size <= op->mCurlBodyPos)
{
- LL_WARNS("HttpCore") << "Request body position beyond body size. Aborting request."
- << LL_ENDL;
+ if (body_size < op->mCurlBodyPos)
+ {
+ // Warn but continue if the read position moves beyond end-of-body
+ // for some reason.
+ LL_WARNS("HttpCore") << "Request body position beyond body size. Truncating request body."
+ << LL_ENDL;
+ }
return 0;
}