diff --git a/fcl/net/httpbase.pp b/fcl/net/httpbase.pp index 63b87d643d..1de537fb9e 100644 --- a/fcl/net/httpbase.pp +++ b/fcl/net/httpbase.pp @@ -61,7 +61,6 @@ type FOnCompleted: TNotifyEvent; FOnEOF: TNotifyEvent; FFields: TList; - DataReceived, CmdReceived: Boolean; procedure ParseFirstHeaderLine(const line: String); virtual; abstract; procedure LineReceived(const ALine: String); @@ -127,6 +126,8 @@ type procedure SetWWWAuthenticate(const AValue: String); public + DataReceived, CmdReceived: Boolean; // !!!: Only temporarily here + HttpVersion: String; constructor Create; @@ -487,7 +488,12 @@ end. { $Log$ - Revision 1.1 2004-01-31 19:13:14 sg + Revision 1.2 2004-02-02 17:12:01 sg + * Some small fixes to get the code at least compiling again; the HTTP + client class is not expected to work at the moment, and the XML-RPC + client has been fully disabled for now. + + Revision 1.1 2004/01/31 19:13:14 sg * Splittet old HTTP unit into httpbase and httpclient * Many improvements in fpSock (e.g. better disconnection detection) diff --git a/fcl/net/httpclient.pp b/fcl/net/httpclient.pp index 5024f37856..200ccfa62e 100644 --- a/fcl/net/httpclient.pp +++ b/fcl/net/httpclient.pp @@ -58,8 +58,8 @@ type DoDestroy: Boolean; destructor Destroy; override; -// procedure Receive; -// procedure Send; + procedure Receive; + procedure Send; end; THttpClient = class(TCustomHttpClient) @@ -129,7 +129,7 @@ begin FOnHeaderSent(Self); if Assigned(StreamToSend) then begin - SendBuffer := TAsyncWriteStream.Create(EventLoop, FSocket); + SendBuffer := TAsyncWriteStream.Create(EventLoop, Stream); SendBuffer.CopyFrom(StreamToSend, StreamToSend.Size); SendBuffer.OnBufferSent := @StreamToSendCompleted; end else @@ -186,7 +186,7 @@ begin if NeedMoreData then DataAvailableNotifyHandle := - EventLoop.SetDataAvailableNotify(FSocket.Handle, @DataAvailable, FSocket) + EventLoop.SetDataAvailableNotify(Stream.Handle, @DataAvailable, Stream) else ReceivedStreamCompleted(nil); @@ -215,7 +215,7 @@ begin ReadNow := 1024; end else ReadNow := 1024; - BytesRead := FSocket.Read(buf, ReadNow); + BytesRead := Stream.Read(buf, ReadNow); // WriteLn('TCustomHttpClient.DataAvailable: Read ', BytesRead, ' bytes; RecvSize=', RecvSize); if BytesRead <= 0 then begin @@ -253,12 +253,12 @@ begin Send; end; -constructor TCustomHttpClient.Create(AManager: TEventLoop; ASocket: TInetSocket); +{constructor TCustomHttpClient.Create(AManager: TEventLoop; ASocket: TInetSocket); begin inherited Create; EventLoop := AManager; - FSocket := ASocket; -end; + Stream := ASocket; +end;} destructor TCustomHttpClient.Destroy; begin @@ -280,7 +280,7 @@ begin begin ReceivedHeader.OnCompleted := @ReceivedHeaderCompleted; ReceivedHeader.OnEOF := @ReceivedHeaderEOF; - ReceivedHeader.AsyncReceive(EventLoop, FSocket); + ReceivedHeader.AsyncReceive(EventLoop, Stream); end; end; @@ -297,7 +297,7 @@ begin ReceivedHttpVersion := ''; end; HeaderToSend.OnCompleted := @HeaderToSendCompleted; - HeaderToSend.AsyncSend(EventLoop, FSocket); + HeaderToSend.AsyncSend(EventLoop, Stream); end; end; @@ -307,7 +307,12 @@ end. { $Log$ - Revision 1.1 2004-01-31 19:13:14 sg + Revision 1.2 2004-02-02 17:12:01 sg + * Some small fixes to get the code at least compiling again; the HTTP + client class is not expected to work at the moment, and the XML-RPC + client has been fully disabled for now. + + Revision 1.1 2004/01/31 19:13:14 sg * Splittet old HTTP unit into httpbase and httpclient * Many improvements in fpSock (e.g. better disconnection detection) diff --git a/fcl/net/xmlrpc.pp b/fcl/net/xmlrpc.pp index 653a53ee1b..afb776386d 100644 --- a/fcl/net/xmlrpc.pp +++ b/fcl/net/xmlrpc.pp @@ -17,7 +17,7 @@ unit XMLRPC; interface -uses SysUtils, Classes, fpAsync, ssockets, DOM, HTTP, HTTPSvlt; +uses SysUtils, Classes, fpAsync, ssockets, DOM, HTTPClient, HTTPSvlt; type EXMLRPCParser = class(Exception); @@ -106,7 +106,7 @@ type end; - TOnXMLRPCCallCompleted = procedure(AParser: TXMLRPCParser) of object; +{ TOnXMLRPCCallCompleted = procedure(AParser: TXMLRPCParser) of object; TXMLRPCClient = class private @@ -116,7 +116,7 @@ type RequestStream, ResponseStream: TMemoryStream; CurCallback: TOnXMLRPCCallCompleted; LocalEventLoop: TEventLoop; - Connection: THttpConnection; + Connection: TCustomHttpClient; procedure MakeRequest(const AProcName: String; AArgs: array of const); procedure ProcessAnswer; @@ -134,7 +134,7 @@ type property OnBeginRPC: TNotifyEvent read FOnBeginRPC write FOnBeginRPC; property OnEndRPC: TNotifyEvent read FOnEndRPC write FOnEndRPC; - end; + end;} TExceptionEvent = procedure(e: Exception) of object; @@ -703,7 +703,7 @@ end; // XML-RPC Client - +{ constructor TXMLRPCClient.Create(AEventLoop: TEventLoop); begin inherited Create; @@ -733,7 +733,7 @@ begin // Socket.Write(RequestStream.Memory^, RequestStream.Size); LocalEventLoop := TEventLoop.Create; try - Connection := THttpConnection.Create(LocalEventLoop, Socket); + Connection := TCustomHttpClient.Create(LocalEventLoop, Socket); try Connection.HeaderToSend := THttpRequestHeader.Create; with THttpRequestHeader(Connection.HeaderToSend) do @@ -804,17 +804,17 @@ begin vtExtended: Writer.AddParam(Params, Writer.CreateDoubleValue(VExtended^)); vtString: Writer.AddParam(Params, Writer.CreateStringValue(VString^)); vtPChar: Writer.AddParam(Params, Writer.CreateStringValue(VPChar)); - {$IFDEF HasWideStrings} - vtWideChar: Writer.AddParam(Params, Writer.CreateStringValue(VWideChar)); +} {$IFDEF HasWideStrings} +{ vtWideChar: Writer.AddParam(Params, Writer.CreateStringValue(VWideChar)); vtPWideChar: Writer.AddParam(Params, Writer.CreateStringValue(VPWideChar)); - {$ENDIF} - vtAnsiString: Writer.AddParam(Params, Writer.CreateStringValue(String(VAnsiString))); +} {$ENDIF} +{ vtAnsiString: Writer.AddParam(Params, Writer.CreateStringValue(String(VAnsiString))); // vtCurrency: ? // vtVariant: ? - {$IFDEF HasWideStrings} - vtWideString: Writer.AddParam(Params, Writer.CreateStringValue(WideString(VWideString))); - {$ENDIF} - vtInt64: Writer.AddParam(Params, Writer.CreateIntValue(VInt64^)); +} {$IFDEF HasWideStrings} +{ vtWideString: Writer.AddParam(Params, Writer.CreateStringValue(WideString(VWideString))); +} {$ENDIF} +{ vtInt64: Writer.AddParam(Params, Writer.CreateIntValue(VInt64^)); else raise Exception.Create('Unsupported data type in RPC argument list'); end; @@ -838,9 +838,9 @@ begin try case Parser.GetPostType of xmlrpcFaultResponse: - {raise Exception.Create(Format('%d - %s', [Parser.GetNextInt, +} {raise Exception.Create(Format('%d - %s', [Parser.GetNextInt, Parser.GetNextString]));} - raise Exception.Create('Fehler bei XML-RPC-Befehlsausführung'); +{ raise Exception.Create('Fehler bei XML-RPC-Befehlsausführung'); xmlrpcResponse: if Assigned(CurCallback) then CurCallback(Parser); @@ -864,7 +864,7 @@ procedure TXMLRPCClient.DataAvailable(Sender: TObject); begin LocalEventLoop.Break; end; - +} // XML-RPC Server @@ -934,7 +934,12 @@ end. { $Log$ - Revision 1.4 2003-11-27 11:28:44 sg + Revision 1.5 2004-02-02 17:12:01 sg + * Some small fixes to get the code at least compiling again; the HTTP + client class is not expected to work at the moment, and the XML-RPC + client has been fully disabled for now. + + Revision 1.4 2003/11/27 11:28:44 sg * Debugging output is now enabled when the symbol "XMLRPCDebug" exists, and not generally when compiled in debug mode