ruby-lsapi 3.4 → 3.5

data/ext/lsapi/lsapilib.c

@@ -602,7 +602,9 @@ int LSAPI_Init(void)
 #if defined(SIGXFSZ) && defined(SIG_IGN)
         signal(SIGXFSZ, SIG_IGN);
 #endif
-
+        /* let STDOUT function as STDERR, 
+           just in case writing to STDOUT directly */
+        dup2( 2, 1 );  
         if ( LSAPI_InitRequest( &g_req, LSAPI_SOCK_FILENO ) == -1 )
             return -1;
         g_inited = 1;

data/ext/lsapi/lsruby.c

@@ -50,6 +50,7 @@ static lsapi_data * s_req_data;
 
 static VALUE s_req_stderr = Qnil;
 static lsapi_data * s_stderr_data;
+static pid_t s_pid = 0;
 
 /*
 static void lsapi_ruby_setenv(const char *name, const char *value)
@@ -170,11 +171,19 @@ static void setup_cgi_env( lsapi_data * data )
 
 static VALUE lsapi_s_accept( VALUE self )
 {
-
+    int pid;
     if ( LSAPI_Prefork_Accept_r( &g_req ) == -1 )
         return Qnil;
     else
     {
+
+        pid = getpid();
+        if ( pid != s_pid )
+        {
+            s_pid = pid;
+            rb_funcall( Qnil, rb_intern( "srand" ), 0 );
+        }
+
         setup_cgi_env( s_req_data );
         return s_req;
     }
@@ -523,6 +532,8 @@ void Init_lsapi()
 
     LSAPI_Init_Env_Parameters( rb_thread_select );
 
+    s_pid = getpid();
+
     p = getenv( "RAILS_ROOT" );
     if ( p )
     {
@@ -570,6 +581,10 @@ void Init_lsapi()
     rb_define_method(cLSAPI, "getc", lsapi_getc, 0);
     /* rb_define_method(cLSAPI, "ungetc", lsapi_ungetc, 1); */
     rb_define_method(cLSAPI, "gets", lsapi_gets, 0);
+
+    //TEST: adding readline function to make irb happy?
+    /*rb_define_method(cLSAPI, "readline", lsapi_gets, 0); */
+
     rb_define_method(cLSAPI, "read", lsapi_read, -1);
     rb_define_method(cLSAPI, "eof", lsapi_eof, 0);
     rb_define_method(cLSAPI, "eof?", lsapi_eof, 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "3.4"
+  version: "3.5"
 platform: ruby
 authors: 
 - LiteSpeed Technologies Inc.
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-23 00:00:00 -04:00
+date: 2009-05-14 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
 description: 
-email: 
+email: info@litespeedtech.com
 executables: []
 
 extensions: 
@@ -39,7 +39,7 @@ files:
 - scripts/lsruby_runner.rb
 - setup.rb
 has_rdoc: false
-homepage: 
+homepage: http://www.litespeedtech.com/
 post_install_message: 
 rdoc_options: []
 
@@ -59,8 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.1.1
+rubyforge_project: ruby-lsapi
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A ruby extension for fast communication with LiteSpeed Web Server.