pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/v7.0.0' into develop

Browse Source
This commit is contained in:
Oleg Korshul
2021-10-19 21:06:11 +03:00
parent 05c6260499 b9fd01d632
commit 9e58de380e
71 changed files with 2751 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Network/FileTransporter/filetransporter.pri
View File

@ -41,6 +41,4 @@ core_android {
SOURCES += $$PWD/src/FileTransporter_curl.cpp
!use_external_transport:include($$PWD/../../3dParty/curl/curl.pri)
DEFINES += NOT_USE_PTHREAD_CANCEL
}

2
Common/Network/FileTransporter/src/FileTransporter_curl.cpp
View File

@ -95,7 +95,7 @@ namespace NSNetwork
CURL *curl;
int fp;
CURLcode res;
std::string sUrl = U_TO_UTF8(m_sFileUrl);
std::string sUrl = U_TO_UTF8(m_sDownloadFileUrl);
std::string sOut;
const char *url = sUrl.c_str();
curl = curl_easy_init();