out commenting test function from code

Author: uib gmbh

.DS_Store

@@ -148,8 +148,10 @@ procedure TOpsiHTTPSAcceptingThread.ReadMessageBody;
     InputBody.SetSize(ContentLength);
     SizeReceived := AcceptorSocket.RecvBufferEx(InputBody.Memory, ContentLength, Timeout);
     InputBody.SetSize(SizeReceived);
+    //AcceptorSocket.RecvStream(InputBody, TimeOut);
+    //rpcMethod := AcceptorSocket.RecvString(TimeOut);
   end;
-  CreateTestJSONRequestInputBody;
+  //CreateTestJSONRequestInputBody;
   //InputBody.Clear;
   //InputBody.LoadFromStream(JSONStream);
   JSONRequest := TOpsiJSONRequest.Create(InputBody);
@@ -257,7 +259,7 @@ procedure TOpsiHTTPSAcceptingThread.WriteHeaders;
   if Protocol <> '' then
   begin
     Headers.Clear;
-    Headers.Add('Content-type: text/html; charset=UTF-8');
+    Headers.Add('Content-type: application/json; charset=UTF-8');
     Headers.Add('Content-length: ' + IntTostr(OutputBody.Size));
     Headers.Add('Connection: close');
     Headers.Add('Date: ' + Rfc822DateTime(now));

opsi-misc/opsiclientd-light-mac/opsihttpsacceptingthread.pas

@@ -13,31 +13,22 @@ interface
 
   TOpsiJSONRequest = class(TOpsiJSONrpcObject)
   private
-    //function GetID: integer;
     function GetMethod:string;
     function GetParams: TJSONArray;
-    //procedure SetID(aID: integer);
     procedure SetMethod(aMethod: string);
     procedure SetParams(theParams: TJSONArray);
   published
     property Method: string read GetMethod write SetMethod;
     property Params: TJSONArray read GetParams write SetParams;
-    //property ID: integer read GetID write SetID;
   public
-    //constructor Create(aStream: TStream);overload;
     constructor Create(aMethod: string; const theParams: array of const; aID: integer);overload;
-    //procedure SaveToMemoryStream(aMemoryStream: TMemoryStream);
   end;
 
 
 implementation
 
 { TOpsiJSONRequest }
 
-//procedure TOpsiJSONRequest.SetID(aID: integer);
-//begin
-//  Add('id', aID);
-//end;
 
 procedure TOpsiJSONRequest.SetMethod(aMethod: string);
 begin
@@ -49,11 +40,6 @@ procedure TOpsiJSONRequest.SetParams(theParams: TJSONArray);
   Add('params', theParams);
 end;
 
-//constructor TOpsiJSONRequest.Create(aStream: TStream);
-//begin
-//  //inherited Create;
-//  self := TOpsiJSONRequest(GetJSON(aStream));
-//end;
 
 constructor TOpsiJSONRequest.Create(aMethod: string;
   const theParams: array of const; aID: integer);
@@ -64,19 +50,6 @@ constructor TOpsiJSONRequest.Create(aMethod: string;
   ID := aID;
 end;
 
-//procedure TOpsiJSONRequest.SaveToMemoryStream(aMemoryStream: TMemoryStream);
-//var
-//  StringStream: TStringStream;
-//begin
-//  StringStream := TStringStream.Create(self.AsJSON);
-//  aMemoryStream.LoadFromStream(StringStream);
-//  FreeAndNil(StringStream);
-//end;
-
-//function TOpsiJSONRequest.GetID: integer;
-//begin
-//  Result := Integers['id'];
-//end;
 
 function TOpsiJSONRequest.GetMethod: string;
 begin

opsi-misc/opsiclientd-light-mac/opsijsonrequest.pas

@@ -14,19 +14,14 @@ interface
   TOpsiJSONResponse = class(TOpsiJSONrpcObject)
   private
     function GetError: TJSONObject;
-    //function GetID: integer;
     function GetResult: TJSONData;
     procedure SetError(aError: TJSONObject);
-    //procedure SetID(aID: integer);
     procedure SetResult(aResult: TJSONData);
   published
     property Error: TJSONObject read GetError write SetError;
     property Result : TJSONData read GetResult write SetResult;
-    //property ID: integer read GetID write SetID;
   public
-    //constructor Create(aStream: TStream);overload;
     constructor Create(aResult: TJSONData; aError: TJSONObject; aID: integer); overload;
-    //procedure SaveToMemoryStream(aMemoryStream: TMemoryStream);
   end;
 
 implementation
@@ -39,10 +34,6 @@ function TOpsiJSONResponse.GetError: TJSONObject;
   Result := Objects['error'];
 end;
 
-//function TOpsiJSONResponse.GetID: integer;
-//begin
-//  Result := Integers['id'];
-//end;
 
 function TOpsiJSONResponse.GetResult: TJSONData;
 begin
@@ -54,21 +45,12 @@ procedure TOpsiJSONResponse.SetError(aError: TJSONObject);
   Add('error', aError);
 end;
 
-//procedure TOpsiJSONResponse.SetID(aID: integer);
-//begin
-//  Add('id', aID);
-//end;
 
 procedure TOpsiJSONResponse.SetResult(aResult: TJSONData);
 begin
   Add('result', aResult);
 end;
 
-//constructor TOpsiJSONResponse.Create(aStream: TStream);
-//begin
-//  //inherited Create;
-//  self := TOpsiJSONResponse(GetJSON(aStream));
-//end;
 
 constructor TOpsiJSONResponse.Create(aResult: TJSONData; aError: TJSONObject;
   aID: integer);
@@ -79,14 +61,6 @@ constructor TOpsiJSONResponse.Create(aResult: TJSONData; aError: TJSONObject;
   ID := aID;
 end;
 
-//procedure TOpsiJSONResponse.SaveToMemoryStream(aMemoryStream: TMemoryStream);
-//var
-//  StringStream: TStringStream;
-//begin
-//  StringStream := TStringStream.Create(self.AsJSON);
-//  aMemoryStream.LoadFromStream(StringStream);
-//  FreeAndNil(StringStream);
-//end;
 
 end.