jp9000/obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround github API issue

Browse Source
This commit is contained in:
Richard Stanway 2014-08-17 23:34:00 +02:00
parent 94158089d9
commit cd704a1c42
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/LogUploader.cpp
View File

@ -62,6 +62,8 @@ namespace
WinHttpCrackUrl(url, 0, 0, &urlComponents); WinHttpCrackUrl(url, 0, 0, &urlComponents);
if (urlComponents.nPort == INTERNET_DEFAULT_HTTPS_PORT) if (urlComponents.nPort == INTERNET_DEFAULT_HTTPS_PORT)
secure = true; secure = true;
else
secure = false;
session.reset(WinHttpOpen(OBS_VERSION_STRING, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0)); session.reset(WinHttpOpen(OBS_VERSION_STRING, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0));
if (!session) if (!session)
@ -238,6 +240,21 @@ namespace
str.FindReplace(L"\b", L"\\b"); str.FindReplace(L"\b", L"\\b");
str.FindReplace(L"\t", L"\\t"); str.FindReplace(L"\t", L"\\t");
str.FindReplace(L"/", L"\\/"); str.FindReplace(L"/", L"\\/");
// github api chokes when we submit unescaped %, so encode it and
// any other lower and higher characters just to be safe
String newStr;
int len = slen(str);
for (int i = 0; i < len; i++)
{
if (str[i] < ' ' || str[i] > 255 || str[i] == '%')
newStr << FormattedString(L"\\u%04X", (int)str[i]);
else
newStr << str[i];
}
str = newStr;
} }
} }