paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 11:28:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix double vars in TRequest : URI/URL

Browse Source 
git-svn-id: trunk@30760 -
This commit is contained in:
michael 2015-05-02 08:22:53 +00:00
parent c2c87828e9
commit 08c4da7a9f
1 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
packages/fcl-web/src/base/httpdefs.pp
View File

@ -409,10 +409,6 @@ type
FCommandLine: String; FCommandLine: String;
FHandleGetOnPost: Boolean; FHandleGetOnPost: Boolean;
FOnUnknownEncoding: TOnUnknownEncodingEvent; FOnUnknownEncoding: TOnUnknownEncodingEvent;
FPathInfo,
FHost : string;
FRequestedWith : String;
FURI: String;
FFiles : TUploadedFiles; FFiles : TUploadedFiles;
FReturnedPathInfo : String; FReturnedPathInfo : String;
FLocalPathPrefix : string; FLocalPathPrefix : string;
@ -428,8 +424,6 @@ type
procedure HandleUnknownEncoding(Const AContentType : String;Stream : TStream); virtual; procedure HandleUnknownEncoding(Const AContentType : String;Stream : TStream); virtual;
procedure ParseFirstHeaderLine(const line: String);override; procedure ParseFirstHeaderLine(const line: String);override;
procedure ReadContent; virtual; procedure ReadContent; virtual;
Function GetFieldValue(AIndex : Integer) : String; override;
Procedure SetFieldValue(Index : Integer; Value : String); override;
Procedure ProcessMultiPart(Stream : TStream; Const Boundary : String;SL:TStrings); virtual; Procedure ProcessMultiPart(Stream : TStream; Const Boundary : String;SL:TStrings); virtual;
Procedure ProcessQueryString(Const FQueryString : String; SL:TStrings); virtual; Procedure ProcessQueryString(Const FQueryString : String; SL:TStrings); virtual;
procedure ProcessURLEncoded(Stream : TStream;SL:TStrings); virtual; procedure ProcessURLEncoded(Stream : TStream;SL:TStrings); virtual;
@ -450,7 +444,7 @@ type
Property LocalPathPrefix : string Read GetLocalPathPrefix; Property LocalPathPrefix : string Read GetLocalPathPrefix;
Property CommandLine : String Read FCommandLine; Property CommandLine : String Read FCommandLine;
Property Command : String read FCommand; Property Command : String read FCommand;
Property URI : String read FURI; // Uniform Resource Identifier Property URI : String Index Ord(hvURL) read GetHTTPVariable Write SetHTTPVariable; // Uniform Resource Identifier
Property QueryString : String Index Ord(hvQuery) read GetHTTPVariable Write SetHTTPVariable; Property QueryString : String Index Ord(hvQuery) read GetHTTPVariable Write SetHTTPVariable;
Property HeaderLine : String read GetFirstHeaderLine; Property HeaderLine : String read GetFirstHeaderLine;
Property Files : TUploadedFiles Read FFiles; Property Files : TUploadedFiles Read FFiles;
@ -1492,14 +1486,14 @@ begin
FCommandLine := line; FCommandLine := line;
i := Pos(' ', line); i := Pos(' ', line);
FCommand := UpperCase(Copy(line, 1, i - 1)); FCommand := UpperCase(Copy(line, 1, i - 1));
FURI := Copy(line, i + 1, Length(line)); URI := Copy(line, i + 1, Length(line));
// Extract HTTP version // Extract HTTP version
i := Pos(' ', URI); i := Pos(' ', URI);
if i > 0 then if i > 0 then
begin begin
FHttpVersion := Copy(URI, i + 1, Length(URI)); FHttpVersion := Copy(URI, i + 1, Length(URI));
FURI := Copy(URI, 1, i - 1); URI := Copy(URI, 1, i - 1);
FHttpVersion := Copy(HttpVersion, Pos('/', HttpVersion) + 1, Length(HttpVersion)); FHttpVersion := Copy(HttpVersion, Pos('/', HttpVersion) + 1, Length(HttpVersion));
end; end;
@ -1508,7 +1502,7 @@ begin
if i > 0 then if i > 0 then
begin begin
Query:= Copy(URI, i + 1, Length(URI)); Query:= Copy(URI, i + 1, Length(URI));
FURI := Copy(URI, 1, i - 1); URI := Copy(URI, 1, i - 1);
end; end;
end; end;
@ -1531,40 +1525,6 @@ begin
result := FLocalPathPrefix; result := FLocalPathPrefix;
end; end;
function TRequest.GetFieldValue(AIndex: Integer): String;
begin
Case AIndex of
25 : Result:=FPathInfo;
31 : Result:=FCommand;
32 : Result:=FURI;
34 : Result:=FHost;
36 : Result:=FRequestedWith;
35 : begin
If Not FContentRead and AllowReadContent then
begin
ReadContent;
FContentRead:=True; // in case InitContent was not called.
end;
Result:=FContent;
end
else
Result:=inherited GetFieldValue(AIndex);
end;
end;
procedure TRequest.SetFieldValue(Index: Integer; Value: String);
begin
Case Index of
25 : FPathInfo:=Value;
30 : FServerPort:=Value;
31 : FCommand:=Value;
32 : FURI:=Value;
34 : FHost:=Value;
36 : FRequestedWith:=Value;
else
inherited SetFieldValue(Index, Value);
end
end;
function TRequest.GetFirstHeaderLine: String; function TRequest.GetFirstHeaderLine: String;
begin begin