ruby-lsapi 4.2 → 4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7071cdbea2aaa5b5e3e15d81cb659dbcdd4f0ec2
-  data.tar.gz: c224835bd8b574e1a697cbe1754a21f01bec9a5f
+  metadata.gz: f50f52a087ccb168677d89ab894b8588abec069e
+  data.tar.gz: 3eebc21ef0cac31cf1f6142a16aab8fe48a1bfd2
 SHA512:
-  metadata.gz: b00c35195f8785e6196f1b2ab97d3bac71ad795b7290015e5bb2f419d1a2477d44b27088d019f329d4c13ba11b672417bf78c4189a43ecb9b1465c58c60c7046
-  data.tar.gz: a623cc9fcd25ab6ce7e6c41d50ddc8d19c5b020d23fff9ad5890483346a89ae01ab4ab466f85bef896745f74faddf7581f4a9b01c7ca8ef42122a69a36fa84cf
+  metadata.gz: f3143175c96d841ac986629da7208a026df9eda49be225d031fc8fd21f06c18e64ba9a3da53066c427ee4a4d0a54ca86f9b8ec18b4b0b2156c06cb2ca6db4262
+  data.tar.gz: 7066ddb8f448c3fda956e6b5b29475d15ccaa96e6f8b518359c973f3b66100324d2712ff8af0f89b47b844b9ec94b8382a2ae92f24d61405cbf05ee48057b0b8

data/ext/lsapi/lsapidef.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2002-2014, Lite Speed Technologies Inc.
+Copyright (c) 2002-2015, Lite Speed Technologies Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */
 
+
 #ifndef  _LSAPIDEF_H_
 #define  _LSAPIDEF_H_
 

data/ext/lsapi/lsapilib.c

@@ -4,18 +4,18 @@ All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
-met: 
+met:
 
     * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer. 
+      notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above
       copyright notice, this list of conditions and the following
       disclaimer in the documentation and/or other materials provided
-      with the distribution. 
+      with the distribution.
     * Neither the name of the Lite Speed Technologies Inc nor the
       names of its contributors may be used to endorse or promote
       products derived from this software without specific prior
-      written permission.  
+      written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,7 +27,7 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
@@ -110,7 +110,7 @@ static int s_pid_dump_debug_info = 0;
 
 LSAPI_Request g_req = { -1, -1 };
 
-static char         s_pSecret[24];
+static char         s_secret[24];
 
 
 void Flush_RespBuf_r( LSAPI_Request * pReq );
@@ -135,7 +135,7 @@ static const char *CGI_HEADERS[H_TRANSFER_ENCODING+1] =
     "HTTP_VIA",
     "HTTP_TRANSFER_ENCODING"
 };
-     
+
 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, 15, 10, 20, 8, 22 };
@@ -166,7 +166,7 @@ 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 )
 {
 }
@@ -178,7 +178,7 @@ static void lsapi_siguser1( int sig )
 #ifndef sighandler_t
 typedef void (*sighandler_t)(int);
 #endif
-          
+
 static void lsapi_signal(int signo, sighandler_t handler)
 {
     struct sigaction sa;
@@ -196,12 +196,12 @@ static void lsapi_signal(int signo, sighandler_t handler)
 
 
 static int s_enable_core_dump = 0;
-static void lsapi_enable_core_dump()
+static void lsapi_enable_core_dump(void)
 {
 #if defined(__FreeBSD__ ) || defined(__NetBSD__) || defined(__OpenBSD__) \
     || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
     int  mib[2];
-    size_t len;    
+    size_t len;
 
     len = 2;
     if ( sysctlnametomib("kern.sugid_coredump", mib, &len) == 0 )
@@ -212,7 +212,7 @@ static void lsapi_enable_core_dump()
                     "core dump may not be available!");
     }
 
-    
+
 #endif
 
 #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
@@ -419,7 +419,7 @@ static int allocateEnvList( struct LSAPI_key_value_pair ** pEnvList,
                         int *curSize, int newSize )
 {
     struct LSAPI_key_value_pair * pBuf;
-        if ( *curSize >= newSize )
+    if ( *curSize >= newSize )
         return 0;
     if ( newSize > 8192 )
         return -1;
@@ -493,7 +493,7 @@ static inline void swapIntEndian( int * pInteger )
     b = p[1];
     p[1] = p[2];
     p[2] = b;
-    
+
 }
 
 static inline void fixEndian( LSAPI_Request * pReq )
@@ -541,6 +541,40 @@ static void fixHeaderIndexEndian( LSAPI_Request * pReq )
     }
 }
 
+
+static int validateHeaders( LSAPI_Request * pReq )
+{
+    int totalLen = pReq->m_pHeader->m_httpHeaderLen;
+    int i;
+    for(i = 0; i < H_TRANSFER_ENCODING; ++i)
+    {
+        if ( pReq->m_pHeaderIndex->m_headerOff[i] )
+        {
+            if (pReq->m_pHeaderIndex->m_headerOff[i] > totalLen 
+                || pReq->m_pHeaderIndex->m_headerLen[i] 
+                    + pReq->m_pHeaderIndex->m_headerOff[i] > totalLen)
+                return -1;
+        }
+    }
+    if (pReq->m_pHeader->m_cntUnknownHeaders > 0)
+    {
+        struct lsapi_header_offset * pCur, *pEnd;
+        pCur = pReq->m_pUnknownHeader;
+        pEnd = pCur + pReq->m_pHeader->m_cntUnknownHeaders;
+        while( pCur < pEnd )
+        {
+            if (pCur->nameOff > totalLen 
+                || pCur->nameOff + pCur->nameLen > totalLen 
+                || pCur->valueOff > totalLen
+                || pCur->valueOff + pCur->valueLen > totalLen)
+                return -1;
+            ++pCur;
+        }
+    }
+    return 0;
+}
+
+
 static uid_t s_uid = 0;
 static uid_t s_defaultUid;  //web server need set this
 static gid_t s_defaultGid;
@@ -562,13 +596,13 @@ static int (*fp_lve_destroy)(struct liblve *) = NULL;
 static int (*fp_lve_enter)(struct liblve *, uint32_t, int32_t, int32_t, uint32_t *) = NULL;
 static int (*fp_lve_leave)(struct liblve *, uint32_t *) = NULL;
 static int (*fp_lve_jail)( struct passwd *, char *) = NULL;
-static int lsapi_load_lve_lib()
+static int lsapi_load_lve_lib(void)
 {
     s_liblve = dlopen("liblve.so.0", RTLD_LAZY);
     if (s_liblve)
     {
         fp_lve_is_available = dlsym(s_liblve, "lve_is_available");
-        if (dlerror() == NULL) 
+        if (dlerror() == NULL)
         {
             if ( !(*fp_lve_is_available)() )
             {
@@ -590,11 +624,11 @@ static int lsapi_load_lve_lib()
     return (s_liblve)? 0 : -1;
 }
 
-static int init_lve_ex()
+static int init_lve_ex(void)
 {
     int rc;
     if ( !s_liblve )
-        return -1; 
+        return -1;
     fp_lve_instance_init = dlsym(s_liblve, "lve_instance_init");
     fp_lve_destroy = dlsym(s_liblve, "lve_destroy");
     fp_lve_enter = dlsym(s_liblve, "lve_enter");
@@ -602,13 +636,13 @@ static int init_lve_ex()
     if ( s_enable_lve >= LSAPI_CAGEFS_ENABLED )
         fp_lve_jail = dlsym(s_liblve, "jail" );
 
-    if ( s_lve == NULL ) 
+    if ( s_lve == NULL )
     {
         rc = (*fp_lve_instance_init)(NULL);
         s_lve = malloc(rc);
     }
     rc = (*fp_lve_instance_init)(s_lve);
-    if (rc != 0) 
+    if (rc != 0)
     {
         perror( "LSAPI: Unable to initialize LVE" );
         free( s_lve );
@@ -616,7 +650,7 @@ static int init_lve_ex()
         return -1;
     }
     return 0;
-    
+
 }
 
 #endif
@@ -652,7 +686,7 @@ static int readSecret( const char * pSecretFile )
         close( fd );
         return -1;
     }
-    if ( read( fd, s_pSecret, 16 ) < 16 )
+    if ( read( fd, s_secret, 16 ) < 16 )
     {
         fprintf( stderr, "LSAPI: failed to read secret from secret file: %s\n", pSecretFile );
         close( fd );
@@ -662,9 +696,9 @@ static int readSecret( const char * pSecretFile )
     return 0;
 }
 
-int LSAPI_is_suEXEC_Daemon()
+int LSAPI_is_suEXEC_Daemon(void)
 {
-    if (( !s_uid )&&( s_pSecret[0] ))
+    if (( !s_uid )&&( s_secret[0] ))
         return 1;
     else
         return 0;
@@ -683,7 +717,7 @@ static int LSAPI_perror_r( LSAPI_Request * pReq, const char * pErr1, const char
 
 static int lsapi_lve_error( LSAPI_Request * pReq )
 {
-    static const char * headers[] = 
+    static const char * headers[] =
     {
         "Cache-Control: private, no-cache, no-store, must-revalidate, max-age=0",
         "Pragma: no-cache",
@@ -699,7 +733,7 @@ static int lsapi_lve_error( LSAPI_Request * pReq )
         "Please try again later.\n"
         "<HR>\n"
         "</BODY></HTML>\n";
-     
+
     LSAPI_ErrResponse_r( pReq, 508, headers, achBody, sizeof( achBody ) - 1 );
     return 0;
 }
@@ -733,7 +767,7 @@ static int lsapi_jailLVE( LSAPI_Request * pReq, uid_t uid, struct passwd * pw )
     ret = (*fp_lve_jail)( pw, error_msg );
     if ( ret < 0 )
     {
-        fprintf( stderr, "LSAPI (%d): LVE jail(%d) ressult: %d, error: %s !\n", 
+        fprintf( stderr, "LSAPI (%d): LVE jail(%d) ressult: %d, error: %s !\n",
                         getpid(), uid, ret, error_msg );
         LSAPI_perror_r( pReq, "LSAPI: jail() failure.", NULL );
         return -1;
@@ -744,7 +778,7 @@ static int lsapi_jailLVE( LSAPI_Request * pReq, uid_t uid, struct passwd * pw )
 
 
 #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
-static int lsapi_initLVE()
+static int lsapi_initLVE(void)
 {
     const char * pEnv;
     if ( (pEnv = getenv( "LSAPI_LVE_ENABLE" ))!= NULL )
@@ -778,7 +812,7 @@ static int setUID_LVE(LSAPI_Request * pReq, uid_t uid, gid_t gid, const char * p
     pw = getpwuid( uid );
 #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
     if ( s_lve )
-    { 
+    {
         if( lsapi_enterLVE( pReq, uid ) == -1 )
             return -1;
         if ( pw && fp_lve_jail)
@@ -795,7 +829,7 @@ static int setUID_LVE(LSAPI_Request * pReq, uid_t uid, gid_t gid, const char * p
         }
     }
 #endif
-    //if ( !uid || !gid )  //do not allow root 
+    //if ( !uid || !gid )  //do not allow root
     //{
     //    return -1;
     //}
@@ -851,7 +885,7 @@ static int setUID_LVE(LSAPI_Request * pReq, uid_t uid, gid_t gid, const char * p
     return 0;
 }
 
-static int lsapi_suexec_auth( LSAPI_Request *pReq, 
+static int lsapi_suexec_auth( LSAPI_Request *pReq,
             char * pAuth, int len, char * pUgid, int ugidLen )
 {
     lsapi_MD5_CTX md5ctx;
@@ -859,7 +893,7 @@ static int lsapi_suexec_auth( LSAPI_Request *pReq,
     if ( len < 32 )
         return -1;
     memmove( achMD5, pAuth + 16, 16 );
-    memmove( pAuth + 16, s_pSecret, 16 );
+    memmove( pAuth + 16, s_secret, 16 );
     lsapi_MD5Init( &md5ctx );
     lsapi_MD5Update( &md5ctx, (unsigned char *)pAuth, 32 );
     lsapi_MD5Update( &md5ctx, (unsigned char *)pUgid, 8 );
@@ -883,7 +917,7 @@ static int lsapi_changeUGid( LSAPI_Request * pReq )
     //with special ID  0x00
     //authenticate the suEXEC request;
     //first one should be MD5( nonce + lscgid secret )
-    //remember to clear the secret after verification 
+    //remember to clear the secret after verification
     //it should be set at the end of special env
     i = pReq->m_pHeader->m_cntSpecialEnv - 1;
     if ( i >= 0 )
@@ -899,7 +933,7 @@ static int lsapi_changeUGid( LSAPI_Request * pReq )
             {
                 --pReq->m_pHeader->m_cntSpecialEnv;
                 uid = *(uint32_t *)pEnv->pValue;
-                gid = *(((uint32_t *)pEnv->pValue) + 1 ); 
+                gid = *(((uint32_t *)pEnv->pValue) + 1 );
                 //fprintf( stderr, "LSAPI: SUEXEC_UGID set UID: %d, GID: %d\n", uid, gid );
             }
             else
@@ -909,8 +943,8 @@ static int lsapi_changeUGid( LSAPI_Request * pReq )
             }
             if ( pEnv&& lsapi_suexec_auth( pReq, pAuth->pValue, pAuth->valLen, pEnv->pValue, pEnv->valLen ) == 0 )
             {
-                //read UID, GID from specialEnv 
-                
+                //read UID, GID from specialEnv
+
             }
             else
             {
@@ -938,10 +972,10 @@ static int lsapi_changeUGid( LSAPI_Request * pReq )
         return -1;
     }
 
-    s_uid = uid; 	
+    s_uid = uid;
 
     return 0;
- 
+
 }
 
 static int parseContentLenFromHeader(LSAPI_Request * pReq)
@@ -981,12 +1015,23 @@ static int parseRequest( LSAPI_Request * pReq, int totalLen )
     if ( parseEnv( pReq->m_pEnvList, pReq->m_pHeader->m_cntEnv,
                 &pBegin, pEnd ) == -1 )
         return -1;
-
+    if (pReq->m_pHeader->m_scriptFileOff < 0 
+        || pReq->m_pHeader->m_scriptFileOff >= totalLen 
+        || pReq->m_pHeader->m_scriptNameOff < 0
+        || pReq->m_pHeader->m_scriptNameOff >= totalLen
+        || pReq->m_pHeader->m_queryStringOff < 0
+        || pReq->m_pHeader->m_queryStringOff >= totalLen
+        || pReq->m_pHeader->m_requestMethodOff < 0 
+        || pReq->m_pHeader->m_requestMethodOff >= totalLen)
+    {
+        fprintf(stderr, "%d: bad request header - ERROR#1\n", getpid());
+        return -1;
+    }
     pReq->m_pScriptFile     = pReq->m_pReqBuf + pReq->m_pHeader->m_scriptFileOff;
     pReq->m_pScriptName     = pReq->m_pReqBuf + pReq->m_pHeader->m_scriptNameOff;
     pReq->m_pQueryString    = pReq->m_pReqBuf + pReq->m_pHeader->m_queryStringOff;
     pReq->m_pRequestMethod  = pReq->m_pReqBuf + pReq->m_pHeader->m_requestMethodOff;
-    
+
     pBegin = pReq->m_pReqBuf + (( pBegin - pReq->m_pReqBuf + 7 ) & (~0x7));
     pReq->m_pHeaderIndex = ( struct lsapi_http_header_index * )pBegin;
     pBegin += sizeof( struct lsapi_http_header_index );
@@ -1007,12 +1052,19 @@ static int parseRequest( LSAPI_Request * pReq, int totalLen )
     {
         fixHeaderIndexEndian( pReq );
     }
+    
+    if (validateHeaders(pReq) == -1)
+    {
+        fprintf(stderr, "%d: bad request header - ERROR#2\n", getpid());
+        return -1;
+    }
+    
     pReq->m_reqBodyLen = pReq->m_pHeader->m_reqBodyLen;
     if ( pReq->m_reqBodyLen == -2 )
     {
         parseContentLenFromHeader(pReq);
     }
-    
+
     return 0;
 }
 
@@ -1044,7 +1096,7 @@ static void lsapi_sigalarm( int sig )
     }
 }
 
-static inline int lsapi_schedule_notify()
+static inline int lsapi_schedule_notify(void)
 {
     if ( !s_notify_scheduled )
     {
@@ -1070,7 +1122,7 @@ static inline int lsapi_notify_pid( int fd )
                         8 + LSAPI_PACKET_HEADER_LEN );
     memmove( &achBuf[8], "\0PID", 4 );
     *((int *)&achBuf[12]) = getpid();
-    
+
     if ( write( fd, achBuf, 16 ) < 16 )
         return -1;
     return 0;
@@ -1094,7 +1146,7 @@ static inline int init_conn_key( int fd )
                 < LSAPI_PACKET_HEADER_LEN+8 )
         return -1;
     return 0;
-    
+
 
 }
 
@@ -1152,8 +1204,11 @@ static int readReq( LSAPI_Request * pReq )
     pReq->m_reqState = LSAPI_ST_REQ_BODY | LSAPI_ST_RESP_HEADER;
 
     if ( !s_uid )
+    {
         if ( lsapi_changeUGid( pReq ) )
             return -1;
+        memset(s_secret, 0, sizeof(s_secret));
+    }
     pReq->m_bufProcessed = packetLen;
 
     //OPTIMIZATION
@@ -1173,16 +1228,16 @@ int LSAPI_Init(void)
     if ( !g_inited )
     {
         s_uid = geteuid();
-        s_pSecret[0] = 0;
+        s_secret[0] = 0;
         lsapi_signal(SIGPIPE, lsapi_sigpipe);
         lsapi_signal(SIGUSR1, lsapi_siguser1);
 
 #if defined(SIGXFSZ) && defined(SIG_IGN)
         signal(SIGXFSZ, SIG_IGN);
 #endif
-        /* let STDOUT function as STDERR, 
+        /* let STDOUT function as STDERR,
            just in case writing to STDOUT directly */
-        dup2( 2, 1 );  
+        dup2( 2, 1 );
         if ( LSAPI_InitRequest( &g_req, LSAPI_SOCK_FILENO ) == -1 )
             return -1;
         g_inited = 1;
@@ -1222,8 +1277,8 @@ int LSAPI_InitRequest( LSAPI_Request * pReq, int fd )
     {
         fd = dup( fd );
         newfd = open( "/dev/null", O_RDWR );
-        dup2( newfd, STDIN_FILENO ); 
-    } 
+        dup2( newfd, STDIN_FILENO );
+    }
 
     if ( isPipe( fd ) )
     {
@@ -1256,7 +1311,7 @@ int LSAPI_Accept_r( LSAPI_Request * pReq )
     char        achPeer[128];
     socklen_t   len;
     int         nodelay = 1;
-    
+
     if ( !pReq )
         return -1;
     if ( LSAPI_Finish_r( pReq ) == -1 )
@@ -1282,7 +1337,7 @@ int LSAPI_Accept_r( LSAPI_Request * pReq )
                 {
                     lsapi_set_nblock( pReq->m_fd , 0 );
                     if (((struct sockaddr *)&achPeer)->sa_family == AF_INET )
-                    {    
+                    {
                         setsockopt(pReq->m_fd, IPPROTO_TCP, TCP_NODELAY,
                                    (char *)&nodelay, sizeof(nodelay));
                     }
@@ -1326,7 +1381,7 @@ int LSAPI_Finish_r( LSAPI_Request * pReq )
             {
                 Flush_RespBuf_r( pReq );
             }
-            
+
             pReq->m_pIovecCur->iov_base = (void *)&finish;
             pReq->m_pIovecCur->iov_len  = LSAPI_PACKET_HEADER_LEN;
             pReq->m_totalLen += LSAPI_PACKET_HEADER_LEN;
@@ -1344,7 +1399,7 @@ void LSAPI_Reset_r( LSAPI_Request * pReq )
     pReq->m_pRespBufPos         = pReq->m_pRespBuf;
     pReq->m_pIovecCur           = pReq->m_pIovecToWrite = pReq->m_pIovec + 1;
     pReq->m_pRespHeaderBufPos   = pReq->m_pRespHeaderBuf;
-    
+
     memset( &pReq->m_pHeaderIndex, 0,
             (char *)(pReq->m_respHeaderLen) - (char *)&pReq->m_pHeaderIndex );
 }
@@ -1359,7 +1414,7 @@ int LSAPI_Release_r( LSAPI_Request * pReq )
     if ( pReq->m_pEnvList )
         free( pReq->m_pEnvList );
     if ( pReq->m_pRespHeaderBuf )
-        free( pReq->m_pRespHeaderBuf );  
+        free( pReq->m_pRespHeaderBuf );
     return 0;
 }
 
@@ -1395,7 +1450,7 @@ static int readBodyToReqBuf( LSAPI_Request * pReq )
         return -1;
     if ( len > bodyLeft )
         len = bodyLeft;
-        
+
     len = lsapi_read( pReq->m_fd, pReq->m_pReqBuf + pReq->m_bufRead, len );
     if ( len > 0 )
         pReq->m_bufRead += len;
@@ -1431,7 +1486,7 @@ int LSAPI_ReqBodyGetLine_r( LSAPI_Request * pReq, char * pBuf, size_t bufLen, in
     *getLF = 0;
     while( (left = pBufEnd - pBufCur ) > 0 )
     {
-        
+
         len = pReq->m_bufRead - pReq->m_bufProcessed;
         if ( len <= 0 )
         {
@@ -1452,7 +1507,7 @@ int LSAPI_ReqBodyGetLine_r( LSAPI_Request * pReq, char * pBuf, size_t bufLen, in
         pReq->m_bufProcessed += len;
 
         pReq->m_reqBodyRead += len;
-        
+
         if ( p )
         {
             *getLF = 1;
@@ -1460,7 +1515,7 @@ int LSAPI_ReqBodyGetLine_r( LSAPI_Request * pReq, char * pBuf, size_t bufLen, in
         }
     }
     *pBufCur = 0;
-  
+
     return pBufCur - pBuf;
 }
 
@@ -1470,21 +1525,21 @@ ssize_t LSAPI_ReadReqBody_r( LSAPI_Request * pReq, char * pBuf, size_t bufLen )
     ssize_t len;
     off_t total;
     /* char *pOldBuf = pBuf; */
-    if (!pReq || (pReq->m_fd ==-1) || ( !pBuf )||(bufLen < 0 ))
+    if (!pReq || (pReq->m_fd ==-1) || ( !pBuf )||((ssize_t)bufLen < 0 ))
         return -1;
 
     total = pReq->m_reqBodyLen - pReq->m_reqBodyRead;
-    
+
     if ( total <= 0 )
         return 0;
-    if ( total < bufLen )
+    if ( total < (ssize_t)bufLen )
         bufLen = total;
 
     total = 0;
     len = pReq->m_bufRead - pReq->m_bufProcessed;
     if ( len > 0 )
     {
-        if ( len > bufLen )
+        if ( len > (ssize_t)bufLen )
             len = bufLen;
         memmove( pBuf, pReq->m_pReqBuf + pReq->m_bufProcessed, len );
         pReq->m_bufProcessed += len;
@@ -1510,7 +1565,7 @@ ssize_t LSAPI_ReadReqBody_r( LSAPI_Request * pReq, char * pBuf, size_t bufLen )
     }
     pReq->m_reqBodyRead += total;
     return total;
-        
+
 }
 
 
@@ -1523,7 +1578,7 @@ ssize_t LSAPI_Write_r( LSAPI_Request * pReq, const char * pBuf, size_t len )
     ssize_t toWrite;
     ssize_t packetLen;
     int skip = 0;
-    
+
     if ( !pReq || !pBuf || (pReq->m_fd == -1) )
         return -1;
     if ( pReq->m_reqState & LSAPI_ST_RESP_HEADER )
@@ -1542,19 +1597,19 @@ ssize_t LSAPI_Write_r( LSAPI_Request * pReq, const char * pBuf, size_t len )
     }
     pReq->m_reqState |= LSAPI_ST_RESP_BODY;
 
-    if ( (len - skip) < pReq->m_pRespBufEnd - pReq->m_pRespBufPos )
+    if ( ((ssize_t)len - skip) < pReq->m_pRespBufEnd - pReq->m_pRespBufPos )
     {
         memmove( pReq->m_pRespBufPos, pBuf + skip, len - skip );
         pReq->m_pRespBufPos += len - skip;
         return len;
     }
-    
-    
+
+
     pHeader = pReq->m_respPktHeader;
     p       = pBuf + skip;
     pEnd    = pBuf + len;
     bufLen  = pReq->m_pRespBufPos - pReq->m_pRespBuf;
-    
+
     while( ( toWrite = pEnd - p ) > 0 )
     {
         packetLen = toWrite + bufLen;
@@ -1563,7 +1618,7 @@ ssize_t LSAPI_Write_r( LSAPI_Request * pReq, const char * pBuf, size_t len )
             packetLen = LSAPI_MAX_DATA_PACKET_LEN;
             toWrite = packetLen - bufLen;
         }
-        
+
         lsapi_buildPacketHeader( pHeader, LSAPI_RESP_STREAM,
                             packetLen + LSAPI_PACKET_HEADER_LEN );
         pReq->m_totalLen += packetLen + LSAPI_PACKET_HEADER_LEN;
@@ -1577,7 +1632,7 @@ ssize_t LSAPI_Write_r( LSAPI_Request * pReq, const char * pBuf, size_t len )
             pReq->m_pIovecCur->iov_base = (void *)pReq->m_pRespBuf;
             pReq->m_pIovecCur->iov_len  = bufLen;
             pReq->m_pRespBufPos = pReq->m_pRespBuf;
-            ++pReq->m_pIovecCur;       
+            ++pReq->m_pIovecCur;
             bufLen = 0;
         }
 
@@ -1599,7 +1654,7 @@ ssize_t LSAPI_Write_r( LSAPI_Request * pReq, const char * pBuf, size_t len )
     return p - pBuf;
 }
 
-#if defined(__FreeBSD__ ) || defined(__NetBSD__) || defined(__OpenBSD__) 
+#if defined(__FreeBSD__ ) || defined(__NetBSD__) || defined(__OpenBSD__)
 ssize_t gsendfile( int fdOut, int fdIn, off_t* off, size_t size )
 {
     ssize_t ret;
@@ -1628,7 +1683,7 @@ ssize_t gsendfile( int fdOut, int fdIn, off_t* off, size_t size )
     return ret;
 }
 #endif
-    
+
 #if defined(sun) || defined(__sun)
 #include <sys/sendfile.h>
 ssize_t gsendfile( int fdOut, int fdIn, off_t *off, size_t size )
@@ -1674,16 +1729,16 @@ ssize_t LSAPI_sendfile_r( LSAPI_Request * pReq, int fdIn, off_t* off, size_t siz
         LSAPI_FinalizeRespHeaders_r( pReq );
     }
     pReq->m_reqState |= LSAPI_ST_RESP_BODY;
-    
+
     LSAPI_Flush_r(pReq);
-    
+
     lsapi_buildPacketHeader( pHeader, LSAPI_RESP_STREAM,
                             size + LSAPI_PACKET_HEADER_LEN );
-   
+
 
     if (write(pReq->m_fd,  (const char *) pHeader, LSAPI_PACKET_HEADER_LEN ) != LSAPI_PACKET_HEADER_LEN)
         return -1;
-    
+
     return gsendfile( pReq->m_fd, fdIn, off, size );
 }
 
@@ -1706,7 +1761,7 @@ void Flush_RespBuf_r( LSAPI_Request * pReq )
         pReq->m_pIovecCur->iov_base = (void *)pReq->m_pRespBuf;
         pReq->m_pIovecCur->iov_len  = bufLen;
         pReq->m_pRespBufPos = pReq->m_pRespBuf;
-        ++pReq->m_pIovecCur;       
+        ++pReq->m_pIovecCur;
         bufLen = 0;
     }
 }
@@ -1738,11 +1793,11 @@ int LSAPI_Flush_r( LSAPI_Request * pReq )
     {
         Flush_RespBuf_r( pReq );
     }
-    
+
     n = pReq->m_pIovecCur - pReq->m_pIovecToWrite;
     if ( n > 0 )
     {
-        
+
         ret = lsapi_writev( pReq->m_fd, &pReq->m_pIovecToWrite,
                   n, pReq->m_totalLen );
         if ( ret < pReq->m_totalLen )
@@ -1768,7 +1823,7 @@ ssize_t LSAPI_Write_Stderr_r( LSAPI_Request * pReq, const char * pBuf, size_t le
     int ret;
     struct iovec iov[2];
     struct iovec *pIov;
-    
+
     if ( !pReq )
         return -1;
     if (( pReq->m_fd == -1 )||(pReq->m_fd == pReq->m_fdListen ))
@@ -1777,7 +1832,7 @@ ssize_t LSAPI_Write_Stderr_r( LSAPI_Request * pReq, const char * pBuf, size_t le
     {
         LSAPI_Flush_r( pReq );
     }
-    
+
     p       = pBuf;
     pEnd    = pBuf + len;
 
@@ -1901,7 +1956,7 @@ struct _headerInfo
 int compareValueLocation(const void * v1, const void *v2 )
 {
     return ((const struct _headerInfo *)v1)->_value -
-           ((const struct _headerInfo *)v2)->_value; 
+           ((const struct _headerInfo *)v2)->_value;
 }
 
 int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
@@ -1932,7 +1987,7 @@ int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
             headers[count]._value = pValue;
             headers[count]._valueLen = len;
             ++count;
-        
+
             //ret = (*fn)( HTTP_HEADERS[i], HTTP_HEADER_LEN[i],
             //            pValue, len, arg );
             //if ( ret <= 0 )
@@ -1961,7 +2016,7 @@ int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
             ++count;
             if ( count == 512 )
                 break;
-            //ret = (*fn)( pKey, keyLen, 
+            //ret = (*fn)( pKey, keyLen,
             //            pValue, pCur->valueLen, arg );
             //if ( ret <= 0 )
             //    return ret;
@@ -1971,13 +2026,13 @@ int LSAPI_ForeachOrgHeader_r( LSAPI_Request * pReq,
     qsort( headers, count, sizeof( struct _headerInfo ), compareValueLocation );
     for( i = 0; i < count; ++i )
     {
-        ret = (*fn)( headers[i]._name, headers[i]._nameLen, 
+        ret = (*fn)( headers[i]._name, headers[i]._nameLen,
                     headers[i]._value, headers[i]._valueLen, arg );
         if ( ret <= 0 )
             return ret;
     }
     return count;
-    
+
 }
 
 
@@ -2038,7 +2093,7 @@ int LSAPI_ForeachHeader_r( LSAPI_Request * pReq,
 
             pValue = pReq->m_pHttpHeader + pCur->valueOff;
             *(pValue + pCur->valueLen ) = 0;
-            ret = (*fn)( achHeaderName, keyLen, 
+            ret = (*fn)( achHeaderName, keyLen,
                         pValue, pCur->valueLen, arg );
             if ( ret <= 0 )
                 return ret;
@@ -2046,7 +2101,7 @@ int LSAPI_ForeachHeader_r( LSAPI_Request * pReq,
         }
     }
     return count + pReq->m_pHeader->m_cntUnknownHeaders;
-    
+
 }
 
 static int EnvForeach( struct LSAPI_key_value_pair * pEnv,
@@ -2115,7 +2170,7 @@ int LSAPI_FinalizeRespHeaders_r( LSAPI_Request * pReq )
         pReq->m_totalLen += pReq->m_pIovecCur->iov_len;
         ++pReq->m_pIovecCur;
     }
-    
+
     pReq->m_pIovec->iov_len  = sizeof( struct lsapi_resp_header)
             + pReq->m_respHeader.m_respInfo.m_cntHeaders * sizeof( short );
     pReq->m_totalLen += pReq->m_pIovec->iov_len;
@@ -2128,11 +2183,11 @@ int LSAPI_FinalizeRespHeaders_r( LSAPI_Request * pReq )
 }
 
 
-int LSAPI_AppendRespHeader2_r( LSAPI_Request * pReq, const char * pHeaderName, 
+int LSAPI_AppendRespHeader2_r( LSAPI_Request * pReq, const char * pHeaderName,
                               const char * pHeaderValue )
 {
     int nameLen, valLen, len;
-    if ( !pReq || !pHeaderName || !pHeaderValue ) 
+    if ( !pReq || !pHeaderName || !pHeaderValue )
         return -1;
     if ( pReq->m_reqState & LSAPI_ST_RESP_BODY )
         return -1;
@@ -2276,7 +2331,7 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
     struct addrinfo *res, hints;
     int  doAddrInfo = 0;
     int port;
-    
+
     if ( !pBind )
         return -1;
 
@@ -2300,7 +2355,7 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
         if ( !pEnd )
             return -1;
         *pEnd++ = 0;
-        
+
         if ( *p == '*' )
         {
             strcpy( achAddr, "::" );
@@ -2315,7 +2370,7 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
         if ( !pEnd )
             return -1;
         *pEnd++ = 0;
-        
+
         doAddrInfo = 0;
         if ( *p == '*' )
         {
@@ -2335,7 +2390,7 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
     }
     if ( *pEnd == ':' )
         ++pEnd;
-        
+
     port = atoi( pEnd );
     if (( port <= 0 )||( port > 65535 ))
         return -1;
@@ -2356,13 +2411,13 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
         memcpy(pAddr, res->ai_addr, res->ai_addrlen);
         freeaddrinfo(res);
     }
-    
+
     if ( pAddr->sa_family == AF_INET )
         ((struct sockaddr_in *)pAddr)->sin_port = htons( port );
     else
         ((struct sockaddr_in6 *)pAddr)->sin6_port = htons( port );
     return 0;
-    
+
 }
 
 int LSAPI_CreateListenSock( const char * pBind, int backlog )
@@ -2408,11 +2463,11 @@ typedef struct _lsapi_prefork_server
     int m_iChildrenMaxIdleTime;
     int m_iMaxReqProcessTime;
     int m_iAvoidFork;
-    
+
     lsapi_child_status * m_pChildrenStatus;
     lsapi_child_status * m_pChildrenStatusCur;
     lsapi_child_status * m_pChildrenStatusEnd;
-    
+
 }lsapi_prefork_server;
 
 static lsapi_prefork_server * g_prefork_server = NULL;
@@ -2427,7 +2482,7 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp, int avoidFork )
     if ( max_children >= 10000)
         max_children = 10000;
 
-    
+
     g_prefork_server = (lsapi_prefork_server *)malloc( sizeof( lsapi_prefork_server ) );
     if ( !g_prefork_server )
         return -1;
@@ -2441,14 +2496,14 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp, int avoidFork )
     setpgid( pid, pid );
     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);
     if ( g_prefork_server->m_iMaxIdleChildren == 0 )
         g_prefork_server->m_iMaxIdleChildren = 1;
     g_prefork_server->m_iChildrenMaxIdleTime = 300;
     g_prefork_server->m_iMaxReqProcessTime = 3600;
-    return 0;    
+    return 0;
 }
 
 void LSAPI_Set_Server_fd( int fd )
@@ -2552,10 +2607,10 @@ static void lsapi_sigchild( int signal )
 
 }
 
-static int lsapi_init_children_status()
+static int lsapi_init_children_status(void)
 {
     int size = 4096;
-    
+
     char * pBuf;
     size = (g_prefork_server->m_iMaxChildren + g_prefork_server->m_iExtraChildren ) * sizeof( lsapi_child_status ) * 2;
     size = (size + 4095 ) / 4096 * 4096;
@@ -2583,9 +2638,9 @@ static void dump_debug_info( lsapi_child_status * pStatus, long tmCur )
     }
     s_pid_dump_debug_info = fork();
 
-    fprintf( stderr, "[%s] Possible runaway process, PPID: %d, PID: %d, reqCount: %d, process time: %ld, checkpoint time: %ld, start time: %ld\n", 
-                ctime(&tmCur), getpid(), pStatus->m_pid, pStatus->m_iReqCounter, 
-                tmCur - pStatus->m_tmReqBegin, tmCur - pStatus->m_tmLastCheckPoint, tmCur - pStatus->m_tmStart ); 
+    fprintf( stderr, "[%s] Possible runaway process, PPID: %d, PID: %d, reqCount: %d, process time: %ld, checkpoint time: %ld, start time: %ld\n",
+                ctime(&tmCur), getpid(), pStatus->m_pid, pStatus->m_iReqCounter,
+                tmCur - pStatus->m_tmReqBegin, tmCur - pStatus->m_tmLastCheckPoint, tmCur - pStatus->m_tmStart );
     snprintf( achCmd, 1024, "gdb --batch -ex \"attach %d\" -ex \"set height 0\" -ex \"bt\" >&2;PATH=$PATH:/usr/sbin lsof -p %d >&2", pStatus->m_pid, pStatus->m_pid );
     if ( system( achCmd ) == -1 )
         perror( "system()" );
@@ -2608,7 +2663,7 @@ static void lsapi_check_child_status( long tmCur )
             ++count;
             if ( !pStatus->m_inProcess )
             {
-                
+
                 if (( g_prefork_server->m_iCurChildren - dying > g_prefork_server->m_iMaxChildren)||
                     ( idle > g_prefork_server->m_iMaxIdleChildren ))
                 {
@@ -2628,7 +2683,7 @@ static void lsapi_check_child_status( long tmCur )
             }
             else
             {
-                if ( tmCur - pStatus->m_tmReqBegin > 
+                if ( tmCur - pStatus->m_tmReqBegin >
                         g_prefork_server->m_iMaxReqProcessTime )
                 {
                     if (( ( pStatus->m_iKillSent % 5 ) == 0 )&&( s_dump_debug_info ))
@@ -2663,13 +2718,13 @@ static void lsapi_check_child_status( long tmCur )
     }
     if ( abs( g_prefork_server->m_iCurChildren - count ) > 1 )
     {
-        fprintf( stderr, "Children tracking is wrong: PID: %d, Cur Childen: %d, count: %d, idle: %d, dying: %d\n", getpid(), 
+        fprintf( stderr, "Children tracking is wrong: PID: %d, Cur Children: %d, count: %d, idle: %d, dying: %d\n", getpid(),
                 g_prefork_server->m_iCurChildren, count, idle, dying );
 
     }
 }
 
-static int lsapi_all_children_must_die()
+static int lsapi_all_children_must_die(void)
 {
     int maxWait;
     int sec =0;
@@ -2707,7 +2762,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
     sigset_t orig_mask;
 
     lsapi_init_children_status();
-    
+
     setsid();
 
     act.sa_flags = 0;
@@ -2797,17 +2852,17 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
 
             sigemptyset( &mask );
             sigaddset( &mask, SIGCHLD );
-            
-            if ( sigprocmask(SIG_BLOCK, &mask, &orig_mask) < 0 ) 
+
+            if ( sigprocmask(SIG_BLOCK, &mask, &orig_mask) < 0 )
             {
                 perror( "sigprocmask(SIG_BLOCK) to block SIGCHLD" );
             }
 
             pid = fork();
-    
+
             if ( !pid )
             {
-                if (sigprocmask(SIG_SETMASK, &orig_mask, NULL) < 0) 
+                if (sigprocmask(SIG_SETMASK, &orig_mask, NULL) < 0)
                     perror( "sigprocmask( SIG_SETMASK ) to restore SIGMASK in child" );
                 g_prefork_server = NULL;
                 s_ppid = getppid();
@@ -2849,7 +2904,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
             close( pReq->m_fd );
             pReq->m_fd = -1;
 
-            if (sigprocmask(SIG_SETMASK, &orig_mask, NULL) < 0) 
+            if (sigprocmask(SIG_SETMASK, &orig_mask, NULL) < 0)
                 perror( "sigprocmask( SIG_SETMASK ) to restore SIGMASK" );
 
         }
@@ -2898,7 +2953,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
         s_pChildStatus->m_tmWaitBegin = time( NULL );
     }
 
-    
+
     while( g_running )
     {
         if ( pReq->m_fd != -1 )
@@ -2917,7 +2972,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
             if ( !g_running )
                 return -1;
             if ((s_req_processed)&&( s_pChildStatus )&&( s_pChildStatus->m_iKillSent ))
-                return -1; 
+                return -1;
             FD_ZERO( &readfds );
             FD_SET( fd, &readfds );
             timeout.tv_sec = 1;
@@ -2945,7 +3000,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
             else if ( ret >= 1 )
             {
                 if (s_req_processed && ( s_pChildStatus )&&( s_pChildStatus->m_iKillSent ))
-                    return -1; 
+                    return -1;
                 if ( fd == pReq->m_fdListen )
                 {
                     pReq->m_fd = lsapi_accept( pReq->m_fdListen );
@@ -2993,7 +3048,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
         LSAPI_Reset_r( pReq );
     }
     return -1;
-    
+
 }
 
 void LSAPI_Set_Max_Reqs( int reqs )
@@ -3038,13 +3093,13 @@ void LSAPI_Set_Slow_Req_Msecs( int msecs )
     s_slow_req_msecs = msecs;
 }
 
-int  LSAPI_Get_Slow_Req_Msecs()
+int  LSAPI_Get_Slow_Req_Msecs(void)
 {
     return s_slow_req_msecs;
 }
 
 
-void LSAPI_No_Check_ppid()
+void LSAPI_No_Check_ppid(void)
 {
     s_ppid = 0;
 }
@@ -3054,7 +3109,7 @@ void LSAPI_No_Check_ppid()
 #else
 extern char ** environ;
 #endif
-static void unset_lsapi_envs()
+static void unset_lsapi_envs(void)
 {
     char **env;
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
@@ -3062,22 +3117,22 @@ static void unset_lsapi_envs()
 #else
     env = environ;
 #endif
-    while( env != NULL && *env != NULL ) 
+    while( env != NULL && *env != NULL )
     {
-        if (!strncmp(*env, "LSAPI_", 6) || !strncmp( *env, "PHP_LSAPI_", 10 ) 
-            || (!strncmp( *env, "PHPRC=", 6 )&&(!s_uid))) 
-        {   
+        if (!strncmp(*env, "LSAPI_", 6) || !strncmp( *env, "PHP_LSAPI_", 10 )
+            || (!strncmp( *env, "PHPRC=", 6 )&&(!s_uid)))
+        {
             char ** del = env;
-            do 
+            do
                 *del = del[1];
             while( *del++ );
         }
         else
             ++env;
-    }  
+    }
 }
 
-static int lsapi_initSuEXEC()
+static int lsapi_initSuEXEC(void)
 {
     int i;
     struct passwd * pw;
@@ -3101,7 +3156,7 @@ static int lsapi_initSuEXEC()
         }
         p = getenv( "LSAPI_SECRET" );
         if (( !p )||( readSecret(p) == -1 ))
-                return -1;  
+                return -1;
         if ( g_prefork_server )
         {
             if ( g_prefork_server->m_iMaxChildren < 100 )
@@ -3113,10 +3168,20 @@ static int lsapi_initSuEXEC()
     if ( !s_defaultUid || !s_defaultGid )
     {
         pw = getpwnam( "nobody" );
-        if ( !s_defaultUid )
-            s_defaultUid = pw->pw_uid;
-        if ( !s_defaultGid )
-            s_defaultGid = pw->pw_gid;
+        if ( pw )
+        {
+            if ( !s_defaultUid )
+                s_defaultUid = pw->pw_uid;
+            if ( !s_defaultGid )
+                s_defaultGid = pw->pw_gid;
+        }
+        else
+        {
+            if ( !s_defaultUid )
+                s_defaultUid = 10000;
+            if ( !s_defaultGid )
+                s_defaultGid = 10000;
+        }
     }
     return 0;
 }
@@ -3141,7 +3206,7 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp )
     if ( p )
     {
         avoidFork = atoi( p );
-    }    
+    }
 
     p = getenv( "LSAPI_ACCEPT_NOTIFY" );
     if ( p )
@@ -3150,7 +3215,7 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp )
     }
 
     p = getenv( "LSAPI_SLOW_REQ_MSECS" );
-    if ( p ) 
+    if ( p )
     {
         n = atoi( p );
         LSAPI_Set_Slow_Req_Msecs( n );
@@ -3200,26 +3265,26 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp )
         p = getenv( "LSAPI_EXTRA_CHILDREN" );
         if ( p )
             LSAPI_Set_Extra_Children( atoi( p ) );
-        
+
         p = getenv( "LSAPI_MAX_IDLE_CHILDREN" );
         if ( p )
             LSAPI_Set_Max_Idle_Children( atoi( p ) );
-        
+
         p = getenv( "LSAPI_PGRP_MAX_IDLE" );
         if ( p )
         {
             LSAPI_Set_Server_Max_Idle_Secs( atoi( p ) );
         }
-        
+
         p = getenv( "LSAPI_MAX_PROCESS_TIME" );
-        if ( p )       
+        if ( p )
             LSAPI_Set_Max_Process_Time( atoi( p ) );
-        
+
         if ( getenv( "LSAPI_PPID_NO_CHECK" ) )
         {
             LSAPI_No_Check_ppid();
         }
-        
+
         p = getenv( "LSAPI_DUMP_DEBUG_INFO" );
         if ( p )
             s_dump_debug_info = atoi( p );
@@ -3235,7 +3300,7 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp )
 }
 
 
-int LSAPI_ErrResponse_r( LSAPI_Request * pReq, int code, const char ** pRespHeaders, 
+int LSAPI_ErrResponse_r( LSAPI_Request * pReq, int code, const char ** pRespHeaders,
                          const char * pBody, int bodyLen )
 {
     LSAPI_SetRespStatus_r( pReq, code );