ruby-lsapi 2.9 → 3.0

data/ext/lsapi/lsapilib.c

@@ -91,7 +91,7 @@ static const char *CGI_HEADERS[H_TRANSFER_ENCODING+1] =
     "HTTP_IF_NONE_MATCH",
     "HTTP_IF_RANGE",
     "HTTP_IF_UNMODIFIED_SINCE",
-    "HTTP_KEEPALIVE",
+    "HTTP_KEEP_ALIVE",
     "HTTP_RANGE",
     "HTTP_X_FORWARDED_FOR",
     "HTTP_VIA",
@@ -100,8 +100,9 @@ static const char *CGI_HEADERS[H_TRANSFER_ENCODING+1] =
      
 static int CGI_HEADER_LEN[H_TRANSFER_ENCODING+1] =
 {    11, 19, 20, 20, 18, 15, 12, 14, 11, 12, 9, 11, 12, 15, 18,
-     22, 13, 18, 13, 24, 14, 10, 20, 8, 22 };
-/*
+     22, 13, 18, 13, 24, 15, 10, 20, 8, 22 };
+
+
 static const char *HTTP_HEADERS[H_TRANSFER_ENCODING+1] =
 {
     "Accept", "Accept-Charset",
@@ -116,13 +117,17 @@ static const char *HTTP_HEADERS[H_TRANSFER_ENCODING+1] =
     "If-None-Match",
     "If-Range",
     "If-Unmodified-Since",
-    "Keepalive",
+    "Keep-Alive",
     "Range",
     "X-Forwarded-For",
     "Via",
     "Transfer-Encoding"
 };
-*/
+
+static int HTTP_HEADER_LEN[H_TRANSFER_ENCODING+1] =
+{   6, 14, 15, 15, 13, 10, 12, 14, 6, 7, 4, 6, 7, 10, //user-agent
+    13,17, 8, 13, 8, 19, 10, 5, 15, 3, 17
+};
      
 static void lsapi_sigpipe( int sig )
 {
@@ -1139,6 +1144,58 @@ char * LSAPI_GetEnv_r( LSAPI_Request * pReq, const char * name )
     return NULL;
 }
 
+int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
+            LSAPI_CB_EnvHandler fn, void * arg )
+{
+    int i;
+    int len = 0;
+    char * pValue;
+    int ret;
+    int count = 0;
+    if ( !pReq || !fn )
+        return -1;
+    for( i = 0; i < H_TRANSFER_ENCODING; ++i )
+    {
+        if ( pReq->m_pHeaderIndex->m_headerOff[i] )
+        {
+            len = pReq->m_pHeaderIndex->m_headerLen[i];
+            pValue = pReq->m_pHttpHeader + pReq->m_pHeaderIndex->m_headerOff[i];
+            *(pValue + len ) = 0;
+            ret = (*fn)( HTTP_HEADERS[i], HTTP_HEADER_LEN[i],
+                        pValue, len, arg );
+            ++count;
+            if ( ret <= 0 )
+                return ret;
+        }
+    }
+    if ( pReq->m_pHeader->m_cntUnknownHeaders > 0 )
+    {
+        char achHeaderName[256];
+        char *p;
+        char *pKey;
+        char *pKeyEnd ;
+        int  keyLen;
+        struct lsapi_header_offset * pCur, *pEnd;
+        pCur = pReq->m_pUnknownHeader;
+        pEnd = pCur + pReq->m_pHeader->m_cntUnknownHeaders;
+        while( pCur < pEnd )
+        {
+            pKey = pReq->m_pHttpHeader + pCur->nameOff;
+            keyLen = pCur->nameLen;
+
+            pValue = pReq->m_pHttpHeader + pCur->valueOff;
+            *(pValue + pCur->valueLen ) = 0;
+            ret = (*fn)( pKey, keyLen, 
+                        pValue, pCur->valueLen, arg );
+            if ( ret <= 0 )
+                return ret;
+            ++pCur;
+        }
+    }
+    return count + pReq->m_pHeader->m_cntUnknownHeaders;
+    
+}
+
 
 int LSAPI_ForeachHeader_r( LSAPI_Request * pReq,
             LSAPI_CB_EnvHandler fn, void * arg )
@@ -2000,10 +2057,19 @@ void LSAPI_No_Check_ppid()
     s_ppid = 0;
 }
 
+#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+#include <crt_externs.h>
+#else
 extern char ** environ;
+#endif
 static void unset_lsapi_envs()
 {
-    char **env = environ;
+    char **env;
+#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+    env = *_NSGetEnviron();
+#else
+    env = environ;
+#endif
     while( env != NULL && *env != NULL ) 
     {
         if (!strncmp(*env, "LSAPI_", 6) || !strncmp( *env, "PHP_LSAPI_", 10 ) ) 

data/ext/lsapi/lsapilib.h

@@ -146,6 +146,9 @@ char * LSAPI_GetHeader_r( LSAPI_Request * pReq, int headerIndex );
 int LSAPI_ForeachHeader_r( LSAPI_Request * pReq,
             LSAPI_CB_EnvHandler fn, void * arg );
 
+int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
+            LSAPI_CB_EnvHandler fn, void * arg );
+
 int LSAPI_ForeachEnv_r( LSAPI_Request * pReq,
             LSAPI_CB_EnvHandler fn, void * arg );
 
@@ -242,6 +245,10 @@ static inline char * LSAPI_GetHeader( int headerIndex )
 static inline int LSAPI_ForeachHeader( LSAPI_CB_EnvHandler fn, void * arg )
 {   return LSAPI_ForeachHeader_r( &g_req, fn, arg );        }
 
+static inline int LSAPI_ForeachOrgHeader(
+            LSAPI_CB_EnvHandler fn, void * arg )
+{   return LSAPI_ForeachOrgHeader_r( &g_req, fn, arg );     }
+
 static inline int LSAPI_ForeachEnv( LSAPI_CB_EnvHandler fn, void * arg )
 {   return LSAPI_ForeachEnv_r( &g_req, fn, arg );           }
 

metadata

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