ruby-lsapi 4.3 → 4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f50f52a087ccb168677d89ab894b8588abec069e
-  data.tar.gz: 3eebc21ef0cac31cf1f6142a16aab8fe48a1bfd2
+  metadata.gz: fb7c17d4bad59b5058a4683b2c07d8abfadc9e36
+  data.tar.gz: 0836a55ff1392b8dc1052b2f83732e9b8f992c94
 SHA512:
-  metadata.gz: f3143175c96d841ac986629da7208a026df9eda49be225d031fc8fd21f06c18e64ba9a3da53066c427ee4a4d0a54ca86f9b8ec18b4b0b2156c06cb2ca6db4262
-  data.tar.gz: 7066ddb8f448c3fda956e6b5b29475d15ccaa96e6f8b518359c973f3b66100324d2712ff8af0f89b47b844b9ec94b8382a2ae92f24d61405cbf05ee48057b0b8
+  metadata.gz: 417955426a67c9a0a9802a4d18a6ac6d075d8b81a7b01adcf2f4e217b0e15a6b7a0b4cec3bcf40e595e39a89809328840880c860c3907aeab8b08ac83b799436
+  data.tar.gz: a0499088de40de67681b2aa0c94ef2fb2248568e7aa9d5c00f668daef3a020e9513c22cf9e2f746ed9eed6d1c2ec1fbb72166930c2b1b0a447fa549753206481

data/ext/lsapi/lsapilib.c

@@ -35,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
-
+#include <limits.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -98,7 +98,23 @@ typedef struct lsapi_MD5Context lsapi_MD5_CTX;
 #define LSAPI_RESP_BUF_SIZE     8192
 #define LSAPI_INIT_RESP_HEADER_LEN 4096
 
+typedef struct _lsapi_child_status
+{
+    int     m_pid;
+    long    m_tmStart;
 
+    volatile short   m_iKillSent;
+    volatile char    m_inProcess;
+    volatile char    m_connected;
+    volatile int     m_iReqCounter;
+
+    volatile long    m_tmWaitBegin;
+    volatile long    m_tmReqBegin;
+    volatile long    m_tmLastCheckPoint;
+}
+lsapi_child_status;
+
+static lsapi_child_status * s_pChildStatus = NULL;
 
 static int g_inited = 0;
 static int g_running = 1;
@@ -108,12 +124,17 @@ static int s_keepListener = 0;
 static int s_dump_debug_info = 0;
 static int s_pid_dump_debug_info = 0;
 
+static int *s_busy_workers = NULL;
+static int s_max_busy_children = -1;
+
 LSAPI_Request g_req = { -1, -1 };
 
 static char         s_secret[24];
-
+static char *s_pStderrLog = NULL;
 
 void Flush_RespBuf_r( LSAPI_Request * pReq );
+static int lsapi_reopen_stderr(const char *p);
+
 
 static const char *CGI_HEADERS[H_TRANSFER_ENCODING+1] =
 {
@@ -265,6 +286,20 @@ static int lsapi_close( int fd )
     }
 }
 
+
+static void lsapi_close_connection(LSAPI_Request *pReq)
+{
+    if (pReq->m_fd == -1)
+        return;
+    lsapi_close(pReq->m_fd);
+    pReq->m_fd = -1;
+    if (s_busy_workers)
+        __sync_fetch_and_sub(s_busy_workers, 1);
+    if (s_pChildStatus)
+        s_pChildStatus->m_connected = 0;
+}        
+
+
 static inline ssize_t lsapi_read( int fd, void * pBuf, size_t len )
 {
     ssize_t ret;
@@ -706,8 +741,11 @@ int LSAPI_is_suEXEC_Daemon(void)
 
 static int LSAPI_perror_r( LSAPI_Request * pReq, const char * pErr1, const char *pErr2 )
 {
-    char achError[1024];
-    int n = snprintf(achError, 1024, "%s:%s: %s\n", pErr1, (pErr2)?pErr2:"", strerror( errno ) );
+    char achError[4096];
+    int n = snprintf(achError, sizeof(achError), "[%d] %s:%s: %s\n", getpid(), 
+                     pErr1, (pErr2)?pErr2:"", strerror(errno));
+    if (n > sizeof(achError))
+        n = sizeof(achError);
     if ( pReq )
         LSAPI_Write_Stderr_r( pReq, achError, n );
     else
@@ -908,7 +946,8 @@ static int lsapi_changeUGid( LSAPI_Request * pReq )
 {
     int uid = s_defaultUid;
     int gid = s_defaultGid;
-    const char * pChroot = NULL;
+    const char *pStderrLog;
+    const char *pChroot = NULL;
     struct LSAPI_key_value_pair * pEnv;
     struct LSAPI_key_value_pair * pAuth;
     int i;
@@ -973,6 +1012,10 @@ static int lsapi_changeUGid( LSAPI_Request * pReq )
     }
 
     s_uid = uid;
+    
+    pStderrLog = LSAPI_GetEnv_r( pReq, "LSAPI_STDERR_LOG");
+    if (pStderrLog)
+        lsapi_reopen_stderr(pStderrLog);
 
     return 0;
 
@@ -1335,6 +1378,10 @@ int LSAPI_Accept_r( LSAPI_Request * pReq )
                 }
                 else
                 {
+                    if (s_pChildStatus)
+                        s_pChildStatus->m_connected = 1;
+                    if (s_busy_workers)
+                        __sync_fetch_and_add(s_busy_workers, 1);
                     lsapi_set_nblock( pReq->m_fd , 0 );
                     if (((struct sockaddr *)&achPeer)->sa_family == AF_INET )
                     {
@@ -1354,8 +1401,7 @@ int LSAPI_Accept_r( LSAPI_Request * pReq )
         if ( !readReq( pReq ) )
             break;
         //abort();
-        lsapi_close( pReq->m_fd );
-        pReq->m_fd = -1;
+        lsapi_close_connection(pReq);
         LSAPI_Reset_r( pReq );
     }
     return 0;
@@ -1802,8 +1848,7 @@ int LSAPI_Flush_r( LSAPI_Request * pReq )
                   n, pReq->m_totalLen );
         if ( ret < pReq->m_totalLen )
         {
-            lsapi_close( pReq->m_fd );
-            pReq->m_fd = -1;
+            lsapi_close_connection(pReq);
             ret = -1;
         }
         pReq->m_totalLen = 0;
@@ -1826,7 +1871,7 @@ ssize_t LSAPI_Write_Stderr_r( LSAPI_Request * pReq, const char * pBuf, size_t le
 
     if ( !pReq )
         return -1;
-    if (( pReq->m_fd == -1 )||(pReq->m_fd == pReq->m_fdListen ))
+    if (s_pStderrLog||( pReq->m_fd == -1 )||(pReq->m_fd == pReq->m_fdListen ))
         return write( 2, pBuf, len );
     if ( pReq->m_pRespBufPos != pReq->m_pRespBuf )
     {
@@ -1858,8 +1903,7 @@ ssize_t LSAPI_Write_Stderr_r( LSAPI_Request * pReq, const char * pBuf, size_t le
                   2, totalLen );
         if ( ret < totalLen )
         {
-            lsapi_close( pReq->m_fd );
-            pReq->m_fd = -1;
+            lsapi_close_connection(pReq);
             ret = -1;
         }
     }
@@ -2435,23 +2479,6 @@ int LSAPI_CreateListenSock( const char * pBind, int backlog )
 
 static fn_select_t g_fnSelect = select;
 
-typedef struct _lsapi_child_status
-{
-    int     m_pid;
-    long    m_tmStart;
-
-    volatile short   m_iKillSent;
-    volatile short   m_inProcess;
-    volatile int     m_iReqCounter;
-
-    volatile long    m_tmWaitBegin;
-    volatile long    m_tmReqBegin;
-    volatile long    m_tmLastCheckPoint;
-}
-lsapi_child_status;
-
-static lsapi_child_status * s_pChildStatus = NULL;
-
 typedef struct _lsapi_prefork_server
 {
     int m_fd;
@@ -2482,6 +2509,7 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp, int avoidFork )
     if ( max_children >= 10000)
         max_children = 10000;
 
+    s_max_busy_children = max_children / 2 + 1;
 
     g_prefork_server = (lsapi_prefork_server *)malloc( sizeof( lsapi_prefork_server ) );
     if ( !g_prefork_server )
@@ -2596,9 +2624,14 @@ static void lsapi_sigchild( int signal )
         child_status = find_child_status( pid );
         if ( child_status )
         {
+            if (child_status->m_connected)
+            {
+                if (s_busy_workers)
+                    __sync_fetch_and_sub(s_busy_workers, 1);
+                child_status->m_connected = 0;
+            }
             child_status->m_pid = 0;
             --g_prefork_server->m_iCurChildren;
-
         }
     }
     while(( g_prefork_server->m_pChildrenStatusCur > g_prefork_server->m_pChildrenStatus )
@@ -2868,6 +2901,11 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
                 s_ppid = getppid();
                 s_req_processed = 0;
                 s_pChildStatus = child_status;
+
+                s_pChildStatus->m_connected = 1;
+                if (s_busy_workers)
+                    __sync_fetch_and_add(s_busy_workers, 1);
+                
                 lsapi_set_nblock( pReq->m_fd, 0 );
                 if ( pReq->m_fdListen != -1 )
                 {
@@ -2938,6 +2976,9 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
 
     LSAPI_Finish_r( pReq );
 
+    if (s_max_busy_children > 0 && s_busy_workers 
+        && *s_busy_workers >= s_max_busy_children)
+        lsapi_close_connection(pReq);
 
     if ( g_prefork_server )
     {
@@ -3006,7 +3047,13 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
                     pReq->m_fd = lsapi_accept( pReq->m_fdListen );
                     if ( pReq->m_fd != -1 )
                     {
+                        if (s_pChildStatus)
+                            s_pChildStatus->m_connected = 1;
+                        if (s_busy_workers)
+                            __sync_fetch_and_add(s_busy_workers, 1);
+
                         fd = pReq->m_fd;
+                        
                         lsapi_set_nblock( fd, 0 );
                         //init_conn_key( pReq->m_fd );
                         if ( !s_keepListener )
@@ -3043,8 +3090,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
             ++s_req_processed;
             return 0;
         }
-        lsapi_close( pReq->m_fd );
-        pReq->m_fd = -1;
+        lsapi_close_connection(pReq);
         LSAPI_Reset_r( pReq );
     }
     return -1;
@@ -3187,11 +3233,88 @@ static int lsapi_initSuEXEC(void)
 }
 
 
+static int lsapi_check_path(const char *p, char *final, int max_len)
+{
+    char resolved_path[PATH_MAX+1];
+    int len = 0;
+    char *end, *temp;
+    if (*p != '/')
+    {
+        if (getcwd(final, max_len) == NULL)
+            return -1;
+        len = strlen(final);
+        *(final + len) = '/';
+        ++len;
+    }
+    end = memccpy(&final[len], p, '\0', PATH_MAX - len);
+    if (!end)
+    {
+        errno = EINVAL;
+        return -1;
+    }
+    p = final;
+    if (realpath(p, resolved_path) == NULL 
+        && errno != ENOENT && errno != EACCES)
+        return -1;
+    if (strncmp(resolved_path, "/etc/", 5) == 0)
+    {
+        errno = EPERM;
+        return -1;
+    }
+    return 0;
+}
+
+
+static int lsapi_reopen_stderr2(const char *full_path)
+{
+    int newfd = open(full_path, O_WRONLY | O_CREAT | O_APPEND, 0644);
+    if (newfd == -1)
+    {
+        LSAPI_perror_r(NULL, "failed to open custom stderr log", full_path);
+        return -1;
+    }
+    if (newfd != 2)
+    {
+        dup2(newfd, 2);
+        close(newfd);
+        dup2(2, 1);
+    }
+    if (s_pStderrLog && full_path != s_pStderrLog)
+    {
+        free(s_pStderrLog);
+        s_pStderrLog = NULL;
+    }
+    s_pStderrLog = strdup(full_path);
+    return 0;
+}
+
+
+static int lsapi_reopen_stderr(const char *p)
+{
+    char full_path[PATH_MAX];
+    if (s_uid == 0)
+        return -1;
+    if (lsapi_check_path(p, full_path, PATH_MAX) == -1)
+    {
+        LSAPI_perror_r(NULL, "invalid custom stderr log path", p);
+        return -1;
+    }
+    return lsapi_reopen_stderr2(full_path);
+}
+
+
 int LSAPI_Init_Env_Parameters( fn_select_t fp )
 {
     const char *p;
     int n;
     int avoidFork = 0;
+    
+    p = getenv("LSAPI_STDERR_LOG");
+    if (p)
+    {
+        lsapi_reopen_stderr(p);
+    }
+    
     p = getenv( "PHP_LSAPI_MAX_REQUESTS" );
     if ( !p )
         p = getenv( "LSAPI_MAX_REQS" );

data/lsapi.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby-lsapi}
-  s.version = "4.3"
-  s.date = %q{2017-03-06}
+  s.version = "4.4"
+  s.date = %q{2018-01-18}
   s.description = "This is a ruby extension for fast communication with LiteSpeed Web Server."
   s.summary = %q{A ruby extension for fast communication with LiteSpeed Web Server.}
   s.has_rdoc = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsapi
 version: !ruby/object:Gem::Version
-  version: '4.3'
+  version: '4.4'
 platform: ruby
 authors:
 - LiteSpeed Technologies Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies: []
 description: This is a ruby extension for fast communication with LiteSpeed Web Server.
 email: info@litespeedtech.com
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-lsapi
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: A ruby extension for fast communication with LiteSpeed Web Server.