Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow disabling HTTPS through the config file

Browse Source 
Simply set:

```ini
[General]
DisableHTTPS = True
```

Added to help debug issue #17969
This commit is contained in:
Henrik Rydgård 2023-08-24 21:28:30 +02:00
parent b3fafb5fa8
commit dfe187df1e
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Common/Net/HTTPRequest.cpp
View File

@ -5,6 +5,7 @@
#include "Common/StringUtils.h"
#include "Common/Log.h"
#include "Common/System/OSD.h"
#include "Common/System/System.h"
namespace http {
@ -37,7 +38,7 @@ bool RequestManager::IsHttpsUrl(const std::string &url) {
std::shared_ptr<Request> RequestManager::StartDownload(const std::string &url, const Path &outfile, ProgressBarMode mode, const char *acceptMime) {
std::shared_ptr<Request> dl;
if (IsHttpsUrl(url)) {
if (IsHttpsUrl(url) && System_GetPropertyBool(SYSPROP_SUPPORTS_HTTPS)) {
#ifndef HTTPS_NOT_AVAILABLE
dl.reset(new HTTPSRequest(RequestMethod::GET, url, "", "", outfile, mode));
#else
@ -64,7 +65,7 @@ std::shared_ptr<Request> RequestManager::StartDownloadWithCallback(
const std::string &name,
const char *acceptMime) {
std::shared_ptr<Request> dl;
if (IsHttpsUrl(url)) {
if (IsHttpsUrl(url) && System_GetPropertyBool(SYSPROP_SUPPORTS_HTTPS)) {
#ifndef HTTPS_NOT_AVAILABLE
dl.reset(new HTTPSRequest(RequestMethod::GET, url, "", "", outfile, mode, name));
#else
@ -91,7 +92,7 @@ std::shared_ptr<Request> RequestManager::AsyncPostWithCallback(
std::function<void(Request &)> callback,
const std::string &name) {
std::shared_ptr<Request> dl;
if (IsHttpsUrl(url)) {
if (IsHttpsUrl(url) && System_GetPropertyBool(SYSPROP_SUPPORTS_HTTPS)) {
#ifndef HTTPS_NOT_AVAILABLE
dl.reset(new HTTPSRequest(RequestMethod::POST, url, postData, postMime, Path(), mode, name));
#else

1
Core/Config.cpp
View File

@ -183,6 +183,7 @@ static const ConfigSetting generalSettings[] = {
ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, CfgFlag::DEFAULT), // Or maybe it makes sense to have it per-game? Race conditions abound...
ConfigSetting("UISound", &g_Config.bUISound, false, CfgFlag::DEFAULT),
ConfigSetting("DisableHTTPS", &g_Config.bDisableHTTPS, false, CfgFlag::DONT_SAVE),
ConfigSetting("AutoLoadSaveState", &g_Config.iAutoLoadSaveState, 0, CfgFlag::PER_GAME),
ConfigSetting("EnableCheats", &g_Config.bEnableCheats, false, CfgFlag::PER_GAME | CfgFlag::REPORT),
ConfigSetting("CwCheatRefreshRate", &g_Config.iCwCheatRefreshRate, 77, CfgFlag::PER_GAME),

2
Core/Config.h
View File

@ -92,6 +92,8 @@ public:
bool bPreloadFunctions;
uint32_t uJitDisableFlags;
bool bDisableHTTPS;
bool bSeparateSASThread;
int iIOTimingMethod;
int iLockedCPUSpeed;

2
SDL/SDLMain.cpp
View File

@ -573,7 +573,7 @@ bool System_GetPropertyBool(SystemProperty prop) {
return true; // FileUtil.cpp: OpenFileInEditor
#ifndef HTTPS_NOT_AVAILABLE
case SYSPROP_SUPPORTS_HTTPS:
return true;
return !g_Config.bDisableHTTPS;
#endif
#if PPSSPP_PLATFORM(MAC)
case SYSPROP_HAS_FOLDER_BROWSER:

5
Windows/main.cpp
View File

@ -374,7 +374,7 @@ bool System_GetPropertyBool(SystemProperty prop) {
case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR:
return true; // FileUtil.cpp: OpenFileInEditor
case SYSPROP_SUPPORTS_HTTPS:
return true;
return !g_Config.bDisableHTTPS;
default:
return false;
}
@ -597,7 +597,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
case SystemRequestType::SHOW_FILE_IN_FOLDER:
W32Util::ShowFileInFolder(param1);
break;
return true;
case SystemRequestType::TOGGLE_FULLSCREEN_STATE:
{
@ -620,7 +620,6 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
return true;
}
case SystemRequestType::CREATE_GAME_SHORTCUT:
// This is not actually working, but ported it to the request framework anyway.
return W32Util::CreateDesktopShortcut(param1, param2);
default:
return false;

2
android/jni/app-android.cpp
View File

@ -533,7 +533,7 @@ bool System_GetPropertyBool(SystemProperty prop) {
return deviceType != DEVICE_TYPE_VR;
#ifndef HTTPS_NOT_AVAILABLE
case SYSPROP_SUPPORTS_HTTPS:
return true;
return !g_Config.bDisableHTTPS;
#endif
default:
return false;