ruby-lsapi 4.1 → 4.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTBmYTY2NTdiZDk3NjAxNTViYmExOTc4ZDU5ZjJhYjk1MmFmNjhiZA==
-  data.tar.gz: !binary |-
-    YmRkNDNhMGZiMmI5Y2I2YjQ0M2Q4OTkzZWVhMjRkMmFmZjA4ZDFlYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTg2NGQ5Zjc1NWUyYTExNDUzMTYzN2VhODAyMDI4N2Y0MDFhMTBiMThkMWNm
-    MWU3NDY0Njg4MzcxZDUyYmYzYjJjMjIyYTUxNGU4YTUyOGQ1ZDIxZDg1YWJh
-    YjZlNDJlNTJhMWJkMzZiOWVjMmE2ODQ2ZGNmMTkzMzk1MDRhMDg=
-  data.tar.gz: !binary |-
-    MzBmZDNhMmY5NGQ3NWY0NmJmMDIyMTgzNTUyMDBhZDczMzM2Y2MwY2I5YzAx
-    NGYxN2M0OWEyYTQ1YjYzNTEwNzlmNGQ3ZGY4ZDU1MGM3MTQ2NThlZDkwODBi
-    MjExZWRkOWIxZTI1NGVjMWEwMDNmYzBkNTBjMTBhNmFlZTc5ZTM=
+SHA1:
+  metadata.gz: 7071cdbea2aaa5b5e3e15d81cb659dbcdd4f0ec2
+  data.tar.gz: c224835bd8b574e1a697cbe1754a21f01bec9a5f
+SHA512:
+  metadata.gz: b00c35195f8785e6196f1b2ab97d3bac71ad795b7290015e5bb2f419d1a2477d44b27088d019f329d4c13ba11b672417bf78c4189a43ecb9b1465c58c60c7046
+  data.tar.gz: a623cc9fcd25ab6ce7e6c41d50ddc8d19c5b020d23fff9ad5890483346a89ae01ab4ab466f85bef896745f74faddf7581f4a9b01c7ca8ef42122a69a36fa84cf

data/ext/lsapi/extconf.rb

@@ -6,4 +6,7 @@ end
 if RUBY_VERSION =~ /1.9/ then
     $CPPFLAGS += " -DRUBY_19"
 end 
+if RUBY_VERSION =~ /2/ then
+    $CPPFLAGS += " -DRUBY_2"
+end 
 create_makefile( "lsapi" )

data/ext/lsapi/lsapidef.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005, Lite Speed Technologies Inc.
+Copyright (c) 2002-2014, Lite Speed Technologies Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -30,14 +30,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */
 
-/***************************************************************************
-    $Id: lsapidef.h,v 1.17 2012/12/01 19:23:31 gwang Exp $
-                         -------------------
-    begin                : Thu Feb 10 2005
-    author               : George Wang
-    email                : gwang@litespeedtech.com
- ***************************************************************************/
-
 #ifndef  _LSAPIDEF_H_
 #define  _LSAPIDEF_H_
 

data/ext/lsapi/lsapilib.c

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005, Lite Speed Technologies Inc.
+Copyright (c) 2002-2015, Lite Speed Technologies Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -30,14 +30,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */
 
-/***************************************************************************
-                          lsapilib.c  -  description
-                             -------------------
-    begin                : Mon Feb 21 2005
-    copyright            : (C) 2005 by George Wang
-    email                : gwang@litespeedtech.com
- ***************************************************************************/
-
 
 #include <ctype.h>
 #include <dlfcn.h>
@@ -114,6 +106,7 @@ static int s_ppid;
 static int s_slow_req_msecs = 0;
 static int s_keepListener = 0;
 static int s_dump_debug_info = 0;
+static int s_pid_dump_debug_info = 0;
 
 LSAPI_Request g_req = { -1, -1 };
 
@@ -230,7 +223,6 @@ static void lsapi_enable_core_dump()
 }
 
 
-
 static inline void lsapi_buildPacketHeader( struct lsapi_packet_header * pHeader,
                                 char type, int len )
 {
@@ -670,36 +662,6 @@ static int readSecret( const char * pSecretFile )
     return 0;
 }
 
-static int lsapi_initSuEXEC()
-{
-    int i;
-    struct passwd * pw;
-    pw = getpwnam( "nobody" );
-    s_defaultUid = pw->pw_uid;
-    s_defaultGid = pw->pw_gid;
-    if ( s_uid == 0 )
-    {
-        const char * p = getenv( "LSAPI_DEFAULT_UID" );
-        if ( p )
-        {
-            i = atoi( p );
-            if ( i > 0 )
-                s_defaultUid = i;
-        }
-        p = getenv( "LSAPI_DEFAULT_GID" );
-        if ( p )
-        {
-            i = atoi( p );
-            if ( i > 0 )
-                s_defaultGid = i;
-        }
-        p = getenv( "LSAPI_SECRET" );
-        if (( !p )||( readSecret(p) == -1 ))
-                return -1;	
-    }
-    return 0;
-}
-
 int LSAPI_is_suEXEC_Daemon()
 {
     if (( !s_uid )&&( s_pSecret[0] ))
@@ -719,6 +681,29 @@ static int LSAPI_perror_r( LSAPI_Request * pReq, const char * pErr1, const char
     return 0;
 }
 
+static int lsapi_lve_error( LSAPI_Request * pReq )
+{
+    static const char * headers[] = 
+    {
+        "Cache-Control: private, no-cache, no-store, must-revalidate, max-age=0",
+        "Pragma: no-cache",
+        "Retry-After: 60",
+        "Content-Type: text/html",
+        NULL
+    };
+    static const char achBody[] =
+        "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n"
+        "<HTML><HEAD>\n<TITLE>508 Resource Limit Is Reached</TITLE>\n"
+        "</HEAD><BODY>\n" "<H1>Resource Limit Is Reached</H1>\n"
+        "The website is temporarily unable to service your request as it exceeded resource limit.\n"
+        "Please try again later.\n"
+        "<HR>\n"
+        "</BODY></HTML>\n";
+     
+    LSAPI_ErrResponse_r( pReq, 508, headers, achBody, sizeof( achBody ) - 1 );
+    return 0;
+}
+
 static int lsapi_enterLVE( LSAPI_Request * pReq, uid_t uid )
 {
 #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
@@ -731,6 +716,7 @@ static int lsapi_enterLVE( LSAPI_Request * pReq, uid_t uid )
         {
             fprintf( stderr, "Pid (%d): enter LVE (%d) : ressult: %d !\n", getpid(), uid, ret );
             LSAPI_perror_r(pReq, "LSAPI: lve_enter() failure, reached resource limit.", NULL );
+            lsapi_lve_error( pReq );
             return -1;
         }
     }
@@ -1031,18 +1017,52 @@ static int parseRequest( LSAPI_Request * pReq, int totalLen )
 }
 
 //OPTIMIZATION
-static int s_accept_notify = 0;
+static char s_accept_notify = 0;
+static char s_schedule_notify = 0;
+static char s_notify_scheduled = 0;
+static char s_notified_pid = 0;
 
-static struct lsapi_packet_header ack = {'L', 'S',
+static struct lsapi_packet_header s_ack = {'L', 'S',
                 LSAPI_REQ_RECEIVED, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} };
-static inline int notify_req_received( int fd )
+
+
+static inline int write_req_received_notification( int fd )
 {
-    if ( write( fd, &ack, LSAPI_PACKET_HEADER_LEN )
+    if ( write( fd, &s_ack, LSAPI_PACKET_HEADER_LEN )
                 < LSAPI_PACKET_HEADER_LEN )
         return -1;
     return 0;
 }
 
+static void lsapi_sigalarm( int sig )
+{
+    if ( s_notify_scheduled )
+    {
+        s_notify_scheduled = 0;
+        if ( g_req.m_fd != -1 )
+            write_req_received_notification( g_req.m_fd );
+    }
+}
+
+static inline int lsapi_schedule_notify()
+{
+    if ( !s_notify_scheduled )
+    {
+        alarm( 2 );
+        s_notify_scheduled = 1;
+    }
+    return 0;
+}
+
+static inline int notify_req_received( int fd )
+{
+    if ( s_schedule_notify )
+        return lsapi_schedule_notify();
+    return write_req_received_notification( fd );
+
+}
+
+
 static inline int lsapi_notify_pid( int fd )
 {
     char achBuf[16];
@@ -1128,17 +1148,22 @@ static int readReq( LSAPI_Request * pReq )
         fprintf( stderr, "%d: parseRequest error\n", getpid() );
         return -1;
     }
+
+    pReq->m_reqState = LSAPI_ST_REQ_BODY | LSAPI_ST_RESP_HEADER;
+
     if ( !s_uid )
         if ( lsapi_changeUGid( pReq ) )
             return -1;
     pReq->m_bufProcessed = packetLen;
-    pReq->m_reqState = LSAPI_ST_REQ_BODY | LSAPI_ST_RESP_HEADER;
 
     //OPTIMIZATION
-    if ( !s_accept_notify )
+    if ( !s_accept_notify && !s_notified_pid )
         return notify_req_received( pReq->m_fd );
     else
+    {
+        s_notified_pid = 0;
         return 0;
+    }
 }
 
 
@@ -1178,6 +1203,7 @@ int LSAPI_IsRunning(void)
 
 int LSAPI_InitRequest( LSAPI_Request * pReq, int fd )
 {
+    int newfd;
     if ( !pReq )
         return -1;
     memset( pReq, 0, sizeof( LSAPI_Request ) );
@@ -1191,7 +1217,14 @@ int LSAPI_InitRequest( LSAPI_Request * pReq, int fd )
     pReq->m_respPktHeaderEnd = &pReq->m_respPktHeader[5];
     if ( allocateRespHeaderBuf( pReq, LSAPI_INIT_RESP_HEADER_LEN ) == -1 )
         return -1;
- 
+
+    if ( fd == STDIN_FILENO )
+    {
+        fd = dup( fd );
+        newfd = open( "/dev/null", O_RDWR );
+        dup2( newfd, STDIN_FILENO ); 
+    } 
+
     if ( isPipe( fd ) )
     {
         pReq->m_fdListen = -1;
@@ -1339,10 +1372,12 @@ 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;
 }
 
@@ -1608,7 +1643,7 @@ ssize_t gsendfile( int fdOut, int fdIn, off_t *off, size_t size )
     ++n;
 
     size_t written;
-    ssize_t ret = ::sendfilev( fdOut, vec, n, &written );
+    ssize_t ret = sendfilev( fdOut, vec, n, &written );
     if (( !ret )||( errno == EAGAIN ))
         ret = written;
     if ( ret > 0 )
@@ -1779,12 +1814,21 @@ ssize_t LSAPI_Write_Stderr_r( LSAPI_Request * pReq, const char * pBuf, size_t le
 static char * GetHeaderVar( LSAPI_Request * pReq, const char * name )
 {
     int i;
+    char * pValue;
     for( i = 0; i < H_TRANSFER_ENCODING; ++i )
     {
         if ( pReq->m_pHeaderIndex->m_headerOff[i] )
         {
             if ( strcmp( name, CGI_HEADERS[i] ) == 0 )
-                return pReq->m_pHttpHeader + pReq->m_pHeaderIndex->m_headerOff[i];
+            {
+                pValue = pReq->m_pHttpHeader 
+                         + pReq->m_pHeaderIndex->m_headerOff[i];
+                if ( *(pValue + pReq->m_pHeaderIndex->m_headerLen[i]) != '\0')
+                {
+                    *(pValue + pReq->m_pHeaderIndex->m_headerLen[i]) = '\0';
+                }
+                return pValue;
+            }
         }
     }
     if ( pReq->m_pHeader->m_cntUnknownHeaders > 0 )
@@ -1811,7 +1855,15 @@ static char * GetHeaderVar( LSAPI_Request * pReq, const char * name )
                 ++p; ++pKey;
             }
             if (( pKey == pKeyEnd )&& (!*p ))
-                return pReq->m_pHttpHeader + pCur->valueOff;
+            {
+                pValue = pReq->m_pHttpHeader + pCur->valueOff;
+                
+                if ( *(pValue + pCur->valueLen) != '\0')
+                {
+                    *(pValue + pCur->valueLen) = '\0';
+                }
+                return pValue;
+            }
             ++pCur;
         }
     }
@@ -1861,9 +1913,13 @@ int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
     int ret;
     int count = 0;
     struct _headerInfo headers[512];
+
     if ( !pReq || !fn )
         return -1;
-    
+
+    if ( !pReq->m_pHeaderIndex )
+        return 0;
+
     for( i = 0; i < H_TRANSFER_ENCODING; ++i )
     {
         if ( pReq->m_pHeaderIndex->m_headerOff[i] )
@@ -1894,6 +1950,7 @@ int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
         {
             pKey = pReq->m_pHttpHeader + pCur->nameOff;
             keyLen = pCur->nameLen;
+            *(pKey + keyLen ) = 0;
 
             pValue = pReq->m_pHttpHeader + pCur->valueOff;
             *(pValue + pCur->valueLen ) = 0;
@@ -2353,6 +2410,8 @@ typedef struct _lsapi_prefork_server
     int m_iAvoidFork;
     
     lsapi_child_status * m_pChildrenStatus;
+    lsapi_child_status * m_pChildrenStatusCur;
+    lsapi_child_status * m_pChildrenStatusEnd;
     
 }lsapi_prefork_server;
 
@@ -2388,7 +2447,7 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp, int avoidFork )
     if ( g_prefork_server->m_iMaxIdleChildren == 0 )
         g_prefork_server->m_iMaxIdleChildren = 1;
     g_prefork_server->m_iChildrenMaxIdleTime = 300;
-    g_prefork_server->m_iMaxReqProcessTime = 300;
+    g_prefork_server->m_iMaxReqProcessTime = 3600;
     return 0;    
 }
 
@@ -2441,11 +2500,15 @@ static void lsapi_cleanup(int signal)
 static lsapi_child_status * find_child_status( int pid )
 {
     lsapi_child_status * pStatus = g_prefork_server->m_pChildrenStatus;
-    lsapi_child_status * pEnd = g_prefork_server->m_pChildrenStatus + g_prefork_server->m_iMaxChildren * 2;
+    lsapi_child_status * pEnd = g_prefork_server->m_pChildrenStatusEnd;
     while( pStatus < pEnd )
     {
         if ( pStatus->m_pid == pid )
+        {
+            if ( pStatus + 1 > g_prefork_server->m_pChildrenStatusCur )
+                g_prefork_server->m_pChildrenStatusCur = pStatus + 1;
             return pStatus;
+        }
         ++pStatus;
     }
     return NULL;
@@ -2470,13 +2533,22 @@ static void lsapi_sigchild( int signal )
             int dump = WCOREDUMP( status );
             fprintf( stderr, "Child process with pid: %d was killed by signal: %d, core dump: %d\n", pid, sig_num, dump );
         }
+        if ( pid == s_pid_dump_debug_info )
+        {
+            pid = 0;
+            continue;
+        }
         child_status = find_child_status( pid );
         if ( child_status )
         {
             child_status->m_pid = 0;
             --g_prefork_server->m_iCurChildren;
+
         }
     }
+    while(( g_prefork_server->m_pChildrenStatusCur > g_prefork_server->m_pChildrenStatus )
+            &&( g_prefork_server->m_pChildrenStatusCur[-1].m_pid == 0 ))
+        --g_prefork_server->m_pChildrenStatusCur;
 
 }
 
@@ -2485,7 +2557,7 @@ static int lsapi_init_children_status()
     int size = 4096;
     
     char * pBuf;
-    size = g_prefork_server->m_iMaxChildren * sizeof( lsapi_child_status ) * 2;
+    size = (g_prefork_server->m_iMaxChildren + g_prefork_server->m_iExtraChildren ) * sizeof( lsapi_child_status ) * 2;
     size = (size + 4095 ) / 4096 * 4096;
     pBuf =( char*) mmap( NULL, size, PROT_READ | PROT_WRITE,
         MAP_ANON | MAP_SHARED, -1, 0 );
@@ -2495,16 +2567,22 @@ 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;
+    g_prefork_server->m_pChildrenStatusCur = (lsapi_child_status *)pBuf;
+    g_prefork_server->m_pChildrenStatusEnd = (lsapi_child_status *)pBuf + size / sizeof( lsapi_child_status );
     return 0;
 }
 
 static void dump_debug_info( lsapi_child_status * pStatus, long tmCur )
 {
     char achCmd[1024];
-    int pid = fork();
-    if ( pid != 0 )
-        return;
+    if ( s_pid_dump_debug_info )
+    {
+        if ( kill( s_pid_dump_debug_info, 0 ) == 0 )
+            return;
+    }
+    s_pid_dump_debug_info = fork();
+
     fprintf( stderr, "[%s] Possible runaway process, PPID: %d, PID: %d, reqCount: %d, process time: %ld, checkpoint time: %ld, start time: %ld\n", 
                 ctime(&tmCur), getpid(), pStatus->m_pid, pStatus->m_iReqCounter, 
                 tmCur - pStatus->m_tmReqBegin, tmCur - pStatus->m_tmLastCheckPoint, tmCur - pStatus->m_tmStart ); 
@@ -2521,7 +2599,7 @@ static void lsapi_check_child_status( long tmCur )
     int dying = 0;
     int count = 0;
     lsapi_child_status * pStatus = g_prefork_server->m_pChildrenStatus;
-    lsapi_child_status * pEnd = g_prefork_server->m_pChildrenStatus + g_prefork_server->m_iMaxChildren * 2;
+    lsapi_child_status * pEnd = g_prefork_server->m_pChildrenStatusCur;
     while( pStatus < pEnd )
     {
         tobekilled = 0;
@@ -2534,13 +2612,15 @@ 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 ))
                 {
-                    tobekilled = SIGUSR1;
+                    ++pStatus->m_iKillSent;
+                    //tobekilled = SIGUSR1;
                 }
                 else
                 {
                     if (( s_max_idle_secs> 0)&&(tmCur - pStatus->m_tmWaitBegin > s_max_idle_secs + 5 ))
                     {
-                        tobekilled = SIGUSR1;
+                        ++pStatus->m_iKillSent;
+                        //tobekilled = SIGUSR1;
                     }
                 }
                 if ( !tobekilled )
@@ -2567,14 +2647,21 @@ static void lsapi_check_child_status( long tmCur )
             }
             if ( tobekilled )
             {
-                kill( pStatus->m_pid, tobekilled );
-                ++pStatus->m_iKillSent;
-                ++dying;
+                if (( kill( pStatus->m_pid, tobekilled ) == -1 )&&( errno == ESRCH ))
+                {
+                    pStatus->m_pid = 0;
+                    --count;
+                }
+                else
+                {
+                    ++pStatus->m_iKillSent;
+                    ++dying;
+                }
             }
         }
         ++pStatus;
     }
-    if ( g_prefork_server->m_iCurChildren != count )
+    if ( abs( g_prefork_server->m_iCurChildren - count ) > 1 )
     {
         fprintf( stderr, "Children tracking is wrong: PID: %d, Cur Childen: %d, count: %d, idle: %d, dying: %d\n", getpid(), 
                 g_prefork_server->m_iCurChildren, count, idle, dying );
@@ -2616,6 +2703,9 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
     fd_set          readfds;
     struct timeval  timeout;
 
+    sigset_t mask;
+    sigset_t orig_mask;
+
     lsapi_init_children_status();
     
     setsid();
@@ -2664,6 +2754,8 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
 
         if ( pServer->m_iCurChildren >= (pServer->m_iMaxChildren + pServer->m_iExtraChildren ) )
         {
+            fprintf( stderr, "Reached max children process limit: %d, extra: %d, current: %d, please increase LSAPI_CHILDREN.\n",
+                                pServer->m_iMaxChildren, pServer->m_iExtraChildren, pServer->m_iCurChildren );
             usleep( 100000 );
             continue;
         }
@@ -2702,9 +2794,21 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
             child_status = find_child_status( 0 );
             if ( child_status )
                 memset( child_status, 0, sizeof( *child_status ) );
+
+            sigemptyset( &mask );
+            sigaddset( &mask, SIGCHLD );
+            
+            if ( sigprocmask(SIG_BLOCK, &mask, &orig_mask) < 0 ) 
+            {
+                perror( "sigprocmask(SIG_BLOCK) to block SIGCHLD" );
+            }
+
             pid = fork();
+    
             if ( !pid )
             {
+                if (sigprocmask(SIG_SETMASK, &orig_mask, NULL) < 0) 
+                    perror( "sigprocmask( SIG_SETMASK ) to restore SIGMASK in child" );
                 g_prefork_server = NULL;
                 s_ppid = getppid();
                 s_req_processed = 0;
@@ -2723,8 +2827,9 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
                 sigaction( SIGUSR1, &old_usr1, 0 );
                 //init_conn_key( pReq->m_fd );
                 lsapi_notify_pid( pReq->m_fd );
-                if ( s_accept_notify )
-                    return notify_req_received( pReq->m_fd );
+                s_notified_pid = 1;
+                //if ( s_accept_notify )
+                //    return notify_req_received( pReq->m_fd );
                 return 0;
             }
             else if ( pid == -1 )
@@ -2744,6 +2849,9 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
             close( pReq->m_fd );
             pReq->m_fd = -1;
 
+            if (sigprocmask(SIG_SETMASK, &orig_mask, NULL) < 0) 
+                perror( "sigprocmask( SIG_SETMASK ) to restore SIGMASK" );
+
         }
         else
         {
@@ -2754,8 +2862,8 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
         }
     }
     sigaction( SIGUSR1, &old_usr1, 0 );
-    kill( -getpgrp(), SIGUSR1 );
-    lsapi_all_children_must_die();  /* Sorry, children ;-) */
+    //kill( -getpgrp(), SIGUSR1 );
+    //lsapi_all_children_must_die();  /* Sorry, children ;-) */
     return -1;
 
 }
@@ -2808,7 +2916,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
         {
             if ( !g_running )
                 return -1;
-            if (( s_pChildStatus )&&( s_pChildStatus->m_iKillSent ))
+            if ((s_req_processed)&&( s_pChildStatus )&&( s_pChildStatus->m_iKillSent ))
                 return -1; 
             FD_ZERO( &readfds );
             FD_SET( fd, &readfds );
@@ -2836,7 +2944,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
             }
             else if ( ret >= 1 )
             {
-                if (( s_pChildStatus )&&( s_pChildStatus->m_iKillSent ))
+                if (s_req_processed && ( s_pChildStatus )&&( s_pChildStatus->m_iKillSent ))
                     return -1; 
                 if ( fd == pReq->m_fdListen )
                 {
@@ -2969,6 +3077,51 @@ static void unset_lsapi_envs()
     }  
 }
 
+static int lsapi_initSuEXEC()
+{
+    int i;
+    struct passwd * pw;
+    s_defaultUid = 0;
+    s_defaultGid = 0;
+    if ( s_uid == 0 )
+    {
+        const char * p = getenv( "LSAPI_DEFAULT_UID" );
+        if ( p )
+        {
+            i = atoi( p );
+            if ( i > 0 )
+                s_defaultUid = i;
+        }
+        p = getenv( "LSAPI_DEFAULT_GID" );
+        if ( p )
+        {
+            i = atoi( p );
+            if ( i > 0 )
+                s_defaultGid = i;
+        }
+        p = getenv( "LSAPI_SECRET" );
+        if (( !p )||( readSecret(p) == -1 ))
+                return -1;  
+        if ( g_prefork_server )
+        {
+            if ( g_prefork_server->m_iMaxChildren < 100 )
+                g_prefork_server->m_iMaxChildren = 100;
+            if ( g_prefork_server->m_iExtraChildren < 1000 )
+                g_prefork_server->m_iExtraChildren = 1000;
+        }
+    }
+    if ( !s_defaultUid || !s_defaultGid )
+    {
+        pw = getpwnam( "nobody" );
+        if ( !s_defaultUid )
+            s_defaultUid = pw->pw_uid;
+        if ( !s_defaultGid )
+            s_defaultGid = pw->pw_gid;
+    }
+    return 0;
+}
+
+
 int LSAPI_Init_Env_Parameters( fn_select_t fp )
 {
     const char *p;
@@ -3082,7 +3235,25 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp )
 }
 
 
-
+int LSAPI_ErrResponse_r( LSAPI_Request * pReq, int code, const char ** pRespHeaders, 
+                         const char * pBody, int bodyLen )
+{
+    LSAPI_SetRespStatus_r( pReq, code );
+    if ( pRespHeaders )
+    {
+        while( *pRespHeaders )
+        {
+            LSAPI_AppendRespHeader_r( pReq, *pRespHeaders, strlen( *pRespHeaders ) );
+            ++pRespHeaders;
+        }
+    }
+    if ( pBody &&( bodyLen > 0 ))
+    {
+        LSAPI_Write_r( pReq, pBody, bodyLen );
+    }
+    LSAPI_Finish_r( pReq );
+    return 0;
+}
 
 
 static void lsapi_MD5Transform(uint32 buf[4], uint32 const in[16]);
@@ -3206,7 +3377,7 @@ void lsapi_MD5Final(unsigned char digest[16], struct lsapi_MD5Context *ctx)
     lsapi_MD5Transform(ctx->buf, (uint32 *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     memmove(digest, ctx->buf, 16);
-    memset(ctx, 0, sizeof(ctx));        /* In case it's sensitive */
+    memset(ctx, 0, sizeof(*ctx));        /* In case it's sensitive */
 }
 
 /* The four core functions - F1 is optimized somewhat */

data/ext/lsapi/lsapilib.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005, Lite Speed Technologies Inc.
+Copyright (c) 2002-2015, Lite Speed Technologies Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -30,14 +30,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */
 
-/***************************************************************************
-                          lsapilib.h  -  description
-                             -------------------
-    begin                : Mon Feb 21 2005
-    copyright            : (C) 2005 by George Wang
-    email                : gwang@litespeedtech.com
- ***************************************************************************/
-
 
 #ifndef  _LSAPILIB_H_
 #define  _LSAPILIB_H_
@@ -182,6 +174,9 @@ int LSAPI_AppendRespHeader_r( LSAPI_Request * pReq, const char * pBuf, int len )
 int LSAPI_AppendRespHeader2_r( LSAPI_Request * pReq, const char * pHeaderName, 
                               const char * pHeaderValue );
 
+int LSAPI_ErrResponse_r( LSAPI_Request * pReq, int code, const char ** pRespHeaders,
+                         const char * pBody, int bodyLen );
+
 static inline int LSAPI_SetRespStatus_r( LSAPI_Request * pReq, int code )
 {
     if ( !pReq )
@@ -253,6 +248,7 @@ static inline off_t LSAPI_GetReqBodyRemain_r( LSAPI_Request * pReq )
 }
 
 
+
 int LSAPI_Is_Listen(void);
 
 static inline int LSAPI_Accept( void )
@@ -332,6 +328,9 @@ static inline int LSAPI_AppendRespHeader( char * pBuf, int len )
 static inline int LSAPI_SetRespStatus( int code )
 {   return LSAPI_SetRespStatus_r( &g_req, code );           }
 
+static inline int LSAPI_ErrResponse( int code, const char ** pRespHeaders, const char * pBody, int bodyLen )
+{   return LSAPI_ErrResponse_r( &g_req, code, pRespHeaders, pBody, bodyLen );   }
+
 int LSAPI_IsRunning(void);
 
 int LSAPI_CreateListenSock( const char * pBind, int backlog );

data/ext/lsapi/lsruby.c

@@ -1,7 +1,7 @@
 
 #include "ruby.h"
 
-#ifdef RUBY_19
+#if defined( RUBY_19 ) || defined( RUBY_2 )
 #include <ruby/util.h>
 #else
 #include "util.h"
@@ -43,7 +43,7 @@ typedef struct lsapi_data
 {
     LSAPI_Request * req;
     VALUE           env;
-    int          (* fn_write)( LSAPI_Request *, const char * , int );
+    ssize_t      (* fn_write)( LSAPI_Request *, const char * , size_t );
     
 }lsapi_data;
 
@@ -217,7 +217,7 @@ static VALUE lsapi_eval_string_wrap(VALUE self, VALUE str)
     }
     else
     {
-        Check_SafeStr(str);
+        SafeStringValue(str);
     }
     return rb_eval_string_wrap(StringValuePtr(str), NULL);
 }
@@ -307,7 +307,7 @@ static VALUE lsapi_printf(int argc, VALUE *argv, VALUE out)
 
 static VALUE lsapi_puts _((int, VALUE*, VALUE));
 
-#ifdef RUBY_19
+#if defined( RUBY_19 ) || defined( RUBY_2 )
 static VALUE lsapi_puts_ary(VALUE ary, VALUE out, int recur )
 {
     VALUE tmp;
@@ -365,7 +365,7 @@ static VALUE lsapi_puts(int argc, VALUE *argv, VALUE out)
             line = rb_str_new2("nil");
             break;
         case T_ARRAY:
-#ifdef RUBY_19
+#if defined( RUBY_19 ) || defined( RUBY_2 )
             rb_exec_recursive(lsapi_puts_ary, argv[i], out);
 #else
             rb_protect_inspect(lsapi_puts_ary, argv[i], out);
@@ -502,7 +502,7 @@ static VALUE lsapi_eof(VALUE self)
    }
    Data_Get_Struct(self, lsapi_data, data);
 */
-    return (LSAPI_GetReqBodyRemain( &g_req ) <= 0) ? Qtrue : Qfalse;
+    return (LSAPI_GetReqBodyRemain_r( &g_req ) <= 0) ? Qtrue : Qfalse;
 }
 
 static VALUE lsapi_binmode(VALUE self)
@@ -561,7 +561,8 @@ void Init_lsapi()
 
     LSAPI_Init();
 
-    LSAPI_Init_Env_Parameters( rb_thread_select );
+    //LSAPI_Init_Env_Parameters( rb_thread_select );
+    LSAPI_Init_Env_Parameters( select );
 
     s_pid = getpid();
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsapi
 version: !ruby/object:Gem::Version
-  version: '4.1'
+  version: '4.2'
 platform: ruby
 authors:
 - LiteSpeed Technologies Inc.
@@ -38,17 +38,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-lsapi
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A ruby extension for fast communication with LiteSpeed Web Server.