Remove FCGX_Shutdown and OS_Shutdown() - there is no immediate need so no point in...

diff --git a/include/fcgiapp.h b/include/fcgiapp.h
index 6c1bfd0..62ae17e 100644 (file)
--- a/include/fcgiapp.h
+++ b/include/fcgiapp.h
@@ -9,7 +9,7 @@
  * See the file "LICENSE.TERMS" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: fcgiapp.h,v 1.9 2001/09/06 20:06:03 robs Exp $
+ * $Id: fcgiapp.h,v 1.10 2001/09/14 19:43:31 robs Exp $
  */
 
 #ifndef _FCGIAPP_H
@@ -615,15 +615,6 @@ DLLAPI void FCGX_FreeStream(FCGX_Stream **stream);
  */
 DLLAPI void FCGX_ShutdownPending(void);
 
-/* ----------------------------------------------------------------------
- *
- *  Prevent the lib from interacting with clients in any way
- *  (including accepting new requests).  Signal handler safe.
- *
- * ----------------------------------------------------------------------
- */
-DLLAPI void FCGX_Shutdown(void);
-
 #if defined (__cplusplus) || defined (c_plusplus)
 } /* terminate extern "C" { */
 #endif

diff --git a/include/fcgios.h b/include/fcgios.h
index a5b0aa4..4e23085 100755 (executable)
--- a/include/fcgios.h
+++ b/include/fcgios.h
@@ -117,7 +117,6 @@ DLLAPI int OS_IpcClose(int ipcFd);
 DLLAPI int OS_IsFcgi(int sock);
 DLLAPI void OS_SetFlags(int fd, int flags);
 
-DLLAPI void OS_Shutdown(void);
 DLLAPI void OS_ShutdownPending(void);
 
 #if defined (__cplusplus) || defined (c_plusplus)

diff --git a/libfcgi/fcgiapp.c b/libfcgi/fcgiapp.c
index f71c12d..31924e9 100644 (file)
--- a/libfcgi/fcgiapp.c
+++ b/libfcgi/fcgiapp.c
@@ -11,7 +11,7 @@
  *
  */
 #ifndef lint
-static const char rcsid[] = "$Id: fcgiapp.c,v 1.29 2001/09/06 20:06:06 robs Exp $";
+static const char rcsid[] = "$Id: fcgiapp.c,v 1.30 2001/09/14 19:43:26 robs Exp $";
 #endif /* not lint */
 
 #include <assert.h>
@@ -71,11 +71,6 @@ static int isFastCGI = -1;
 static char *webServerAddressList = NULL;
 static FCGX_Request the_request;
 
-void FCGX_Shutdown(void)
-{
-    OS_Shutdown();
-}
-
 void FCGX_ShutdownPending(void)
 {
     OS_ShutdownPending();

diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
index 2ab9b82..b29887b 100755 (executable)
--- a/libfcgi/os_unix.c
+++ b/libfcgi/os_unix.c
@@ -17,7 +17,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: os_unix.c,v 1.31 2001/09/06 20:07:53 robs Exp $";
+static const char rcsid[] = "$Id: os_unix.c,v 1.32 2001/09/14 19:43:27 robs Exp $";
 #endif /* not lint */
 
 #include "fcgi_config.h"
@@ -103,12 +103,6 @@ static int volatile maxFd = -1;
 static int shutdownPending = FALSE;
 static int shutdownNow = FALSE;
 
-void OS_Shutdown()
-{
-    shutdownNow = TRUE;
-    OS_ShutdownPending();
-}
-
 void OS_ShutdownPending()
 {
     shutdownPending = TRUE;
@@ -211,8 +205,6 @@ int OS_LibInit(int stdioFds[3])
  */
 void OS_LibShutdown()
 {
-    OS_Shutdown();
-
     if(!libInitialized)
         return;
 

diff --git a/libfcgi/os_win32.c b/libfcgi/os_win32.c
index 5344618..fd14229 100755 (executable)
--- a/libfcgi/os_win32.c
+++ b/libfcgi/os_win32.c
@@ -17,7 +17,7 @@
  *  significantly more enjoyable.)
  */
 #ifndef lint
-static const char rcsid[] = "$Id: os_win32.c,v 1.23 2001/09/06 20:08:33 robs Exp $";
+static const char rcsid[] = "$Id: os_win32.c,v 1.24 2001/09/14 19:43:27 robs Exp $";
 #endif /* not lint */
 
 #define WIN32_LEAN_AND_MEAN 
@@ -263,12 +263,6 @@ static void StdinThread(LPDWORD startup){
     ExitThread(0);
 }
 
-void OS_Shutdown(void)
-{
-    shutdownNow = TRUE;
-    OS_ShutdownPending();
-}
-
 void OS_ShutdownPending(void)
 {
     shutdownPending = TRUE;