ruby-lsapi 3.1 → 3.2

data/ext/lsapi/lsapilib.c

@@ -167,6 +167,26 @@ static inline void lsapi_buildPacketHeader( struct lsapi_packet_header * pHeader
     pHeader->m_packetLen.m_iLen = len;
 }
 
+static  int lsapi_set_nblock( int fd, int nonblock )
+{
+    int val = fcntl( fd, F_GETFL, 0 );
+    if ( nonblock )
+    {
+        if (!( val & O_NONBLOCK ))
+        {
+            return fcntl( fd, F_SETFL, val | O_NONBLOCK );
+        }
+    }
+    else
+    {
+        if ( val & O_NONBLOCK )
+        {
+            return fcntl( fd, F_SETFL, val &(~O_NONBLOCK) );
+        }
+    }
+    return 0;
+}
+
 static int lsapi_close( int fd )
 {
     int ret;
@@ -333,7 +353,7 @@ static int allocateEnvList( struct LSAPI_key_value_pair ** pEnvList,
                         int *curSize, int newSize )
 {
     struct LSAPI_key_value_pair * pBuf;
-	if ( *curSize >= newSize )
+        if ( *curSize >= newSize )
         return 0;
     if ( newSize > 8192 )
         return -1;
@@ -365,7 +385,7 @@ static int parseEnv( struct LSAPI_key_value_pair * pEnvList, int count,
             char **pBegin, char * pEnd )
 {
     struct LSAPI_key_value_pair * pEnvEnd;
-	int keyLen = 0, valLen = 0;
+        int keyLen = 0, valLen = 0;
     if ( count > 8192 )
         return -1;
     pEnvEnd = pEnvList + count;
@@ -523,8 +543,8 @@ static inline int notify_req_received( LSAPI_Request * pReq )
 
 static int readReq( LSAPI_Request * pReq )
 {
-	int len;
-	int packetLen;
+        int len;
+        int packetLen;
     if ( !pReq )
         return -1;
     if ( pReq->m_reqBufSize < 8192 )
@@ -620,6 +640,7 @@ int LSAPI_InitRequest( LSAPI_Request * pReq, int fd )
     {
         pReq->m_fdListen = fd;
         pReq->m_fd = -1;
+        lsapi_set_nblock( fd, 1 );
     }
     return 0;
 }
@@ -662,10 +683,14 @@ int LSAPI_Accept_r( LSAPI_Request * pReq )
                     else
                         return -1;
                 }
-                else if (((struct sockaddr *)&achPeer)->sa_family == AF_INET )
-                {    
-                    setsockopt(pReq->m_fd, IPPROTO_TCP, TCP_NODELAY,
-                                (char *)&nodelay, sizeof(nodelay));
+                else
+                {
+                    lsapi_set_nblock( pReq->m_fd , 0 );
+                    if (((struct sockaddr *)&achPeer)->sa_family == AF_INET )
+                    {    
+                        setsockopt(pReq->m_fd, IPPROTO_TCP, TCP_NODELAY,
+                                   (char *)&nodelay, sizeof(nodelay));
+                    }
                 }
             }
             else
@@ -746,10 +771,10 @@ char * LSAPI_GetHeader_r( LSAPI_Request * pReq, int headerIndex )
     off = pReq->m_pHeaderIndex->m_headerOff[ headerIndex ];
     if ( !off )
         return NULL;
-	if ( *(pReq->m_pHttpHeader + off + 
-		 pReq->m_pHeaderIndex->m_headerLen[ headerIndex ]) )
-		*( pReq->m_pHttpHeader + off + 
-			pReq->m_pHeaderIndex->m_headerLen[ headerIndex ]) = 0;
+        if ( *(pReq->m_pHttpHeader + off + 
+                 pReq->m_pHeaderIndex->m_headerLen[ headerIndex ]) )
+                *( pReq->m_pHttpHeader + off + 
+                        pReq->m_pHeaderIndex->m_headerLen[ headerIndex ]) = 0;
     return pReq->m_pHttpHeader + off;
 }
 
@@ -1681,7 +1706,7 @@ static int lsapi_init_children_status()
         return -1;
     }
     memset( pBuf, 0, size );
-    g_prefork_server->m_pChildrenStatus = (lsapi_child_status *)pBuf;	
+    g_prefork_server->m_pChildrenStatus = (lsapi_child_status *)pBuf;        
     return 0;
 }
 
@@ -1762,6 +1787,7 @@ static int lsapi_all_children_must_die()
     while( g_prefork_server->m_iCurChildren && (sec < maxWait) )
     {
         lsapi_check_child_status(time(NULL));
+        sleep( 1 );
         sec++;
     }
     if ( g_prefork_server->m_iCurChildren != 0 )
@@ -1817,8 +1843,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
         if (curTime != lastTime )
         {
             lastTime = curTime;
-            if (s_ppid &&
-                (kill(s_ppid, 0) == -1)&&(errno == ESRCH))
+            if (s_ppid && (getppid() != s_ppid ))
                 break;
             lsapi_check_child_status(curTime );
             if (pServer->m_iServerMaxIdle)
@@ -1879,6 +1904,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
                 s_req_processed = 0;
                 s_pChildStatus = child_status;
                 child_status->m_iKillSent = 0;
+                lsapi_set_nblock( pReq->m_fd, 0 );
 
                 /* don't catch our signals */
                 sigaction( SIGCHLD, &old_child, 0 );
@@ -1977,7 +2003,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
                 ++wait_secs;
                 if (( s_max_idle_secs > 0 )&&(wait_secs >= s_max_idle_secs ))
                     return -1;
-                if ( s_ppid &&(kill(s_ppid, 0) == -1)&&(errno == ESRCH))
+                if ( s_ppid &&( getppid() != s_ppid))
                     return -1;
             }
             else if ( ret == -1 )
@@ -1997,9 +2023,14 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
                     if ( pReq->m_fd != -1 )
                     {
                         fd = pReq->m_fd;
+                        lsapi_set_nblock( fd, 0 );
                     }
                     else
+                    {
+                        if (( errno == EINTR )||( errno == EAGAIN))
+                            continue;
                         return -1;
+                    }
                 }
                 else
                     break;

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "3.1"
-date: 2008-02-25 00:00:00 -05:00
+  version: "3.2"
+date: 2008-04-11 00:00:00 -04:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: 
 - lib