add attach()/detach() support

diff --git a/README b/README
index 6cd00f1..57a140d 100755 (executable)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 FastCGI Developer's Kit README
 ------------------------------
 
-    $Id: README,v 1.21 2003/01/19 17:19:41 robs Exp $
+    $Id: README,v 1.22 2003/06/22 00:16:45 robs Exp $
     Copyright (c) 1996 Open Market, Inc.
     See the file "LICENSE.TERMS" for information on usage and redistribution
     of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -28,6 +28,10 @@ CHANGES
 For more detail regarding changes, please consult the cvs log available 
 on http://fastcgi.com/.
 
+2.4.1
+
+ *) Add attach() and detach() support.
+
 
 2.4.0
 -----

diff --git a/include/fcgiapp.h b/include/fcgiapp.h
index 8a4f999..7d7ec86 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.13 2003/02/04 01:31:38 robs Exp $
+ * $Id: fcgiapp.h,v 1.14 2003/06/22 00:16:44 robs Exp $
  */
 
 #ifndef _FCGIAPP_H
@@ -106,6 +106,7 @@ typedef struct FCGX_Request {
     int nWriters;             /* number of open writers (0..2) */
     int flags;
     int listen_sock;
+    int detached;
 } FCGX_Request;
 
 \f
@@ -615,6 +616,15 @@ DLLAPI void FCGX_FreeStream(FCGX_Stream **stream);
  */
 DLLAPI void FCGX_ShutdownPending(void);
 
+
+/*
+ *  Attach/Detach an accepted request from its listen socket.
+ *  XXX This is not fully implemented at this time (patch welcome).
+ */
+DLLAPI int FCGX_Attach(FCGX_Request * r);
+DLLAPI int FCGX_Detach(FCGX_Request * r);
+
+
 #if defined (__cplusplus) || defined (c_plusplus)
 } /* terminate extern "C" { */
 #endif

diff --git a/include/fcgios.h b/include/fcgios.h
index 8911ac1..f99e5e9 100755 (executable)
--- a/include/fcgios.h
+++ b/include/fcgios.h
@@ -113,11 +113,11 @@ DLLAPI int OS_AsyncRead(int fd, int offset, void *buf, int len,
                         OS_AsyncProc procPtr, ClientData clientData);
 DLLAPI int OS_AsyncWrite(int fd, int offset, void *buf, int len,
                          OS_AsyncProc procPtr, ClientData clientData);
-DLLAPI int OS_Close(int fd);
+DLLAPI int OS_Close(int fd, int shutdown);
 DLLAPI int OS_CloseRead(int fd);
 DLLAPI int OS_DoIo(struct timeval *tmo);
 DLLAPI int OS_Accept(int listen_sock, int fail_on_intr, const char *webServerAddrs);
-DLLAPI int OS_IpcClose(int ipcFd);
+DLLAPI int OS_IpcClose(int ipcFd, int shutdown);
 DLLAPI int OS_IsFcgi(int sock);
 DLLAPI void OS_SetFlags(int fd, int flags);
 

diff --git a/libfcgi/fcgiapp.c b/libfcgi/fcgiapp.c
index 178cfe4..d7bc3c8 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.34 2001/12/12 22:54:10 robs Exp $";
+static const char rcsid[] = "$Id: fcgiapp.c,v 1.35 2003/06/22 00:16:43 robs Exp $";
 #endif /* not lint */
 
 #include <assert.h>
@@ -2031,8 +2031,9 @@ void FCGX_Free(FCGX_Request * request, int close)
     FreeParams(&request->paramsPtr);
 
     if (close) {
-        OS_IpcClose(request->ipcFd);
+        OS_IpcClose(request->ipcFd, ! request->detached);
         request->ipcFd = -1;
+        request->detached = 0;
     }
 }
 
@@ -2307,3 +2308,23 @@ void FCGX_SetExitStatus(int status, FCGX_Stream *stream)
     data->reqDataPtr->appStatus = status;
 }
 
+
+int 
+FCGX_Attach(FCGX_Request * r)
+{
+    r->detached = FALSE;
+    return 0;
+}
+
+
+int 
+FCGX_Detach(FCGX_Request * r)
+{
+    if (r->ipcFd <= 0)
+    {
+        return -1;
+    }
+
+    r->detached = TRUE;
+    return 0;
+}

diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
index 73e6a7f..6d7dc53 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.37 2002/03/05 19:14:49 robs Exp $";
+static const char rcsid[] = "$Id: os_unix.c,v 1.38 2003/06/22 00:16:43 robs Exp $";
 #endif /* not lint */
 
 #include "fcgi_config.h"
@@ -719,7 +719,7 @@ int OS_AsyncWrite(int fd, int offset, void *buf, int len,
  *
  *--------------------------------------------------------------
  */
-int OS_Close(int fd)
+int OS_Close(int fd, int shutdown_ok)
 {
     if (fd == -1)
         return 0;
@@ -753,23 +753,26 @@ int OS_Close(int fd)
      * cause the client to discard potentially useful response data.
      */
 
-    if (shutdown(fd, 1) == 0)
+    if (shutdown_ok)
     {
-        struct timeval tv;
-        fd_set rfds;
-        int rv;
-        char trash[1024];
-
-        FD_ZERO(&rfds);
-
-        do 
+        if (shutdown(fd, 1) == 0)
         {
-            FD_SET(fd, &rfds);
-            tv.tv_sec = 2;
-            tv.tv_usec = 0;
-            rv = select(fd + 1, &rfds, NULL, NULL, &tv);
+            struct timeval tv;
+            fd_set rfds;
+            int rv;
+            char trash[1024];
+
+            FD_ZERO(&rfds);
+
+            do 
+            {
+                FD_SET(fd, &rfds);
+                tv.tv_sec = 2;
+                tv.tv_usec = 0;
+                rv = select(fd + 1, &rfds, NULL, NULL, &tv);
+            }
+            while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
         }
-        while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
     }
 
     return close(fd);
@@ -1229,9 +1232,9 @@ int OS_Accept(int listen_sock, int fail_on_intr, const char *webServerAddrs)
  *
  *----------------------------------------------------------------------
  */
-int OS_IpcClose(int ipcFd)
+int OS_IpcClose(int ipcFd, int shutdown)
 {
-    return OS_Close(ipcFd);
+    return OS_Close(ipcFd, shutdown);
 }
 
 /*

diff --git a/libfcgi/os_win32.c b/libfcgi/os_win32.c
index 294b17f..a0309b8 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.33 2002/03/05 18:15:15 robs Exp $";
+static const char rcsid[] = "$Id: os_win32.c,v 1.34 2003/06/22 00:16:43 robs Exp $";
 #endif /* not lint */
 
 #define WIN32_LEAN_AND_MEAN 
@@ -1352,7 +1352,7 @@ int OS_AsyncWrite(int fd, int offset, void *buf, int len,
  *
  *--------------------------------------------------------------
  */
-int OS_Close(int fd)
+int OS_Close(int fd, int shutdown_ok)
 {
     int ret = 0;
 
@@ -1381,24 +1381,30 @@ int OS_Close(int fd)
          * cause the client to discard potentially useful response data.
          */
 
-        if (shutdown(fdTable[fd].fid.sock, SD_SEND) == 0)
+        if (shutdown_ok)
         {
-            struct timeval tv;
-            fd_set rfds;
-            int sock = fdTable[fd].fid.sock;
-            int rv;
-            char trash[1024];
+            if (shutdown(fdTable[fd].fid.sock, SD_SEND) == 0)
+            {
+                struct timeval tv;
+                fd_set rfds;
+                int sock = fdTable[fd].fid.sock;
+                int rv;
+                char trash[1024];
    
-            FD_ZERO(&rfds);
+                FD_ZERO(&rfds);
 
-            do 
-            {
-                   FD_SET(sock, &rfds);
+                do 
+                {
+#pragma warning( disable : 4127 ) 
+                   FD_SET((unsigned) sock, &rfds);
+#pragma warning( default : 4127 )
+                    
                    tv.tv_sec = 2;
                    tv.tv_usec = 0;
                    rv = select(sock + 1, &rfds, NULL, NULL, &tv);
+                }
+                while (rv > 0 && recv(sock, trash, sizeof(trash), 0) > 0);
             }
-            while (rv > 0 && recv(sock, trash, sizeof(trash), 0) > 0);
         }
         
         closesocket(fdTable[fd].fid.sock);
@@ -1791,7 +1797,7 @@ int OS_Accept(int listen_sock, int fail_on_intr, const char *webServerAddrs)
  *
  *----------------------------------------------------------------------
  */
-int OS_IpcClose(int ipcFd)
+int OS_IpcClose(int ipcFd, int shutdown)
 {
     if (ipcFd == -1) return 0;
 
@@ -1816,7 +1822,7 @@ int OS_IpcClose(int ipcFd)
 
     case FD_SOCKET_SYNC:
 
-           OS_Close(ipcFd);
+           OS_Close(ipcFd, shutdown);
            break;
 
     case FD_UNUSED: