ruby-lsapi 1.7 → 1.8

data/ext/lsapi/lsapilib.c

@@ -81,7 +81,7 @@ static const char *CGI_HEADERS[H_TRANSFER_ENCODING+1] =
     "CONTENT_LENGTH", "HTTP_COOKIE", "HTTP_COOKIE2",
     "HTTP_HOST", "HTTP_PRAGMA",
     "HTTP_REFERER", "HTTP_USER_AGENT",
-    "HTTP_CACHE_CTRL",
+    "HTTP_CACHE_CONTROL",
     "HTTP_IF_MODIFIED_SINCE", "HTTP_IF_MATCH",
     "HTTP_IF_NONE_MATCH",
     "HTTP_IF_RANGE",
@@ -94,7 +94,7 @@ static const char *CGI_HEADERS[H_TRANSFER_ENCODING+1] =
 };
      
 static int CGI_HEADER_LEN[H_TRANSFER_ENCODING+1] =
-{    11, 19, 20, 20, 18, 15, 12, 14, 11, 12, 9, 11, 12, 15, 15,
+{    11, 19, 20, 20, 18, 15, 12, 14, 11, 12, 9, 11, 12, 15, 18,
      22, 13, 18, 13, 24, 14, 10, 20, 8, 22 };
 
 static void lsapi_sigpipe( int sig )

data/ext/lsapi/lsruby.c

@@ -43,13 +43,14 @@ static VALUE cLSAPI;
 static VALUE s_req = Qnil;
 static lsapi_data * s_req_data;
 
-static int  s_children = 0;
-static int  s_cur_children = 0;
+static int  s_children      = 0;
+static int  s_cur_children  = 0;
 static int  s_req_processed = 0;
-static int  s_max_reqs = 1000000;
+static int  s_max_reqs      = 1000000;
 static int  s_max_idle_secs = 60;
-static int  s_listenFd = -1;
-static int  s_ppid = 0;
+static int  s_listenFd      = -1;
+static int  s_ppid          = 0;
+static int  s_max_grp_idle_secs = 0;
 
 static void lsapi_ruby_setenv(const char *name, const char *value)
 {
@@ -117,21 +118,41 @@ void lsapi_sigchild( int signal )
         {
             break;
         }
-        --s_cur_children; 
+        --s_cur_children;
     }
 
 }
 
+static int lsapi_ruby_accept( int fdListen )
+{
+    int         fd;
+    int         nodelay = 1;
+    socklen_t   len;
+    char        achPeer[128];
+
+    len = sizeof( achPeer );
+    fd = accept( s_listenFd, (struct sockaddr *)&achPeer, &len );
+    if ( fd != -1 )
+    {
+        if (((struct sockaddr *)&achPeer)->sa_family == AF_INET )
+        {
+            setsockopt( fd, IPPROTO_TCP, TCP_NODELAY,
+                    (char *)&nodelay, sizeof(nodelay));
+        }
+    }
+    return fd;
+    
+}
+
 static int lsapi_fork_child()
 {
-    struct sigaction act, old_term, old_quit, old_int, old_usr1, old_child;
+    struct sigaction act, old_term, old_quit, old_int,
+                    old_usr1, old_child;
 
-    char        achPeer[128];
-    socklen_t   len;
-    int         nodelay = 1;
-    fd_set      readfds;
-    struct timeval timeout;
-    int         ret;
+    int             wait_secs = 0;                    
+    int             ret;
+    fd_set          readfds;
+    struct timeval  timeout;
 
     setsid();
 
@@ -165,10 +186,10 @@ static int lsapi_fork_child()
         
         FD_ZERO( &readfds );
         FD_SET( s_listenFd, &readfds );
-        timeout.tv_sec = 0; timeout.tv_usec = 100000;
+        timeout.tv_sec = 1; timeout.tv_usec = 0;
         if ((ret = rb_thread_select(s_listenFd+1, &readfds, NULL, NULL, &timeout)) == 1 )
         {
-            if ( s_cur_children >= s_children )
+            if ( s_cur_children >= 0 )
             {
                 usleep( 10 );
                 FD_ZERO( &readfds );
@@ -181,17 +202,26 @@ static int lsapi_fork_child()
         else if ( ret == -1 )
             break;
         else
-            continue;
-        len = sizeof( achPeer );
-        g_req.m_fd = accept( s_listenFd,
-                    (struct sockaddr *)&achPeer, &len );
-        if ( g_req.m_fd != -1 )
         {
-            if (((struct sockaddr *)&achPeer)->sa_family == AF_INET )
+            if (s_ppid && (kill(s_ppid, 0) == -1)&&(errno == ESRCH))
+                break;
+            if (s_max_grp_idle_secs)
             {
-                setsockopt(g_req.m_fd, IPPROTO_TCP, TCP_NODELAY,
-                        (char *)&nodelay, sizeof(nodelay));
+                if ( s_cur_children <= 0 )
+                {
+                    ++wait_secs;
+                    if ( wait_secs > s_max_grp_idle_secs )
+                        return -1;
+                }
+                else
+                    wait_secs = 0;
             }
+            continue;
+        }
+
+        g_req.m_fd = lsapi_ruby_accept( s_listenFd );
+        if ( g_req.m_fd != -1 )
+        {
             int pid = fork();
             if ( !pid )
             {
@@ -233,16 +263,14 @@ static int lsapi_fork_child()
 
 static VALUE lsapi_s_accept( VALUE self )
 {
-//    lsapi_data * req_data;
-//    VALUE   req;
-    fd_set  readfds;
-    int     fd;
-    int     ret;
-    int     wait_secs;
-    struct timeval timeout;
+    int             fd;
+    int             ret;
+    int             wait_secs;
+    fd_set          readfds;
+    struct timeval  timeout;
 
     LSAPI_Finish_r( &g_req );
-    if ( s_children )
+    if ( s_children > 1)
     {
         if ( s_listenFd != -1 )
             if ( lsapi_fork_child() == -1 )
@@ -263,11 +291,6 @@ static VALUE lsapi_s_accept( VALUE self )
         wait_secs = 0;
         while( LSAPI_IsRunning() )
         {
-            if ( s_ppid )
-            {
-                if ((kill(s_ppid, 0) == -1)&&(errno == ESRCH))
-                    return Qnil;
-            }
             FD_ZERO( &readfds );
             FD_SET( fd, &readfds );
             timeout.tv_sec = 1;
@@ -277,6 +300,16 @@ static VALUE lsapi_s_accept( VALUE self )
                 ++wait_secs;
                 if (( s_max_idle_secs > 0 )&&(wait_secs >= s_max_idle_secs ))
                     return Qnil;
+                if ( s_ppid &&(kill(s_ppid, 0) == -1)&&(errno == ESRCH))
+                    return Qnil;
+            }
+            else if ( fd == s_listenFd )
+            {
+                g_req.m_fd = lsapi_ruby_accept( s_listenFd );
+                if ( g_req.m_fd != -1 )
+                {
+                    break;
+                }
             }
             else
                 break;
@@ -583,7 +616,7 @@ void Init_lsapi()
         s_children = atoi( p );
         unsetenv( "LSAPI_CHILDREN" );
     }
-
+    
     p = getenv( "LSAPI_MAX_REQS" );
     if ( p )
     {
@@ -601,6 +634,18 @@ void Init_lsapi()
         unsetenv( "LSAPI_MAX_IDLE" );
     }
 
+    p = getenv( "LSAPI_PGRP_MAX_IDLE" );
+    if ( p )
+    {
+        s_max_grp_idle_secs = atoi( p );
+        unsetenv( "LSAPI_PGRP_MAX_IDLE" );
+    }
+
+    if ( !getenv( "LSAPI_PPID_NO_CHECK" ) )
+        s_ppid = getppid();
+    else
+        unsetenv( "LSAPI_PPID_NO_CHECK" );
+
     orig_stdin = rb_stdin;
     orig_stdout = rb_stdout;
 #if RUBY_VERSION_CODE < 180

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "1.7"
+  version: "1.8"
 date: 2006-08-22 00:00:00 -04:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: