Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Herman van den Berg 2017-02-16 15:55:29 +02:00
commit a59c5b5658

View file

@ -272,17 +272,18 @@ namespace AsterNET.Manager
if (processingCommandResult) if (processingCommandResult)
{ {
if (line == "--END COMMAND--") string lineLower = line.ToLower(Helper.CultureInfo);
if (lineLower == "--end command--")
{ {
var commandResponse = new CommandResponse(); var commandResponse = new CommandResponse();
Helper.SetAttributes(commandResponse, packet); Helper.SetAttributes(commandResponse, packet);
commandList.Add(line);
commandResponse.Result = commandList; commandResponse.Result = commandList;
processingCommandResult = false; processingCommandResult = false;
packet.Clear(); packet.Clear();
mrConnector.DispatchResponse(commandResponse); mrConnector.DispatchResponse(commandResponse);
} }
string lineLower = line.ToLower(Helper.CultureInfo); else if (lineLower.StartsWith("privilege: ")
if (lineLower.StartsWith("privilege: ")
|| lineLower.StartsWith("actionid: ") || lineLower.StartsWith("actionid: ")
|| lineLower.StartsWith("timestamp: ") || lineLower.StartsWith("timestamp: ")
|| lineLower.StartsWith("server: ") || lineLower.StartsWith("server: ")
@ -360,4 +361,4 @@ namespace AsterNET.Manager
#endregion #endregion
} }
} }