@@ -550,7 +550,7 @@ end;
constructor EControlledException.Create(aCaller: TObject; aMessage: string);
begin
inherited Create(aMessage);
- fCallerClass := aCaller.ClassType;
+ if aCaller <> nil then fCallerClass := aCaller.ClassType;
end;
initialization
@@ -218,7 +218,7 @@ begin
if not StrInArray(aRequestInfo.RawHeaders.Names[i],['Host','Accept-Encoding','Accept','User-Agent','Connection','Cache-Control']) then
- Result.Headers.Add(aRequestInfo.RawHeaders.Names[i],aRequestInfo.RawHeaders.ValueFromIndex[i]);
+ Result.Headers.Add(aRequestInfo.RawHeaders.Names[i],aRequestInfo.RawHeaders.Values[aRequestInfo.RawHeaders.Names[i]]);