ruby-lsapi 5.7 → 5.9

data/ext/lsapi/lsapilib.h

@@ -304,7 +304,11 @@ static inline int LSAPI_ReqBodyGetChar(void)
 {   return LSAPI_ReqBodyGetChar_r( &g_req );        }
 
 static inline int LSAPI_ReqBodyGetLine( char * pBuf, int len, int *getLF )
-{   return LSAPI_ReqBodyGetLine_r( &g_req, pBuf, len, getLF );        }
+{
+    if (len <= 0)
+        return -1;
+    return LSAPI_ReqBodyGetLine_r( &g_req, pBuf, (size_t)len, getLF );
+}
 
 
 
@@ -312,7 +316,11 @@ static inline int LSAPI_FinalizeRespHeaders(void)
 {   return LSAPI_FinalizeRespHeaders_r( &g_req );           }
 
 static inline ssize_t LSAPI_Write( const char * pBuf, ssize_t len )
-{   return LSAPI_Write_r( &g_req, pBuf, len );              }
+{
+    if (len < 0)
+        return -1;
+    return LSAPI_Write_r( &g_req, pBuf, (size_t)len );
+}
 
 static inline ssize_t LSAPI_sendfile( int fdIn, off_t* off, size_t size )
 {
@@ -320,7 +328,11 @@ static inline ssize_t LSAPI_sendfile( int fdIn, off_t* off, size_t size )
 }
 
 static inline ssize_t LSAPI_Write_Stderr( const char * pBuf, ssize_t len )
-{   return LSAPI_Write_Stderr_r( &g_req, pBuf, len );       }
+{
+    if (len < 0)
+        return -1;
+    return LSAPI_Write_Stderr_r( &g_req, pBuf, (size_t)len );
+}
 
 static inline int LSAPI_Flush(void)
 {   return LSAPI_Flush_r( &g_req );                         }
@@ -376,6 +388,14 @@ int LSAPI_Set_Restored_Parent_Pid(int pid);
 typedef void (*LSAPI_On_Timer_pf)(int *forked_child_pid);
 void LSAPI_Register_Pgrp_Timer_Callback(LSAPI_On_Timer_pf);
 
+/* Called around the fork() of each worker by the prefork server
+ * (LSAPI_Prefork_Accept_r): before in the parent, then after_parent in the
+ * parent (also when fork() fails) or after_child in the new worker. */
+typedef void (*LSAPI_Fork_Hook_pf)(void);
+void LSAPI_Set_Fork_Hooks(LSAPI_Fork_Hook_pf before,
+                          LSAPI_Fork_Hook_pf after_parent,
+                          LSAPI_Fork_Hook_pf after_child);
+
 int LSAPI_Inc_Req_Processed(int cnt);
 
 int LSAPI_Accept_Before_Fork(LSAPI_Request * pReq);
@@ -384,6 +404,8 @@ int LSAPI_Postfork_Child(LSAPI_Request * pReq);
 
 int LSAPI_Postfork_Parent(LSAPI_Request * pReq);
 
+int LSAPI_Postfork_Failed(LSAPI_Request * pReq);
+
 #define LSAPI_LOG_LEVEL_BITS    0xff
 #define LSAPI_LOG_FLAG_NONE     0
 #define LSAPI_LOG_FLAG_DEBUG    1
@@ -402,7 +424,7 @@ int LSAPI_Postfork_Parent(LSAPI_Request * pReq);
 #define LSAPI_LOG_PID            (0x10000)
 
 void LSAPI_Log(int flag, const char * fmt, ...)
-#if __GNUC__
+#ifdef __GNUC__
         __attribute__((format(printf, 2, 3)))
 #endif
 ;
@@ -420,4 +442,3 @@ void LSAPI_Log(int flag, const char * fmt, ...)
 
 
 
-