ruby-lsapi 3.0 → 3.1

data/ext/lsapi/lsapilib.c

@@ -1170,10 +1170,7 @@ int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
     }
     if ( pReq->m_pHeader->m_cntUnknownHeaders > 0 )
     {
-        char achHeaderName[256];
-        char *p;
         char *pKey;
-        char *pKeyEnd ;
         int  keyLen;
         struct lsapi_header_offset * pCur, *pEnd;
         pCur = pReq->m_pUnknownHeader;
@@ -1534,9 +1531,10 @@ static fn_select_t g_fnSelect = select;
 typedef struct _lsapi_child_status
 {
     int     m_pid;
-    short   m_iKillSent;
+
+    volatile short   m_iKillSent;
     volatile short   m_inProcess;
-    
+
     volatile long    m_tmWaitBegin;
     volatile long    m_tmReqBegin;
     volatile long    m_tmLastCheckPoint;
@@ -1705,7 +1703,7 @@ static void lsapi_check_child_status( long tmCur )
                 {
                     
                     if (( g_prefork_server->m_iCurChildren - dying > g_prefork_server->m_iMaxChildren)||
-                        ( idle > g_prefork_server->m_iMaxIdleChildren ))
+                        ( idle >= g_prefork_server->m_iMaxIdleChildren ))
                     {
                         tobekilled = 1;
                     }
@@ -1724,15 +1722,22 @@ static void lsapi_check_child_status( long tmCur )
                         tobekilled = 1;
                 }
             }
+            else
+            {
+                if ( pStatus->m_inProcess )
+                    tobekilled = pStatus->m_iKillSent = 0;
+            }
             if ( tobekilled )
             {
                 tobekilled = 0;
                 if ( pStatus->m_iKillSent > 5 )
                     tobekilled = SIGKILL;
-                else if ( pStatus->m_iKillSent == 2 )
+                else if ( pStatus->m_iKillSent == 3 )
                     tobekilled = SIGTERM;
-                else if ( pStatus->m_iKillSent == 0 )
+                else if ( pStatus->m_iKillSent == 1 )
+                {
                     tobekilled = SIGUSR1;
+                }
                 if ( tobekilled )
                     kill( pStatus->m_pid, tobekilled );
                 ++pStatus->m_iKillSent;
@@ -1873,7 +1878,8 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
                 s_ppid = getppid();
                 s_req_processed = 0;
                 s_pChildStatus = child_status;
-                
+                child_status->m_iKillSent = 0;
+
                 /* don't catch our signals */
                 sigaction( SIGCHLD, &old_child, 0 );
                 sigaction( SIGTERM, &old_term, 0 );
@@ -1955,6 +1961,8 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
         {
             if ( !g_running )
                 return -1;
+            if (( s_pChildStatus )&&( s_pChildStatus->m_iKillSent ))
+                return -1; 
             FD_ZERO( &readfds );
             FD_SET( fd, &readfds );
             timeout.tv_sec = 1;
@@ -1981,6 +1989,8 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
             }
             else if ( ret >= 1 )
             {
+                if (( s_pChildStatus )&&( s_pChildStatus->m_iKillSent ))
+                    return -1; 
                 if ( fd == pReq->m_fdListen )
                 {
                     pReq->m_fd = lsapi_accept( pReq->m_fdListen );

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "3.0"
-date: 2008-01-31 00:00:00 -05:00
+  version: "3.1"
+date: 2008-02-25 00:00:00 -05:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: 
 - lib