ruby-lsapi 1.6 → 1.7

data/README

@@ -61,9 +61,9 @@ Two new environment variables has been introduced since Ruby LSAPI 1.4:
 
     LSAPI_MAX_REQS=n
 
-n is the maximum number of requests that a child process can serve. 
-Default value is 1000. Once that number is reached, the child process will 
-exit automatically. This will help in case of any memory leaks in Rails. 
+n is the maximum number of requests that a child process can serve. Default
+value is 1,000,000. Once that number is reached, the child process will exit
+automatically. This will help in case of any memory leaks in Rails. 
 
     LSAPI_MAX_IDLE=n
 

data/ext/lsapi/lsruby.c

@@ -24,8 +24,11 @@ static VALUE orig_defout;
 
 static VALUE orig_env;
 
+static VALUE env_copy;
+
 static VALUE lsapi_env;
 
+
 static VALUE lsapi_objrefs;
 
 typedef struct lsapi_data
@@ -43,7 +46,7 @@ static lsapi_data * s_req_data;
 static int  s_children = 0;
 static int  s_cur_children = 0;
 static int  s_req_processed = 0;
-static int  s_max_reqs = 1000;
+static int  s_max_reqs = 1000000;
 static int  s_max_idle_secs = 60;
 static int  s_listenFd = -1;
 static int  s_ppid = 0;
@@ -82,14 +85,15 @@ static int add_env( const char * pKey, int keyLen, const char * pValue, int valL
 
 static void clear_env()
 {
-    rb_funcall( lsapi_env, rb_intern( "clear" ), 0 );
+    //rb_funcall( lsapi_env, rb_intern( "clear" ), 0 );
+    rb_funcall( lsapi_env, rb_intern( "replace" ), 1, env_copy );
 }
 
 static void setup_cgi_env( lsapi_data * data )
 {
 
     clear_env();
-    
+
     LSAPI_ForeachHeader_r( data->req, add_env, data );
     LSAPI_ForeachEnv_r( data->req, add_env, data );
     
@@ -204,15 +208,15 @@ static int lsapi_fork_child()
             }
             else if ( pid == -1 )
             {
-                perror( "fork() failed" );
-                break;
+                perror( "fork() failed, please increase process limit" );
             }
             else
             {
                 ++s_cur_children;
-                close( g_req.m_fd );
-                g_req.m_fd = -1;
             }
+            close( g_req.m_fd );
+            g_req.m_fd = -1;
+            
         }
         else
         {
@@ -571,11 +575,13 @@ static VALUE lsapi_setsync(VALUE self,VALUE sync)
 
 void Init_lsapi()
 {
+    VALUE remove_env;
     int n;
     char * p = getenv( "LSAPI_CHILDREN" );
     if ( p )
     {
         s_children = atoi( p );
+        unsetenv( "LSAPI_CHILDREN" );
     }
 
     p = getenv( "LSAPI_MAX_REQS" );
@@ -584,6 +590,7 @@ void Init_lsapi()
         n = atoi( p );
         if ( n > 0 )
             s_max_reqs = n;
+        unsetenv( "LSAPI_MAX_REQS" );
     }
     
     p = getenv( "LSAPI_MAX_IDLE" );
@@ -591,6 +598,7 @@ void Init_lsapi()
     {
         n = atoi( p );
         s_max_idle_secs = n;
+        unsetenv( "LSAPI_MAX_IDLE" );
     }
 
     orig_stdin = rb_stdin;
@@ -599,7 +607,14 @@ void Init_lsapi()
     orig_defout = rb_defout;
 #endif
     orig_env = rb_const_get( rb_cObject, rb_intern("ENV") );
-//    lsapi_env = orig_env;
+
+    env_copy = rb_funcall( orig_env, rb_intern( "to_hash" ), 0 );
+    //Do not need those environments after initialization
+    remove_env = rb_str_new( "RAILS_ROOT", 10 );
+    rb_funcall( env_copy, rb_intern( "delete" ), 1, remove_env );
+    remove_env = rb_str_new( "RAILS_ENV", 9 );
+    rb_funcall( env_copy, rb_intern( "delete" ), 1, remove_env );
+    
     lsapi_env = rb_hash_new();
     //redefine ENV using a hash table, should be faster than char **environment
     rb_define_global_const("ENV", lsapi_env);

metadata

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