ruby-lsapi 2.5 → 2.6

data/README

@@ -74,7 +74,7 @@ Usually, there is no need to set value of LSAPI_CHILDREN over 100 in most
 server environment. 
 
 
-* LSAPI_EXTRA_CHILDREN          (default: 1/2 of LSAPI_CHILDREN)
+* LSAPI_EXTRA_CHILDREN          (default: 0)
 
 LSAPI_EXTRA_CHILDREN controls the maximum number of extra children processes
 can be started when some or all existing children processes are in
@@ -82,9 +82,9 @@ malfunctioning state. Total number of children processes will be reduced to
 LSAPI_CHILDREN level as soon as service is back to normal. 
 
 
-* LSAPI_MAX_REQUESTS            (default value: 10000)
+* LSAPI_MAX_REQS            (default value: 10000)
 
-LSAPI_MAX_REQUESTS specifies the maximum number of requests each child
+LSAPI_MAX_REQS specifies the maximum number of requests each child
 process will handle before it exits automatically. This parameter can
 help reducing memory usage when there are memory leaks in the application. 
 
@@ -96,7 +96,7 @@ process will wait for a new request before exit. This option help
 releasing system resources taken by idle processes.
 
 
-* LSAPI_MAX_IDLE_CHILDREN  (default value: 1/3 of LSAPI_CHILDREN)
+* LSAPI_MAX_IDLE_CHILDREN  (default value: LSAPI_CHILDREN)
 
 In Self Managed Mode, LSAI_MAX_IDLE_CHILDREN controls how many idle 
 children processes are allowed. Excessive idle children processes

data/ext/lsapi/lsapilib.c

@@ -1519,9 +1519,9 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp )
 
     s_ppid = getppid();
     g_prefork_server->m_iMaxChildren = max_children;
-    g_prefork_server->m_iExtraChildren = max_children / 2 ;
-    g_prefork_server->m_iMaxIdleChildren = max_children / 3;
-    g_prefork_server->m_iChildrenMaxIdleTime = 30;
+    g_prefork_server->m_iExtraChildren = 0 ;
+    g_prefork_server->m_iMaxIdleChildren = max_children + 1;
+    g_prefork_server->m_iChildrenMaxIdleTime = 300;
     g_prefork_server->m_iMaxReqProcessTime = 300;
     return 0;    
 }
@@ -1648,7 +1648,8 @@ static void lsapi_check_child_status( long tmCur )
                         if (( s_max_idle_secs> 0)&&(tmCur - pStatus->m_tmWaitBegin > s_max_idle_secs + 5 ))
                             tobekilled = 1;
                     }
-                    ++idle;
+                    if ( !tobekilled )
+                        ++idle;
                 }
                 else
                 {

data/ext/lsapi/lsruby.c

@@ -104,17 +104,20 @@ static int add_env_rails( const char * pKey, int keyLen, const char * pValue, in
                 len = valLen - ( p - pValue ) - 1;
                 //valLen = p - pValue;
                 //*p++ = 0;
-                ++p;
             }
             else
             {
-                p = "";
+                p = (char *)pValue + valLen;
                 len = 0;
             }
+            rb_hash_aset( lsapi_env,rb_tainted_str_new("PATH_INFO", 9),
+                        rb_tainted_str_new(pValue, p - pValue));
+            rb_hash_aset( lsapi_env,rb_tainted_str_new("REQUEST_PATH", 12),
+                        rb_tainted_str_new(pValue, p - pValue));
+            if ( *p == '?' )
+                ++p;
             rb_hash_aset( lsapi_env,rb_tainted_str_new("QUERY_STRING", 12),
                         rb_tainted_str_new(p, len));
-            rb_hash_aset( lsapi_env,rb_tainted_str_new("PATH_INFO", 9),
-                        rb_tainted_str_new(pValue, valLen));
         }
         break;
     case 'S':
@@ -585,7 +588,8 @@ void Init_lsapi()
     }
     if ( p || getenv( "RAILS_ENV" ) )
         s_fn_add_env = add_env_rails;
-        
+
+                
     orig_stdin = rb_stdin;
     orig_stdout = rb_stdout;
     orig_stderr = rb_stderr;
@@ -593,11 +597,13 @@ void Init_lsapi()
     orig_defout = rb_defout;
 #endif
     orig_env = rb_const_get( rb_cObject, rb_intern("ENV") );
-
     env_copy = rb_funcall( orig_env, rb_intern( "to_hash" ), 0 );
     
     //tell the garbage collector it is a global variable, do not recycle it.
     rb_global_variable(&env_copy);
+
+    rb_hash_aset( env_copy,rb_tainted_str_new("GATEWAY_INTERFACE", 17),
+                        rb_tainted_str_new("CGI/1.2", 7));
     
     //Do not need those environments after initialization
     remove_env = rb_str_new( "RAILS_ROOT", 10 );

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "2.5"
-date: 2007-05-18 00:00:00 -04:00
+  version: "2.6"
+date: 2007-08-04 00:00:00 -04:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - LiteSpeed Technologies Inc.
 files: