diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-12-21 22:21:58 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-12-21 22:21:58 +0000 |
| commit | 6c3375356e7366f4384d9233a43d2c58a01e7241 (patch) | |
| tree | e17c003d9203e6799555020c83330867f87e986d /indra/llcorehttp | |
| parent | b003ed1fd708db2061c3557251c198040746eb07 (diff) | |
SH-3331 Fix incorrect overrun message when sending body with HTTP
request. During readcallback, would generate an overrun-type message
about reading position beyond end-of-data. Mistake was is messaging
when state is exactly at end of data (which is expected) versus an
overrun. Both result in declaring end-of-data to libcurl. Also
changed some of the status logging for the metrics payload to be
less chatty on success, more informative on error.
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/_httpoprequest.cpp | 9 |
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; } |