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

Fix bug 63590

Browse Source
This commit is contained in:
Oleg Korshul
2024-01-29 00:02:55 +03:00
parent 48a055d390
commit cb2dff90b9
2 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Common/Network/FileTransporter/src/FileTransporter_private.h
View File

@ -34,6 +34,7 @@
#include "../../../../DesktopEditor/common/File.h" #include "../../../../DesktopEditor/common/File.h"
#include "../../../../DesktopEditor/graphics/BaseThread.h" #include "../../../../DesktopEditor/graphics/BaseThread.h"
#include "../include/FileTransporter.h" #include "../include/FileTransporter.h"
#include "../../../../DesktopEditor/common/ProcessEnv.h"
namespace NSNetwork namespace NSNetwork
{ {
@ -240,13 +241,25 @@ namespace NSNetwork
{ {
m_pInternal->m_bComplete = false; m_pInternal->m_bComplete = false;
bool bIsCanUseNetwork = true;
if (NSProcessEnv::IsPresent(NSProcessEnv::Converter::gc_allowNetworkRequest))
bIsCanUseNetwork = NSProcessEnv::GetBoolValue(NSProcessEnv::Converter::gc_allowNetworkRequest);
int hrResultAll = 0; int hrResultAll = 0;
if(m_pInternal->m_eLoadType == m_pInternal->DOWNLOADFILE)
hrResultAll = m_pInternal->DownloadFile(); if (bIsCanUseNetwork)
else if(m_pInternal->m_eLoadType == m_pInternal->UPLOADFILE) {
hrResultAll = m_pInternal->UploadFile(); if(m_pInternal->m_eLoadType == m_pInternal->DOWNLOADFILE)
else if(m_pInternal->m_eLoadType == m_pInternal->UPLOADDATA) hrResultAll = m_pInternal->DownloadFile();
hrResultAll = m_pInternal->UploadData(); else if(m_pInternal->m_eLoadType == m_pInternal->UPLOADFILE)
hrResultAll = m_pInternal->UploadFile();
else if(m_pInternal->m_eLoadType == m_pInternal->UPLOADDATA)
hrResultAll = m_pInternal->UploadData();
}
else
{
hrResultAll = 1;
}
if (0 == hrResultAll) if (0 == hrResultAll)
m_pInternal->m_bComplete = true; m_pInternal->m_bComplete = true;

33
Common/Network/FileTransporter/src/transport_external.h
View File

@ -33,6 +33,7 @@
#include <iostream> #include <iostream>
#include <unistd.h> #include <unistd.h>
#include "../../DesktopEditor/common/Directory.h" #include "../../DesktopEditor/common/Directory.h"
#include "../../DesktopEditor/common/ProcessEnv.h"
#ifdef USE_EXTERNAL_TRANSPORT #ifdef USE_EXTERNAL_TRANSPORT
@ -96,7 +97,7 @@ namespace NSNetwork
{ {
std::string sProgramBinA = U_TO_UTF8(sCurlBin); std::string sProgramBinA = U_TO_UTF8(sCurlBin);
const char* nargs[10]; const char* nargs[16];
nargs[0] = sProgramBinA.c_str(); nargs[0] = sProgramBinA.c_str();
nargs[1] = "--url"; nargs[1] = "--url";
nargs[2] = sUrlA.c_str(); nargs[2] = sUrlA.c_str();
@ -107,6 +108,36 @@ namespace NSNetwork
nargs[7] = "--connect-timeout"; nargs[7] = "--connect-timeout";
nargs[8] = "10"; nargs[8] = "10";
nargs[9] = NULL; nargs[9] = NULL;
nargs[10] = NULL;
nargs[11] = NULL;
nargs[12] = NULL;
nargs[13] = NULL;
nargs[14] = NULL;
nargs[15] = NULL;
std::string sProxy;
std::string sProxyIser;
std::string sProxyHeader;
int nIndexLast = 9;
if (NSProcessEnv::IsPresent(NSProcessEnv::Converter::gc_proxy))
{
sProxy = NSProcessEnv::GetBoolValue(NSProcessEnv::Converter::gc_proxy);
nargs[nIndexLast++] = "--proxy";
nargs[nIndexLast++] = sProxy.c_str();
}
if (NSProcessEnv::IsPresent(NSProcessEnv::Converter::gc_proxyUser))
{
sProxyIser = NSProcessEnv::GetBoolValue(NSProcessEnv::Converter::gc_proxyUser);
nargs[nIndexLast++] = "--proxy-user";
nargs[nIndexLast++] = sProxyIser.c_str();
}
if (NSProcessEnv::IsPresent(NSProcessEnv::Converter::gc_proxyHeader))
{
sProxyHeader = NSProcessEnv::GetBoolValue(NSProcessEnv::Converter::gc_proxyHeader);
nargs[nIndexLast++] = "--proxy-header";
nargs[nIndexLast++] = sProxyHeader.c_str();
}
const char* nenv[3]; const char* nenv[3];
nenv[0] = "LD_PRELOAD="; nenv[0] = "LD_PRELOAD=";