diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-07-03 13:06:46 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-07-03 13:06:46 -0400 |
| commit | 2d7b7de20327a40be12a620debaae9917af16cd6 (patch) | |
| tree | 501d8a8f5213466c061d31bafc0d43ca9f0657b6 /indra/llcorehttp/_httpopcancel.cpp | |
| parent | 7997a9c4e58f67a8cf4d13cdc3e2a1b536bc1e4d (diff) | |
More integration work for texture fetch timeouts.
The fetch state machine received a new timeout during the WAIT_HTTP_REQ
state. For the integration, rather than jump the state to done, we issue
a request cancel and let the notification plumbing do the rest without
any race conditions or special-case logic.
Diffstat (limited to 'indra/llcorehttp/_httpopcancel.cpp')
| -rw-r--r-- | indra/llcorehttp/_httpopcancel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httpopcancel.cpp b/indra/llcorehttp/_httpopcancel.cpp index ad624d2e57..5c1f484109 100644 --- a/indra/llcorehttp/_httpopcancel.cpp +++ b/indra/llcorehttp/_httpopcancel.cpp @@ -61,7 +61,11 @@ HttpOpCancel::~HttpOpCancel() void HttpOpCancel::stageFromRequest(HttpService * service) { - // *FIXME: Need cancel functionality into services + if (! service->cancel(mHandle)) + { + mStatus = HttpStatus(HttpStatus::LLCORE, HE_HANDLE_NOT_FOUND); + } + addAsReply(); } |