From dfd7bfdba8905e62ecf6f4d62822bdb563b2ff2f Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 3 Aug 2022 15:55:04 +0800 Subject: [PATCH] Fix timeout timer is not cleared while xhr.abort is invoked (#12303) * Fix timeout timer is not cleared while xhr.abort is invoked --- native/cocos/bindings/manual/jsb_xmlhttprequest.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/native/cocos/bindings/manual/jsb_xmlhttprequest.cpp b/native/cocos/bindings/manual/jsb_xmlhttprequest.cpp index 251b1adece..5b41fb21f2 100644 --- a/native/cocos/bindings/manual/jsb_xmlhttprequest.cpp +++ b/native/cocos/bindings/manual/jsb_xmlhttprequest.cpp @@ -34,6 +34,7 @@ #include #include #include +#include "application/ApplicationManager.h" #include "base/Config.h" #include "base/std/container/string.h" #include "base/std/container/unordered_map.h" @@ -41,9 +42,8 @@ #include "cocos/base/DeferredReleasePool.h" #include "cocos/bindings/jswrapper/SeApi.h" #include "cocos/bindings/manual/jsb_conversions.h" -#include "cocos/network/HttpClient.h" #include "cocos/engine/BaseEngine.h" -#include "application/ApplicationManager.h" +#include "cocos/network/HttpClient.h" using namespace cc; //NOLINT using namespace cc::network; //NOLINT @@ -243,7 +243,7 @@ XMLHttpRequest::XMLHttpRequest() XMLHttpRequest::~XMLHttpRequest() { if (_scheduler) { _scheduler->unscheduleAllForTarget(this); - } + } // Avoid HttpClient response call a released object! _httpRequest->setResponseCallback(nullptr); CC_SAFE_RELEASE(_httpRequest); @@ -318,6 +318,9 @@ void XMLHttpRequest::abort() { setReadyState(ReadyState::DONE); + // Unregister timeout timer while abort is invoked. + _scheduler->unscheduleAllForTarget(this); + if (onabort != nullptr) { onabort(); } @@ -502,7 +505,7 @@ void XMLHttpRequest::sendRequest() { _isTimeout = true; _readyState = ReadyState::UNSENT; }, - this, static_cast(_timeoutInMilliseconds) / 1000.0F, 0, 0.0F, false, "XMLHttpRequest"); + this, static_cast(_timeoutInMilliseconds) / 1000.0F, 0, 0.0F, false, "XMLHttpRequest"); } setHttpRequestHeader();