Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HttpClient: Improve url redirect process

This commit is contained in:
halx99 2021-07-19 00:17:50 +08:00
parent 617d2b97e0
commit 648a5b5554
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cocos/network/HttpClient.cpp
View File

@ -79,7 +79,7 @@ void HttpClient::destroyInstance() {
void HttpClient::enableCookies(const char* cookieFile) { void HttpClient::enableCookies(const char* cookieFile) {
std::lock_guard<std::recursive_mutex> lock(_cookieFileMutex); std::lock_guard<std::recursive_mutex> lock(_cookieFileMutex);
if (cookieFile) { if (cookieFile) {
_cookieFilename = std::string(cookieFile); _cookieFilename = cookieFile;
} else { } else {
_cookieFilename = (FileUtils::getInstance()->getNativeWritableAbsolutePath() + "cookieFile.txt"); _cookieFilename = (FileUtils::getInstance()->getNativeWritableAbsolutePath() + "cookieFile.txt");
} }
@ -92,8 +92,13 @@ void HttpClient::setSSLVerification(const std::string& caFile) {
} }
HttpClient::HttpClient() HttpClient::HttpClient()
: _isInited(false), _dispatchOnWorkThread(false), _timeoutForConnect(30), _timeoutForRead(60), _cookie(nullptr), : _isInited(false)
_clearResponsePredicate(nullptr) { , _dispatchOnWorkThread(false)
, _timeoutForConnect(30)
, _timeoutForRead(60)
, _cookie(nullptr)
, _clearResponsePredicate(nullptr)
{
CCLOG("In the constructor of HttpClient!"); CCLOG("In the constructor of HttpClient!");
_scheduler = Director::getInstance()->getScheduler(); _scheduler = Director::getInstance()->getScheduler();
@ -289,11 +294,14 @@ void HttpClient::handleNetworkEOF(HttpResponse* response, yasio::io_channel* cha
auto responseCode = response->getResponseCode(); auto responseCode = response->getResponseCode();
switch (responseCode) { switch (responseCode) {
case 301: case 301:
case 307:
case 302: case 302:
case 307:
if (response->increaseRedirectCount() < HttpClient::MAX_REDIRECT_COUNT) { if (response->increaseRedirectCount() < HttpClient::MAX_REDIRECT_COUNT) {
auto iter = response->_responseHeaders.find("LOCATION"); auto iter = response->_responseHeaders.find("LOCATION");
if (iter != response->_responseHeaders.end()) { if (iter != response->_responseHeaders.end()) {
if (responseCode == 302)
response->getHttpRequest()->setRequestType(HttpRequest::Type::GET);
CCLOG("Process url redirect (%d): %s", responseCode, iter->second.c_str());
_availChannelQueue.push_back(channel->index()); _availChannelQueue.push_back(channel->index());
processResponse(response, iter->second); processResponse(response, iter->second);
response->release(); response->release();

2
thirdparty/README.md vendored
View File

@ -91,7 +91,7 @@
## llhttp ## llhttp
- Upstream: https://github.com/nodejs/llhttp - Upstream: https://github.com/nodejs/llhttp
- Version: 6.0.3 - Version: 6.0.4
- License: MIT - License: MIT
## lua ## lua