Addendum to 1a23a62 (Added to fetchRemote: username/password, redirec…

…tion)
multitheftauto · May 14, 2017 · 1a1d04d · 1a1d04d
1 parent 1a23a62
commit 1a1d04d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.World.cpp b/Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.World.cpp
@@ -1895,8 +1895,8 @@ int CLuaFunctionDefs::FetchRemote ( lua_State* luaVM )
         optionsMap.ReadString("postData", httpRequestOptions.strPostData, "");
         optionsMap.ReadBool("postIsBinary", httpRequestOptions.bPostBinary, false);
         optionsMap.ReadNumber("maxRedirects", httpRequestOptions.uiMaxRedirects, 8);
-        optionsMap.ReadString("authUsername", httpRequestOptions.strAuthUsername, "");
-        optionsMap.ReadString("authPassword", httpRequestOptions.strAuthPassword, "");
+        optionsMap.ReadString("username", httpRequestOptions.strUsername, "");
+        optionsMap.ReadString("password", httpRequestOptions.strPassword, "");
 
         CStringMap headersMap;
         optionsMap.ReadStringMap("headers", headersMap);

diff --git a/Client/sdk/net/CNetHTTPDownloadManagerInterface.h b/Client/sdk/net/CNetHTTPDownloadManagerInterface.h
@@ -22,8 +22,8 @@ struct SHttpRequestOptions
     SString strRequestMethod;
     std::map<SString,SString> requestHeaders;
     uint uiMaxRedirects = 8;
-    SString strAuthUsername;
-    SString strAuthPassword;
+    SString strUsername;
+    SString strPassword;
 };
 
 struct SHttpDownloadResult

diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.Server.cpp b/Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.Server.cpp
@@ -660,8 +660,8 @@ int CLuaFunctionDefs::FetchRemote ( lua_State* luaVM )
         optionsMap.ReadString("postData", httpRequestOptions.strPostData, "");
         optionsMap.ReadBool("postIsBinary", httpRequestOptions.bPostBinary, false);
         optionsMap.ReadNumber("maxRedirects", httpRequestOptions.uiMaxRedirects, 8);
-        optionsMap.ReadString("authUsername", httpRequestOptions.strAuthUsername, "");
-        optionsMap.ReadString("authPassword", httpRequestOptions.strAuthPassword, "");
+        optionsMap.ReadString("username", httpRequestOptions.strUsername, "");
+        optionsMap.ReadString("password", httpRequestOptions.strPassword, "");
 
         CStringMap headersMap;
         optionsMap.ReadStringMap("headers", headersMap);

diff --git a/Server/sdk/net/CNetHTTPDownloadManagerInterface.h b/Server/sdk/net/CNetHTTPDownloadManagerInterface.h
@@ -22,8 +22,8 @@ struct SHttpRequestOptions
     SString strRequestMethod;
     std::map<SString,SString> requestHeaders;
     uint uiMaxRedirects = 8;
-    SString strAuthUsername;
-    SString strAuthPassword;
+    SString strUsername;
+    SString strPassword;
 };
 
 struct SHttpDownloadResult