Index: packages/fcl-web/src/base/custcgi.pp
===================================================================
--- packages/fcl-web/src/base/custcgi.pp	(revision 33565)
+++ packages/fcl-web/src/base/custcgi.pp	(working copy)
@@ -180,7 +180,7 @@
     { 14: 'SERVER_NAME'            } (h:hhServer; v : hvUnknown),
     { 15: 'SERVER_PORT'            } (h:hhUnknown; v : hvServerPort),
     { 16: 'SERVER_PROTOCOL'        } (h:hhUnknown; v : hvUnknown),
-    { 17: 'SERVER_SOFTWARE'        } (h:hhUnknown; v : hvUnknown),
+    { 17: 'SERVER_SOFTWARE'        } (h:hhUnknown; v : hvServerSoftware),
     { 18: 'HTTP_ACCEPT'            } (h:hhAccept; v : hvUnknown),
     { 19: 'HTTP_ACCEPT_CHARSET'    } (h:hhAcceptCharset; v : hvUnknown),
     { 20: 'HTTP_ACCEPT_ENCODING'   } (h:hhAcceptEncoding; v : hvUnknown),
@@ -318,7 +318,7 @@
 function TCGIRequest.DoGetCGIVar(AVarName : String) : String;
 
 begin
-  GetEnvironmentVariable(AVarName);
+  Result := GetEnvironmentVariable(AVarName);
 end;
 
 function TCGIRequest.GetCGIVar(Index: integer): String;
@@ -349,30 +349,37 @@
 end;
 
 procedure TCGIRequest.InitFromEnvironment;
-
-
-Var
+var
   I : Integer;
-  R,V,OV : String;
+  R,V : string;
   M : TMap;
-  
 begin
   For I:=1 to CGIVarCount do
-    begin
+  begin
     V:=GetEnvironmentVariable(CGIVarNames[I]);
     if (V<>'') then
-      begin
+    begin
       M:=MapCgiToHTTP[i];
       if M.H<>hhUnknown then
         SetHeader(M.H,HTTPDecode(V))
       else if M.V<>hvUnknown then
-        begin
+      begin
         if M.V<>hvQuery then
           V:=HTTPDecode(V);
         SetHTTPVariable(M.V,V)
-        end;
       end;
     end;
+  end;
+
+  // Microsoft-IIS hack
+  if Pos('IIS', ServerSoftware) > 0 then
+  begin
+    SetHTTPVariable(
+      hvPathInfo,
+      StringReplace(PathInfo, ScriptName, '', [rfReplaceAll, rfIgnoreCase])
+    );
+  end;
+
   R:=UpCase(Method);
   if (R='POST') or (R='PUT') or (ContentLength>0) then
     ReadContent;
Index: packages/fcl-web/src/base/httpdefs.pp
===================================================================
--- packages/fcl-web/src/base/httpdefs.pp	(revision 33565)
+++ packages/fcl-web/src/base/httpdefs.pp	(working copy)
@@ -110,7 +110,7 @@
   // HTTP related variables.
   THTTPVariableType = (hvUnknown,hvHTTPVersion, hvMethod, hvCookie, hvSetCookie, hvXRequestedWith,
                    hvPathInfo,hvPathTranslated,hvRemoteAddress,hvRemoteHost,hvScriptName,
-                   hvServerPort,hvURL,hvQuery,hvContent);
+                   hvServerPort,hvURL,hvQuery,hvContent,hvServerSoftware);
   THTTPVariableTypes = Set of THTTPVariableType;
 
 Type
@@ -389,6 +389,7 @@
     Property RemoteHost : String Index Ord(hvRemoteHost) read  GetHTTPVariable Write SetHTTPVariable;
     Property ScriptName : String Index Ord(hvScriptName) read  GetHTTPVariable Write SetHTTPVariable;
     Property ServerPort : Word Read GetServerPort Write SetServerPort; // Index 30
+    Property ServerSoftware : String Index Ord(hvServerSoftware) read  GetHTTPVariable Write SetHTTPVariable;
     Property Method : String Index Ord(hvMethod) read GetHTTPVariable Write SetHTTPVariable;
     Property URL : String Index Ord(hvURL) read GetHTTPVariable Write SetHTTPVariable;
     Property Query : String Index Ord(hvQuery) read GetHTTPVariable Write SetHTTPVariable;
@@ -956,7 +957,7 @@
       (-1,
        0,31,11,22,36,
        25,26,27,28,29,
-       30,32,33,35);
+       30,32,33,35,17);
 
 begin
   Result:=High(THTTPVariableType);

Index: packages/fcl-web/src/base/custcgi.pp
===================================================================
--- packages/fcl-web/src/base/custcgi.pp	(revision 33581)
+++ packages/fcl-web/src/base/custcgi.pp	(working copy)
@@ -318,7 +318,7 @@
 function TCGIRequest.DoGetCGIVar(AVarName : String) : String;
 
 begin
-  GetEnvironmentVariable(AVarName);
+  Result := GetEnvironmentVariable(AVarName);
 end;
 
 function TCGIRequest.GetCGIVar(Index: integer): String;

Index: packages/fcl-web/src/base/custfcgi.pp
===================================================================
--- packages/fcl-web/src/base/custfcgi.pp	(revision 34383)
+++ packages/fcl-web/src/base/custfcgi.pp	(working copy)
@@ -354,6 +354,9 @@
     else
       NameValueList.Add(Name+'='+Value)
     end;
+  // Microsoft-IIS hack. IIS includes the script name in the PATH_INFO
+  if Pos('IIS', ServerSoftware) > 0 then
+    SetHTTPVariable(hvPathInfo,StringReplace(PathInfo, ScriptName, '', [rfReplaceAll, rfIgnoreCase]));
 end;
 
 procedure TFCGIRequest.Log(EventType: TEventType; const Msg: String);