ruby-lsapi 1.11 → 1.12

data/ext/lsapi/lsapilib.c

@@ -835,7 +835,7 @@ int LSAPI_ReadReqBody_r( LSAPI_Request * pReq, char * pBuf, int bufLen )
             pBuf += len;
             bufLen -= len;
         }
-        else if ( len < 0 )
+        else if ( len <= 0 )
             if ( !total)
                 return -1;
     }

data/ext/lsapi/lsruby.c

@@ -577,6 +577,8 @@ static VALUE lsapi_getc( VALUE self )
         rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
     }
     ch = LSAPI_ReqBodyGetChar_r( &g_req );
+    if ( ch == EOF )
+        return Qnil;
     return INT2NUM( ch );
 }
 
@@ -590,6 +592,8 @@ static VALUE lsapi_gets( VALUE self )
     {
         rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
     }
+    if ( LSAPI_GetReqBodyRemain_r( &g_req ) <= 0 )
+        return Qnil;
     str = rb_str_buf_new( 1024 );
     OBJ_TAINT(str);
     while( !getLF )
@@ -606,7 +610,7 @@ static VALUE lsapi_gets( VALUE self )
 static VALUE lsapi_read(int argc, VALUE *argv, VALUE self)
 {
     VALUE str;
-    lsapi_data *data;
+    //lsapi_data *data;
     int n;
     int remain;
     char buff[8192];
@@ -616,9 +620,9 @@ static VALUE lsapi_read(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
     }
 
-    Data_Get_Struct(self, lsapi_data, data);
+    //Data_Get_Struct(self, lsapi_data, data);
 
-    remain = LSAPI_GetReqBodyRemain();
+    remain = LSAPI_GetReqBodyRemain_r( &g_req );
     if ( remain <= 0 )
         return Qnil;
     if (argc != 0)
@@ -631,7 +635,7 @@ static VALUE lsapi_read(int argc, VALUE *argv, VALUE self)
     OBJ_TAINT(str);
     while( remain > 0 )
     {
-        n = LSAPI_ReadReqBody_r(data->req, buff,
+        n = LSAPI_ReadReqBody_r(&g_req, buff,
                         (remain > 8192)?8192:remain );
         if ( n > 0 )
         {
@@ -730,7 +734,12 @@ void Init_lsapi()
         s_ppid = getppid();
     else
         ruby_unsetenv( "LSAPI_PPID_NO_CHECK" );
-    if ( getenv( "RAILS_ROOT" )||getenv( "RAILS_ENV" ) )
+    p = getenv( "RAILS_ROOT" );
+    if ( p )
+    {
+        chdir( p );
+    }
+    if ( p || getenv( "RAILS_ENV" ) )
         s_fn_add_env = add_env_rails;
         
     orig_stdin = rb_stdin;

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "1.11"
-date: 2006-10-05 00:00:00 -04:00
+  version: "1.12"
+date: 2007-01-08 00:00:00 -05:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: 
 - lib