update 2.4.3

.github/workflows/build.yml

@@ -0,0 +1,49 @@
+name: Build CI
+
+on:
+  push:
+    branches: [ perl-FCGI-merge ]
+  pull_request:
+    branches: [ perl-FCGI-merge ]
+
+jobs:
+  build-linux:
+
+    runs-on: ubuntu-latest
+    container: ubuntu:24.04
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: setup os 
+      run: apt-get update && apt-get -y install libfcgi-client-perl autoconf automake libtool make gcc make m4 g++
+    - name: libfcgi - autogen.sh 
+      run: ./autogen.sh
+    - name: libfcgi-configure
+      run: ./configure
+    - name: libfcgi - make
+      run: make
+    - name: perl module - distrib and perl Makefile.PL
+      working-directory: perl
+      run: ./distrib && perl Makefile.PL
+    - name: perl module - make
+      working-directory: perl
+      run: make
+    - name: perl module - make test 
+      working-directory: perl
+      run: make test
+
+  build-windows:
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        arch:
+          - x86
+          - amd64
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.arch }}
+    - name: build with nmake
+      run: nmake -f Makefile.nt

Makefile.am

@@ -6,9 +6,9 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-DISTCLEANFILES= compile config.guess config.sub configure depcomp fcgi_config.h.in fcgi_config.h.in~ \
+DISTCLEANFILES= compile config.guess config.sub configure configure~ depcomp fcgi_config.h.in fcgi_config.h.in~ \
 		aclocal.m4 m4/libtool.m4 m4/lt*.m4 Makefile.in install-sh missing ltmain.sh \
-		COPYING INSTALL
+		COPYING INSTALL fcgi-*.tar.gz
 
 SUBDIRS = libfcgi cgi-fcgi include
 
@@ -28,7 +28,7 @@ pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = fcgi.pc \
                  fcgi++.pc
 
-EXTRA_DIST = LICENSE.TERMS              \
+EXTRA_DIST = LICENSE              \
              Makefile.nt                \
              cgi-fcgi/cgi-fcgi.mak      \
              examples/authorizer.mak    \
@@ -53,22 +53,22 @@ EXTRA_DIST = LICENSE.TERMS              \
              java/FCGIRequest.java      \
              libfcgi/os_unix.c          \
              libfcgi/os_win32.c         \
-             perl/ChangeLog             \
-             perl/FCGI.PL               \
-             perl/FCGI.XL               \
-             perl/MANIFEST              \
-             perl/Makefile.PL           \
-             perl/README                \
-             perl/aclocal.m4            \
-             perl/configure             \
-             perl/configure.in          \
-             perl/echo.PL               \
-             perl/fcgi_config.h.in      \
-             perl/oldinterface.pod      \
-             perl/remote.PL             \
-             perl/threaded.PL           \
-             perl/typemap               \
-             perl/version.pm            \
+	     perl/eg/echo.pl \
+	     perl/eg/remote.pl \
+	     perl/eg/threaded.pl \
+	     perl/README \
+	     perl/ChangeLog \
+	     perl/t/02-unix_domain_socket.t \
+	     perl/t/01-load.t \
+	     perl/FCGI.pm \
+	     perl/Makefile.PL \
+	     perl/MANIFEST \
+	     perl/MANIFEST.SKIP \
+	     perl/configure.in \
+	     perl/distrib \
+	     perl/configure.readme \
+	     perl/typemap \
+	     perl/FCGI.xs \
              Win32/FastCGI.dsw          \
              Win32/authorizer.dsp       \
              Win32/cgifcgi.dsp          \

README.md

@@ -4,7 +4,7 @@ FastCGI Developer's Kit
 -----------------------
 
 Copyright (c) 1996 Open Market, Inc.
-See the file "[LICENSE.TERMS](LICENSE.TERMS)" for information on usage and redistribution
+See the file "[LICENSE](LICENSE)" for information on usage and redistribution
 of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 Documentations

cgi-fcgi/cgi-fcgi.c

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
@@ -18,7 +18,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _WIN32
 #include <sys/wait.h>
+#endif
 #include <signal.h>
 
 #include "fcgi_config.h"
@@ -742,7 +744,9 @@ void handle_shutdown(int s)
 {
     /* Kill our children processes */
     signal(s, SIG_IGN);
+#ifndef _WIN32
     kill(0, s);
+#endif
 
     exit(0);
 }
@@ -787,11 +791,13 @@ int main(int argc, char **argv)
         bytesToRead = 0;
     }
 
+#ifndef _WIN32
     /* Become a process group leader */
     setsid();
 
     /* Register our signal handler */
     signal(SIGHUP, handle_shutdown);
+#endif
     signal(SIGINT, handle_shutdown);
     signal(SIGTERM, handle_shutdown);
 
@@ -801,13 +807,17 @@ int main(int argc, char **argv)
     if(doStart && (!doBind || appServerSock < 0)) {
         FCGI_Start(bindPath, appPath, nServers);
         if(!doBind) {
+#ifndef _WIN32
             if(!doDaemon) {
                 for(pid=nServers; pid != 0; pid--) {
                     wait(0);
                 }
             }
+#endif
             signal(SIGTERM, SIG_IGN);
+#ifndef _WIN32
             kill(0, SIGTERM);
+#endif
             exit(0);
         } else {
             appServerSock = OS_FcgiConnect(bindPath);

cgi-fcgi/cgi-fcgi.mak

@@ -84,7 +84,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\cgifcgi.bsc"
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=libfcgi.lib /nologo /pdb:none /machine:IX86 /out:"$(OUTDIR)\cgi-fcgi.exe" /libpath:"..\libfcgi\Release" 
+LINK32_FLAGS=libfcgi.lib /nologo /pdb:none /out:"$(OUTDIR)\cgi-fcgi.exe" /libpath:"..\libfcgi\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\cgi-fcgi.obj" \
 	"..\libfcgi\Release\libfcgi.lib"
@@ -162,7 +162,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=libfcgi.lib /nologo /profile /debug /machine:IX86 /out:"$(OUTDIR)\cgi-fcgi.exe" /libpath:"..\libfcgi\Debug" 
+LINK32_FLAGS=libfcgi.lib /nologo /profile /debug /out:"$(OUTDIR)\cgi-fcgi.exe" /libpath:"..\libfcgi\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\cgi-fcgi.obj" \
 	"..\libfcgi\Debug\libfcgi.lib"

configure.ac

@@ -4,7 +4,7 @@ dnl     This file is an input file used by the GNU "autoconf" program to
 dnl     generate the file "configure", which is run during the build
 dnl     to configure the system for the local environment.
 
-AC_INIT([fcgi], [2.4.2])
+AC_INIT([fcgi], [2.4.3])
 AM_INIT_AUTOMAKE([1.11 foreign])
 AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER(fcgi_config.h)

doc/FCGI_Accept.3

@@ -123,6 +123,6 @@ SEE ALSO
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: FCGI_Accept.3,v 1.1.1.1 1997/09/16 15:36:25 stanleyg Exp $

doc/FCGI_Finish.3

@@ -36,6 +36,6 @@ SEE ALSO
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: FCGI_Finish.3,v 1.1.1.1 1997/09/16 15:36:25 stanleyg Exp $

doc/FCGI_SetExitStatus.3

@@ -23,6 +23,6 @@ SEE ALSO
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: FCGI_SetExitStatus.3,v 1.1.1.1 1997/09/16 15:36:25 stanleyg Exp $

doc/FCGI_StartFilterData.3

@@ -47,6 +47,6 @@ SEE ALSO
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: FCGI_StartFilterData.3,v 1.1.1.1 1997/09/16 15:36:26 stanleyg Exp $

doc/cgi-fcgi.1

@@ -108,6 +108,6 @@ BUGS
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: cgi-fcgi.1,v 1.1.1.1 1997/09/16 15:36:26 stanleyg Exp $

doc/fastcgi-whitepaper/fastcgi.htm

@@ -13,7 +13,7 @@
 </STYLE>
    </HEAD>
    <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-   <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+   <!--See the file "LICENSE" for information on usage and redistribution-->
    <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
    <!-- $Id: fastcgi.htm,v 1.4 2002/02/25 00:45:06 robs Exp $ -->
    <BODY>

doc/fcgi-devel-kit.htm

@@ -25,7 +25,7 @@ <H3 CLASS="c2">
          FastCGI Developer&#39;s Kit
       </H3>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <P CLASS="c1">
          Mark R. Brown<BR>

doc/fcgi-java.htm

@@ -29,7 +29,7 @@ <H3>
          </H3>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <!-- $Id: fcgi-java.htm,v 1.4 2002/02/25 00:42:59 robs Exp $ -->
       <P CLASS="c2">

doc/fcgi-perf.htm

@@ -28,7 +28,7 @@ <H3>
          </H3>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <DIV CLASS="c1">
          Mark R. Brown<BR>

doc/fcgi-perl.htm

@@ -29,7 +29,7 @@ <H3>
          </H3>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <H5 CLASS="c2">
          Copyright &copy; 1996 Open Market, Inc. 245 First Street, Cambridge, MA 02142 U.S.A.<BR>

doc/fcgi-spec.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
    <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-   <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+   <!--See the file "LICENSE" for information on usage and redistribution-->
    <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
    <HEAD>
       <TITLE>

doc/fcgi-tcl.htm

@@ -28,7 +28,7 @@ <H3>
          </H3>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <P CLASS="c2">
          Michael S. Shanzer<BR>

doc/overview.html

@@ -15,7 +15,7 @@ <H2>
          </H2>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <!-- $Id: overview.html,v 1.4 2002/02/25 00:42:59 robs Exp $ -->
       <UL>

examples/authorizer.c

@@ -4,7 +4,7 @@
  * FastCGI example Authorizer program using fcgi_stdio library
  *
  * Copyright (c) 1996 Open Market, Inc.
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: authorizer.c,v 1.1 2001/06/19 15:30:02 robs Exp $

examples/authorizer.mak

@@ -84,7 +84,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\authorizer.bsc"
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=libfcgi.lib /nologo /pdb:none /machine:IX86 /out:"$(OUTDIR)\authorizer.exe" /libpath:"..\libfcgi\Release" 
+LINK32_FLAGS=libfcgi.lib /nologo /pdb:none  /out:"$(OUTDIR)\authorizer.exe" /libpath:"..\libfcgi\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\authorizer.obj" \
 	"..\libfcgi\Release\libfcgi.lib"
@@ -162,7 +162,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=libfcgi.lib /nologo /profile /debug /machine:IX86 /out:"$(OUTDIR)\authorizer.exe" /libpath:"..\libfcgi\Debug" 
+LINK32_FLAGS=libfcgi.lib /nologo /profile /debug  /out:"$(OUTDIR)\authorizer.exe" /libpath:"..\libfcgi\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\authorizer.obj" \
 	"..\libfcgi\Debug\libfcgi.lib"

examples/echo-cpp.mak

@@ -84,7 +84,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\echo-cpp.bsc"
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=libfcgi.lib /nologo /pdb:none /machine:IX86 /out:"$(OUTDIR)\echo-cpp.exe" /libpath:"..\libfcgi\Release" 
+LINK32_FLAGS=libfcgi.lib /nologo /pdb:none /out:"$(OUTDIR)\echo-cpp.exe" /libpath:"..\libfcgi\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\echo-cpp.obj"
 
@@ -162,7 +162,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=libfcgi.lib /nologo /profile /debug /machine:IX86 /out:"$(OUTDIR)\echo-cpp.exe" /libpath:"..\libfcgi\Debug" 
+LINK32_FLAGS=libfcgi.lib /nologo /profile /debug /out:"$(OUTDIR)\echo-cpp.exe" /libpath:"..\libfcgi\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\echo-cpp.obj"
 

examples/echo-x.c

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */

examples/echo.c

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */

examples/echo.mak

@@ -84,7 +84,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\echo.bsc"
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=libfcgi.lib /nologo /pdb:none /machine:IX86 /out:"$(OUTDIR)\echo.exe" /libpath:"..\libfcgi\Release" 
+LINK32_FLAGS=libfcgi.lib /nologo /pdb:none  /out:"$(OUTDIR)\echo.exe" /libpath:"..\libfcgi\Release" 
 LINK32_OBJS= \
 	"$(INTDIR)\echo.obj" \
 	"..\libfcgi\Release\libfcgi.lib"
@@ -163,7 +163,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=libfcgi.lib /nologo /profile /map:"$(INTDIR)\echo.map" /debug /machine:IX86 /out:"$(OUTDIR)\echo.exe" /libpath:"..\libfcgi\Debug" 
+LINK32_FLAGS=libfcgi.lib /nologo /profile /map:"$(INTDIR)\echo.map" /debug /out:"$(OUTDIR)\echo.exe" /libpath:"..\libfcgi\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\echo.obj" \
 	"..\libfcgi\Debug\libfcgi.lib"