ruby-lsapi 2.8 → 2.9

data/ext/lsapi/lsapidef.h

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 /***************************************************************************
-    $Id: lsapidef.h,v 1.14 2005/09/29 23:51:06 gwang Exp $
+    $Id: lsapidef.h,v 1.15 2008/01/03 18:31:50 gwang Exp $
                          -------------------
     begin                : Thu Feb 10 2005
     author               : George Wang
@@ -79,9 +79,9 @@ enum
 #define LSAPI_SOCK_FILENO           0
 
 #define LSAPI_VERSION_B0            'L'
-#define LSAPI_VERSION_B1            'S'                
+#define LSAPI_VERSION_B1            'S'
 
-//Values for m_flag in lsapi_packet_header
+/* Values for m_flag in lsapi_packet_header */
 #define LSAPI_ENDIAN_LITTLE         0
 #define LSAPI_ENDIAN_BIG            1 
 #define LSAPI_ENDIAN_BIT            1
@@ -92,7 +92,7 @@ enum
 #define LSAPI_ENDIAN                LSAPI_ENDIAN_BIG
 #endif
 
-//Values for m_type in lsapi_packet_header
+/* Values for m_type in lsapi_packet_header */
 #define LSAPI_BEGIN_REQUEST         1
 #define LSAPI_ABORT_REQUEST         2
 #define LSAPI_RESP_HEADER           3
@@ -111,24 +111,26 @@ enum
 
 struct lsapi_packet_header
 {
-    char    m_versionB0;      //LSAPI protocol version 
+    char    m_versionB0;      /* LSAPI protocol version */
     char    m_versionB1;
     char    m_type;
     char    m_flag;
     union
     {
-        int32_t m_iLen;    //include this header
+        int32_t m_iLen;       /* include this header */
         char    m_bytes[4];
     }m_packetLen;
 };
 
-// LSAPI request header packet
-//
-// 1. struct lsapi_req_header
-// 2. struct lsapi_http_header_index
-// 3. lsapi_header_offset * unknownHeaders
-// 4. org http request header
-// 5. request body if available
+/*
+    LSAPI request header packet
+    
+    1. struct lsapi_req_header
+    2. struct lsapi_http_header_index
+    3. lsapi_header_offset * unknownHeaders
+    4. org http request header
+    5. request body if available
+*/
 
 struct lsapi_req_header
 {
@@ -136,9 +138,9 @@ struct lsapi_req_header
         
     int32_t m_httpHeaderLen;
     int32_t m_reqBodyLen;
-    int32_t m_scriptFileOff;   //path to the script file.
-    int32_t m_scriptNameOff;   //decrypted URI, without pathinfo,
-    int32_t m_queryStringOff;  //Query string inside env 
+    int32_t m_scriptFileOff;   /* path to the script file. */
+    int32_t m_scriptNameOff;   /* decrypted URI, without pathinfo, */
+    int32_t m_queryStringOff;  /* Query string inside env */
     int32_t m_requestMethodOff;
     int32_t m_cntUnknownHeaders;
     int32_t m_cntEnv;

data/ext/lsapi/lsapilib.c

@@ -73,7 +73,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 static int g_inited = 0;
 static int g_running = 1;
 static int s_ppid;
-LSAPI_Request g_req;
+LSAPI_Request g_req = { -1, -1 };
 
 void Flush_RespBuf_r( LSAPI_Request * pReq );
 
@@ -155,7 +155,7 @@ static void lsapi_signal(int signo, sighandler_t handler)
 static inline void lsapi_buildPacketHeader( struct lsapi_packet_header * pHeader,
                                 char type, int len )
 {
-    pHeader->m_versionB0 = LSAPI_VERSION_B0;      //LSAPI protocol version
+    pHeader->m_versionB0 = LSAPI_VERSION_B0;  /* LSAPI protocol version */
     pHeader->m_versionB1 = LSAPI_VERSION_B1;
     pHeader->m_type      = type;
     pHeader->m_flag      = LSAPI_ENDIAN;
@@ -186,25 +186,27 @@ static inline int lsapi_read( int fd, void * pBuf, int len )
     }
 }
 
-//static int lsapi_write( int fd, const void * pBuf, int len )
-//{
-//    int ret;
-//    const char * pCur;
-//    const char * pEnd;
-//    if ( len == 0 )
-//        return 0;
-//    pCur = (const char *)pBuf;
-//    pEnd = pCur + len;
-//    while( g_running && (pCur < pEnd) )
-//    {
-//        ret = write( fd, pCur, pEnd - pCur );
-//        if ( ret >= 0)
-//            pCur += ret;
-//        else if (( ret == -1 )&&( errno != EINTR ))
-//            return ret;
-//    }
-//    return pCur - (const char *)pBuf;
-//}
+/*
+static int lsapi_write( int fd, const void * pBuf, int len )
+{
+   int ret;
+   const char * pCur;
+   const char * pEnd;
+   if ( len == 0 )
+       return 0;
+   pCur = (const char *)pBuf;
+   pEnd = pCur + len;
+   while( g_running && (pCur < pEnd) )
+   {
+       ret = write( fd, pCur, pEnd - pCur );
+       if ( ret >= 0)
+           pCur += ret;
+       else if (( ret == -1 )&&( errno != EINTR ))
+           return ret;
+   }
+   return pCur - (const char *)pBuf;
+}
+*/
 
 static int lsapi_writev( int fd, struct iovec ** pVec, int count, int totalLen )
 {
@@ -250,18 +252,19 @@ static int lsapi_writev( int fd, struct iovec ** pVec, int count, int totalLen )
     return totalLen - left;
 }
 
-//static int getTotalLen( struct iovec * pVec, int count )
-//{
-//    struct iovec * pEnd = pVec + count;
-//    int total = 0;
-//    while( pVec < pEnd )
-//    {
-//        total += pVec->iov_len;
-//        ++pVec;
-//    }
-//    return total;
-//}
-
+/*
+static int getTotalLen( struct iovec * pVec, int count )
+{
+   struct iovec * pEnd = pVec + count;
+   int total = 0;
+   while( pVec < pEnd )
+   {
+       total += pVec->iov_len;
+       ++pVec;
+   }
+   return total;
+}
+*/
 
 static inline int allocateBuf( LSAPI_Request * pReq, int size )
 {
@@ -677,7 +680,7 @@ static struct lsapi_packet_header   finish = {'L', 'S',
 
 int LSAPI_Finish_r( LSAPI_Request * pReq )
 {
-    //finish req body
+    /* finish req body */
     if ( !pReq )
         return -1;
     if (pReq->m_reqState)
@@ -769,6 +772,8 @@ static int readBodyToReqBuf( LSAPI_Request * pReq )
 
 int LSAPI_ReqBodyGetChar_r( LSAPI_Request * pReq )
 {
+    if (!pReq || (pReq->m_fd ==-1) )
+        return EOF;
     if ( pReq->m_bufProcessed >= pReq->m_bufRead )
     {
         if ( readBodyToReqBuf( pReq ) <= 0 )
@@ -788,7 +793,7 @@ int LSAPI_ReqBodyGetLine_r( LSAPI_Request * pReq, char * pBuf, int bufLen, int *
     char * pBufCur = pBuf;
     char * pCur;
     char * p;
-    if (!pReq || ( !pBuf )||(bufLen < 0 )|| !getLF )
+    if (!pReq || (pReq->m_fd ==-1) ||( !pBuf )||(bufLen < 0 )|| !getLF )
         return -1;
     *getLF = 0;
     while( (left = pBufEnd - pBufCur ) > 0 )
@@ -831,8 +836,8 @@ int LSAPI_ReadReqBody_r( LSAPI_Request * pReq, char * pBuf, int bufLen )
 {
     int len;
     int total;
-    //char *pOldBuf = pBuf;
-    if (!pReq || ( !pBuf )||(bufLen < 0 ))
+    /* char *pOldBuf = pBuf; */
+    if (!pReq || (pReq->m_fd ==-1) || ( !pBuf )||(bufLen < 0 ))
         return -1;
 
     total = pReq->m_pHeader->m_reqBodyLen - pReq->m_reqBodyRead;
@@ -876,11 +881,6 @@ int LSAPI_ReadReqBody_r( LSAPI_Request * pReq, char * pBuf, int bufLen )
 }
 
 
-//int LSAPI_Write( const char * pBuf, int len )
-//{
-//    return LSAPI_Write_r( &g_req, pBuf, len );
-//}
-
 int LSAPI_Write_r( LSAPI_Request * pReq, const char * pBuf, int len )
 {
     struct lsapi_packet_header * pHeader;
@@ -1035,8 +1035,10 @@ int LSAPI_Write_Stderr_r( LSAPI_Request * pReq, const char * pBuf, int len )
     struct iovec iov[2];
     struct iovec *pIov;
     
-    if (( !pReq )||( pReq->m_fd == -1 ))
+    if ( !pReq )
         return -1;
+    if (( pReq->m_fd == -1 )||(pReq->m_fd == pReq->m_fdListen ))
+        return write( 2, pBuf, len );
     if ( pReq->m_pRespBufPos != pReq->m_pRespBuf )
     {
         LSAPI_Flush_r( pReq );
@@ -1305,7 +1307,7 @@ int LSAPI_AppendRespHeader_r( LSAPI_Request * pReq, char * pBuf, int len )
     memmove( pReq->m_pRespHeaderBufPos, pBuf, len );
     pReq->m_pRespHeaderBufPos += len;
     *pReq->m_pRespHeaderBufPos++ = 0;
-    ++len;  //add one byte padding for \0
+    ++len;  /* add one byte padding for \0 */
     pReq->m_respHeaderLen[pReq->m_respHeader.m_respInfo.m_cntHeaders] = len;
     ++pReq->m_respHeader.m_respInfo.m_cntHeaders;
     return 0;
@@ -1526,8 +1528,8 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp, int avoidFork )
     g_prefork_server->m_iAvoidFork = avoidFork;
     g_prefork_server->m_iMaxChildren = max_children;
     
-    g_prefork_server->m_iExtraChildren = ( avoidFork ) ? 0 : max_children / 3 ;
-    g_prefork_server->m_iMaxIdleChildren = ( avoidFork ) ? (max_children + 1) : max_children / 3;
+    g_prefork_server->m_iExtraChildren = ( avoidFork ) ? 0 : (max_children / 3) ;
+    g_prefork_server->m_iMaxIdleChildren = ( avoidFork ) ? (max_children + 1) : (max_children / 3);
     g_prefork_server->m_iChildrenMaxIdleTime = 300;
     g_prefork_server->m_iMaxReqProcessTime = 300;
     return 0;    
@@ -1715,7 +1717,8 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
     int             wait_secs = 0;
     int             ret = 0;
     int             pid;
-    time_t          lastTime = 0, curTime;
+    time_t          lastTime = 0;
+    time_t          curTime = 0;
     fd_set          readfds;
     struct timeval  timeout;
 
@@ -1794,7 +1797,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
         {
             if ( errno == EINTR )
                 continue;
-            //perror( "select()" );
+            /* perror( "select()" ); */
             break;
         }
         else
@@ -1850,7 +1853,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
     }
     sigaction( SIGUSR1, &old_usr1, 0 );
     kill( -getpgrp(), SIGUSR1 );
-    lsapi_all_children_must_die();  // Sorry, children ;-)
+    lsapi_all_children_must_die();  /* Sorry, children ;-) */
     return -1;
 
 }
@@ -1997,13 +2000,7 @@ void LSAPI_No_Check_ppid()
     s_ppid = 0;
 }
 
-#if defined(__APPLE__)
-#include <crt_externs.h>
-#define environ (*_NSGetEnviron())
-#else
 extern char ** environ;
-#endif
-
 static void unset_lsapi_envs()
 {
     char **env = environ;

data/ext/lsapi/lsapilib.h

@@ -120,7 +120,7 @@ typedef struct lsapi_request
 extern LSAPI_Request g_req;
 
 
-//return: >0 continue, ==0 stop, -1 failed
+/* return: >0 continue, ==0 stop, -1 failed  */
 typedef int (*LSAPI_CB_EnvHandler )( const char * pKey, int keyLen,
                 const char * pValue, int valLen, void * arg );
 

data/ext/lsapi/lsruby.c

@@ -1,5 +1,6 @@
 
 #include "ruby.h"
+#include "util.h"
 
 #include "lsapilib.h"
 #include <errno.h>
@@ -8,8 +9,9 @@
 #include <signal.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
-//RUBY_EXTERN VALUE ruby_errinfo;
+/* RUBY_EXTERN VALUE ruby_errinfo; */
 RUBY_EXTERN VALUE rb_stdin;
 RUBY_EXTERN VALUE rb_stdout;
 #if RUBY_VERSION_CODE < 180
@@ -30,7 +32,7 @@ static VALUE env_copy;
 static VALUE lsapi_env;
 
 
-static VALUE lsapi_objrefs;
+/* static VALUE lsapi_objrefs; */
 
 typedef struct lsapi_data
 {
@@ -49,15 +51,7 @@ static lsapi_data * s_req_data;
 static VALUE s_req_stderr = Qnil;
 static lsapi_data * s_stderr_data;
 
-//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_idle_secs = 60;
-//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)
 {
     if (!name) return;
@@ -67,25 +61,25 @@ static void lsapi_ruby_setenv(const char *name, const char *value)
     else
         ruby_unsetenv(name);
 }
-
+*/
 
 
 static void lsapi_mark( lsapi_data * data )
 {
     rb_gc_mark( data->env );
 }
-
+/*
 static void lsapi_free_data( lsapi_data * data )
 {
-    free( data );
+   free( data );
 }
-
+*/
 static int add_env_rails( const char * pKey, int keyLen, const char * pValue, int valLen,
                          void * arg )
 {
     char * p;
     int len;
-    //Fixup some environment variables for rails
+    /* Fixup some environment variables for rails */
     switch( *pKey )
     {
     case 'Q':
@@ -102,8 +96,10 @@ static int add_env_rails( const char * pKey, int keyLen, const char * pValue, in
             if ( p )
             {
                 len = valLen - ( p - pValue ) - 1;
-                //valLen = p - pValue;
-                //*p++ = 0;
+                /* 
+                valLen = p - pValue;
+                *p++ = 0;
+                */
             }
             else
             {
@@ -134,7 +130,7 @@ static int add_env_rails( const char * pKey, int keyLen, const char * pValue, in
         break;
     }
     
-    //lsapi_ruby_setenv(pKey, pValue );
+    /* lsapi_ruby_setenv(pKey, pValue ); */
     
     rb_hash_aset( lsapi_env,rb_tainted_str_new(pKey, keyLen),
                     rb_tainted_str_new(pValue, valLen));
@@ -156,7 +152,7 @@ fn_add_env s_fn_add_env = add_env_no_fix;
                          
 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 );
 }
 
@@ -174,11 +170,6 @@ static void setup_cgi_env( lsapi_data * data )
 
 static VALUE lsapi_s_accept( VALUE self )
 {
-    int             fd;
-    int             ret;
-    int             wait_secs;
-    fd_set          readfds;
-    struct timeval  timeout;
 
     if ( LSAPI_Prefork_Accept_r( &g_req ) == -1 )
         return Qnil;
@@ -190,7 +181,7 @@ static VALUE lsapi_s_accept( VALUE self )
    
 }
 
-
+/*
 static int chdir_file( const char * pFile )
 {
     char * p = strrchr( pFile, '/' );
@@ -202,6 +193,7 @@ static int chdir_file( const char * pFile )
     *p = '/';
     return ret;
 }
+*/
 
 static VALUE lsapi_eval_string_wrap(VALUE self, VALUE str)
 {
@@ -222,12 +214,14 @@ static VALUE lsapi_process( VALUE self )
     const char * pScriptPath;
     Data_Get_Struct(self,lsapi_data, data);
     pScriptPath = LSAPI_GetScriptFileName_r( data->req );
-//    if ( chdir_file( pScriptPath ) == -1 )
-//    {
-//        lsapi_send_error( 404 );
-//    }
-//    rb_load_file( pScriptPath );
-    return Qnil;
+/*
+   if ( chdir_file( pScriptPath ) == -1 )
+   {
+       lsapi_send_error( 404 );
+   }
+   rb_load_file( pScriptPath );
+*/
+   return Qnil;
 }
 
 
@@ -248,7 +242,7 @@ static VALUE lsapi_write( VALUE self, VALUE str )
     lsapi_data *data;
     int len;
     Data_Get_Struct(self,lsapi_data, data);
-//    len = LSAPI_Write_r( data->req, RSTRING(str)->ptr, RSTRING(str)->len );
+/*    len = LSAPI_Write_r( data->req, RSTRING(str)->ptr, RSTRING(str)->len ); */
     if (TYPE(str) != T_STRING)
 	    str = rb_obj_as_string(str);
     len = (*data->fn_write)( data->req, RSTRING(str)->ptr, RSTRING(str)->len );
@@ -361,8 +355,10 @@ static VALUE lsapi_addstr(VALUE out, VALUE str)
 
 static VALUE lsapi_flush( VALUE self )
 {
-    //lsapi_data *data;
-    //Data_Get_Struct(self,lsapi_data, data);
+/*
+    lsapi_data *data;
+    Data_Get_Struct(self,lsapi_data, data);
+*/
     LSAPI_Flush_r( &g_req ); 
     return Qnil;
 }
@@ -370,8 +366,10 @@ static VALUE lsapi_flush( VALUE self )
 static VALUE lsapi_getc( VALUE self )
 {
     int ch;
-    //lsapi_data *data;
-    //Data_Get_Struct(self,lsapi_data, data);
+/*
+    lsapi_data *data;
+    Data_Get_Struct(self,lsapi_data, data);
+*/
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(self))
     {
         rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
@@ -412,7 +410,6 @@ static VALUE lsapi_gets( VALUE self )
 static VALUE lsapi_read(int argc, VALUE *argv, VALUE self)
 {
     VALUE str;
-    //lsapi_data *data;
     int n;
     int remain;
     char buff[8192];
@@ -422,7 +419,6 @@ 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);
 
     remain = LSAPI_GetReqBodyRemain_r( &g_req );
     if ( remain <= 0 )
@@ -446,7 +442,7 @@ static VALUE lsapi_read(int argc, VALUE *argv, VALUE self)
         }
         else if ( n <= 0 )
         {
-            //FIXME: broken connection
+            /* FIXME: broken connection */
             break;
         }
     }
@@ -457,45 +453,35 @@ static VALUE lsapi_read(int argc, VALUE *argv, VALUE self)
 
 static VALUE lsapi_eof(VALUE self)
 {
-//    lsapi_data *data;
-//
-//    if (rb_safe_level() >= 4 && !OBJ_TAINTED(self))
-//    {
-//        rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-//    }
-//    Data_Get_Struct(self, lsapi_data, data);
+/*
+   lsapi_data *data;
+
+   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self))
+   {
+       rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
+   }
+   Data_Get_Struct(self, lsapi_data, data);
+*/
     return (LSAPI_GetReqBodyRemain( &g_req ) <= 0) ? Qtrue : Qfalse;
 }
 
 static VALUE lsapi_binmode(VALUE self)
 {
-//    if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-//        rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-//    }
     return self;
 }
 
 static VALUE lsapi_isatty(VALUE self)
 {
-//    if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-//        rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-//    }
     return Qfalse;
 }
 
 static VALUE lsapi_sync(VALUE self)
 {
-//    if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-//        rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-//    }
     return Qfalse;
 }
 
 static VALUE lsapi_setsync(VALUE self,VALUE sync)
 {
-//    if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-//        rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-//    }
     return Qfalse;
 }
 
@@ -508,10 +494,10 @@ static VALUE lsapi_close(VALUE self)
 
 static VALUE lsapi_reopen( int argc, VALUE *argv, VALUE self)
 {
-    VALUE orig_verbose; // constant silence hack
+    VALUE orig_verbose;
     if ( self == s_req_stderr )
     {
-        //constant silence hack
+        /* constant silence hack */
         orig_verbose = (VALUE)ruby_verbose;
         ruby_verbose = Qnil;
 
@@ -530,61 +516,18 @@ static VALUE lsapi_reopen( int argc, VALUE *argv, VALUE self)
 void Init_lsapi()
 {
     VALUE remove_env;
-    int n = 0;
-    VALUE orig_verbose; // constant silence hack
+    VALUE orig_verbose; 
     char * p;
 
     LSAPI_Init();
 
     LSAPI_Init_Env_Parameters( rb_thread_select );
-/*
-    p = getenv( "LSAPI_CHILDREN" );
-    if ( p )
-    {
-        n = atoi( p );
-        ruby_unsetenv( "LSAPI_CHILDREN" );
-    }
-    if ( n > 1 )
-    {
-        LSAPI_Init_Prefork_Server( n, rb_thread_select );
-        LSAPI_Set_Server_fd( g_req.m_fdListen );
-    }
-    
-    p = getenv( "LSAPI_MAX_REQS" );
-    if ( p )
-    {
-        n = atoi( p );
-        if ( n > 0 )
-            LSAPI_Set_Max_Req( n );
-        ruby_unsetenv( "LSAPI_MAX_REQS" );
-    }
-    
-    p = getenv( "LSAPI_MAX_IDLE" );
-    if ( p )
-    {
-        n = atoi( p );
-        LSAPI_Set_Max_Idle( n );
-        ruby_unsetenv( "LSAPI_MAX_IDLE" );
-    }
-
-    p = getenv( "LSAPI_PGRP_MAX_IDLE" );
-    if ( p )
-    {
-        LSAPI_Set_Server_Max_Idle_Secs( atoi( p ) );
-        ruby_unsetenv( "LSAPI_PGRP_MAX_IDLE" );
-    }
-
-    if ( getenv( "LSAPI_PPID_NO_CHECK" ) )
-    {
-        LSAPI_No_Check_ppid();
-        ruby_unsetenv( "LSAPI_PPID_NO_CHECK" );
-    }
-*/
 
     p = getenv( "RAILS_ROOT" );
     if ( p )
     {
-        chdir( p );
+        if ( chdir( p ) == -1 )
+            perror( "chdir()" );
     }
     if ( p || getenv( "RAILS_ENV" ) )
         s_fn_add_env = add_env_rails;
@@ -599,13 +542,13 @@ void Init_lsapi()
     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.
+    /* 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
+    /* 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 );
     
@@ -616,7 +559,7 @@ void Init_lsapi()
     rb_define_singleton_method(cLSAPI, "accept", lsapi_s_accept, 0);
 
     rb_define_method(cLSAPI, "process", lsapi_process, 0 );
-    //rb_define_method(cLSAPI, "initialize", lsapi_initialize, 0);
+    /* rb_define_method(cLSAPI, "initialize", lsapi_initialize, 0); */
     rb_define_method(cLSAPI, "putc", lsapi_putc, 1);
     rb_define_method(cLSAPI, "write", lsapi_write, 1);
     rb_define_method(cLSAPI, "print", lsapi_print, -1);
@@ -625,16 +568,16 @@ void Init_lsapi()
     rb_define_method(cLSAPI, "<<", lsapi_addstr, 1);
     rb_define_method(cLSAPI, "flush", lsapi_flush, 0);
     rb_define_method(cLSAPI, "getc", lsapi_getc, 0);
-    //rb_define_method(cLSAPI, "ungetc", lsapi_ungetc, 1);
+    /* rb_define_method(cLSAPI, "ungetc", lsapi_ungetc, 1); */
     rb_define_method(cLSAPI, "gets", 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);
     rb_define_method(cLSAPI, "close", lsapi_close, 0);
-//    rb_define_method(cLSAPI, "closed?", lsapi_closed, 0);
+    /* rb_define_method(cLSAPI, "closed?", lsapi_closed, 0); */
     rb_define_method(cLSAPI, "binmode", lsapi_binmode, 0);
-    //rb_define_method(cLSAPI, "isatty", lsapi_isatty, 0);
-    //rb_define_method(cLSAPI, "tty?", lsapi_isatty, 0);
+    rb_define_method(cLSAPI, "isatty", lsapi_isatty, 0);
+    rb_define_method(cLSAPI, "tty?", lsapi_isatty, 0);
     rb_define_method(cLSAPI, "sync", lsapi_sync, 0);
     rb_define_method(cLSAPI, "sync=", lsapi_setsync, 1);
     rb_define_method(cLSAPI, "reopen", lsapi_reopen, -1 );
@@ -656,12 +599,12 @@ void Init_lsapi()
     rb_stderr = s_req_stderr;
     rb_global_variable(&s_req_stderr );
 
-    //constant silence hack
+    /* constant silence hack */
     orig_verbose = (VALUE)ruby_verbose;
     ruby_verbose = Qnil;
 
     lsapi_env = rb_hash_new();
-    //redefine ENV using a hash table, should be faster than char **environment
+    /* redefine ENV using a hash table, should be faster than char **environment */
     rb_define_global_const("ENV", lsapi_env);
     
     rb_define_global_const("STDERR", rb_stderr);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "2.8"
-date: 2007-11-25 00:00:00 -05:00
+  version: "2.9"
+date: 2008-01-03 00:00:00 -05:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: 
 - lib