From 75216d330906585da5ac601b0f0f6f4af544dd7e Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Wed, 25 Sep 2019 15:49:28 +0000
Subject: [PATCH] * Construct query string, needed in proxy

git-svn-id: trunk@43066 -
---
 packages/fcl-web/src/base/custmicrohttpapp.pp | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/fcl-web/src/base/custmicrohttpapp.pp b/packages/fcl-web/src/base/custmicrohttpapp.pp
index 71a733cafa..a1526a27d0 100644
--- a/packages/fcl-web/src/base/custmicrohttpapp.pp
+++ b/packages/fcl-web/src/base/custmicrohttpapp.pp
@@ -52,6 +52,7 @@ Type
   TMicroRequest = Class(TRequest)
   Private
     FHandler : TRequestHandler;
+    FMyQueryString : String;
     // Return amount of data handled
     Procedure DoSetHeader(K,V : String);
     Procedure AddQueryField(K,V : String);
@@ -321,11 +322,19 @@ begin
 end;
 
 procedure TMicroRequest.AddQueryField(K, V: String);
+
+Var
+  S : String;
+
 begin
   if V<>'' then
     QueryFields.Values[K]:=V
   else
     QueryFields.Add(K+'=');
+  S:=FMyQueryString;
+  if S<>'' then
+    S:=S+'&';
+  FMyQueryString:=S+K+'='+HTTPEncode(V);
 end;
 
 function TMicroRequest.AddData(Data: PAnsiChar; DataSize: Size_t): Size_t;
@@ -360,12 +369,7 @@ Var
   I : integer;
 
 begin
-  S:=URL;
-  I:=Pos('?',S);
-  if (I<>0) then
-    SetHTTPVariable(hvQuery,Copy(S,I+1,Length(S)-I))
-  else
-    MHD_get_connection_values(FHandler.FConnection, MHD_GET_ARGUMENT_KIND,@GetRequestData,Self);
+  MHD_get_connection_values(FHandler.FConnection, MHD_GET_ARGUMENT_KIND,@GetRequestData,Self);
   MHD_get_connection_values(FHandler.FConnection, MHD_HEADER_KIND,@GetRequestData,Self);
   for N in FHandler.WebHandler.ExtraHeaders do
     begin
@@ -373,17 +377,19 @@ begin
     If P<>Nil then
       SetCustomHeader(N,P);
     end;
+  S:=URL;
+  I:=Pos('?',S);
   if (I>0) then
-    begin
     S:=Copy(S,1,I-1);
-    end;
   If (Length(S)>1) and (S[1]<>'/') then
     S:='/'+S
   else if S='/' then
     S:='';
   PathInfo:=S;
-
   Inherited;
+  // We set this afterwards, otherwise double processing
+  if FMyQueryString<>'' then
+    SetHTTPVariable(hvQuery,FMyQueryString)
 end;
 
 { ---------------------------------------------------------------------