Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#270: update curl from 7.59.0 to 7.61.0 #271

Merged
11 commits merged into from Aug 4, 2018
Merged

#270: update curl from 7.59.0 to 7.61.0 #271

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba6c1f9
curl: update from 7.59.0 to 7.61.0
patrikjuvonen Jul 27, 2018
d2bb468
curl: update premake5
patrikjuvonen Jul 27, 2018
8a727e4
curl: fix gcc compile errors
patrikjuvonen Jul 27, 2018
f40eb78
curl: fix gcc compile errors, part 2
patrikjuvonen Jul 27, 2018
94cce3c
curl: fix gcc compile errors, part 3
patrikjuvonen Jul 27, 2018
e05c06b
CRemoteCalls: set application/json Content-Type
patrikjuvonen Jul 28, 2018
84ffe95
CRemoteCalls: return errno as 0 instead of nil if JSON was valid
patrikjuvonen Jul 28, 2018
3040720
CRemoteCalls: addendum to previous commit, let's return 0 always
patrikjuvonen Jul 28, 2018
e6c78ce
curl: revert configure and Makefile changes
patrikjuvonen Jul 31, 2018
986c279
curl: revert autocrlf changes to ease diff
patrikjuvonen Jul 31, 2018
996a780
CRemoteCalls: revert change to callRemote errno behavior, see #294
patrikjuvonen Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions Server/mods/deathmatch/logic/CRemoteCalls.cpp
View file
Open in desktop
Expand Up @@ -154,6 +154,7 @@ CRemoteCall::CRemoteCall(const char* szServerHost, const char* szResourceName, c
arguments->WriteToJSONString(m_options.strPostData, true);
m_options.bPostBinary = false;
m_options.bIsLegacy = true;
m_options.requestHeaders["Content-Type"] = "application/json";
m_bIsFetch = false;

m_strURL = SString("http://%s/%s/call/%s", szServerHost, szResourceName, szFunctionName);
Expand All @@ -172,6 +173,7 @@ CRemoteCall::CRemoteCall(const char* szURL, CLuaArguments* arguments, CLuaMain*
arguments->WriteToJSONString(m_options.strPostData, true);
m_options.bPostBinary = false;
m_options.bIsLegacy = true;
m_options.requestHeaders["Content-Type"] = "application/json";
m_bIsFetch = false;

m_strURL = szURL;
Expand Down Expand Up @@ -235,12 +237,10 @@ void CRemoteCall::DownloadFinishedCallback(const SHttpDownloadResult& result)
if (result.bSuccess)
{
if (pCall->IsFetch())
{
arguments.PushString(std::string(result.pData, result.dataSize));
arguments.PushNumber(0);
}
else
arguments.ReadFromJSONString(result.pData);
arguments.PushNumber(0);
}
else
{
Expand Down