# revisions: 45860

git-svn-id: branches/fixes_3_2@46815 -

.gitattributes

@@ -3552,6 +3552,7 @@ packages/fcl-json/examples/simpledemo.lpi svneol=native#text/plain
 packages/fcl-json/examples/simpledemo.pp svneol=native#text/plain
 packages/fcl-json/fpmake.pp svneol=native#text/plain
 packages/fcl-json/src/README.txt svneol=native#text/plain
+packages/fcl-json/src/fcl-json.inc svneol=native#text/plain
 packages/fcl-json/src/fpjson.pp svneol=native#text/plain
 packages/fcl-json/src/fpjsonrtti.pp svneol=native#text/plain
 packages/fcl-json/src/fpjsontopas.pp svneol=native#text/plain

packages/fcl-json/src/fcl-json.inc

@@ -0,0 +1,9 @@
+{$mode objfpc}{$H+}
+{$if defined(fpc) or defined(NodeJS)}
+  {$define HasFileWriter}
+{$endif}
+
+{$IF FPC_FULLVERSION>30100}
+  {$warn 6058 off} // cannot inline
+{$ENDIF}
+

packages/fcl-json/src/fpjson.pp

@@ -12,10 +12,10 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-{$mode objfpc}
-{$h+}
 unit fpjson;
 
+{$i fcl-json.inc}
+
 interface
 
 uses
@@ -1014,14 +1014,10 @@ begin
                 if (U1<>0) then
                   begin
                   App:={$IFDEF FPC_HAS_CPSTRING}UTF8Encode({$ENDIF}WideChar(U1)+WideChar(U2){$IFDEF FPC_HAS_CPSTRING}){$ENDIF};
-                  writeln('app a:  ',L,': ',App);
                   U2:=0;
                   end
                 else
-                  begin
-                  writeln('app b: ',L,': ',WideChar(U2));
                   U1:=U2;
-                  end;
                 end;
         end;
         if App<>'' then

packages/fcl-json/src/jsonreader.pp

@@ -12,10 +12,10 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-{$mode objfpc}
-{$h+}
 unit jsonreader;
 
+{$I fcl-json.inc}
+
 interface
 
 uses

packages/fcl-json/src/jsonscanner.pp

@@ -146,7 +146,7 @@ Var
 
 begin
   S:='';
-  SetLength(S,Source.Size);
+  SetLength(S,Source.Size-Source.Position);
   if Length(S)>0 then
     Source.ReadBuffer(S[1],Length(S));
   Create(S,AOptions)

packages/fcl-web/examples/simpleserver/simpleserver.pas

@@ -340,7 +340,7 @@ begin
 {$ifdef unix}
     if FPFork>0 then Halt(0);
 {$else}
-    Log(erError,'Background option not supported');
+    Log(etError,'Background option not supported');
 {$endif}
     end;
   if FPassword<>'' then

packages/fcl-web/src/base/custhttpsys.pp

@@ -249,8 +249,10 @@ begin
   resp := Default(HTTP_RESPONSE);
   resp.Version := fRequestVersion;
   resp.StatusCode := Code;
-  if CodeText <> '' then
+  if CodeText <> '' then begin
     resp.pReason := PChar(CodeText);
+    resp.ReasonLength := Length(CodeText);
+  end;
 
   flags := 0;
   if (Assigned(ContentStream) and (ContentStream.Size > 0)) or (Contents.Count > 0) then
@@ -291,7 +293,7 @@ begin
 
       headerstrs.Add(headerval);
 
-      resp.Headers.KnownHeaders[Ord(headerid)].RawValueLength := Length(headerval) + 1;
+      resp.Headers.KnownHeaders[Ord(headerid)].RawValueLength := Length(headerval);
       resp.Headers.KnownHeaders[Ord(headerid)].pRawValue := PAnsiChar(headerstrs[headerstrs.Count - 1]);
     end;
 
@@ -301,11 +303,11 @@ begin
       headerval := unknownheaders.ValueFromIndex[i];
 
       headerstrs.Add(headerstr);
-      unknownheadersarr[i].NameLength := Length(headerstr) + 1;
+      unknownheadersarr[i].NameLength := Length(headerstr);
       unknownheadersarr[i].pName := PAnsiChar(headerstrs[headerstrs.Count - 1]);
 
       headerstrs.Add(headerval);
-      unknownheadersarr[i].RawValueLength := Length(headerval) + 1;
+      unknownheadersarr[i].RawValueLength := Length(headerval);
       unknownheadersarr[i].pRawValue := PAnsiChar(headerstrs[headerstrs.Count - 1]);
     end;
 

packages/httpd22/src/apr/apr.pas

@@ -56,7 +56,7 @@ const
   LibAPR = '';
 {$ENDIF}
 
-{$IFDEF WINDOWS}
+{$IFDEF WIN32}
   LibNamePrefix = '_';
   LibSuff0 = '@0';
   LibSuff4 = '@4';