ruby-lsapi 4.4 → 5.0

data/ext/lsapi/lsapilib.h

@@ -1,21 +1,21 @@
 /*
-Copyright (c) 2002-2015, Lite Speed Technologies Inc.
+Copyright (c) 2002-2018, Lite Speed Technologies Inc.
 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.
 */
 
 
@@ -52,8 +52,8 @@ struct LSAPI_key_value_pair
     int    valLen;
 };
 
-
-#define LSAPI_MAX_RESP_HEADERS  100
+struct lsapi_child_status;
+#define LSAPI_MAX_RESP_HEADERS  1000
 
 typedef struct lsapi_request
 {
@@ -65,7 +65,7 @@ typedef struct lsapi_request
 
     char            * m_pReqBuf;
     int               m_reqBufSize;
-    
+
     char            * m_pRespBuf;
     char            * m_pRespBufEnd;
     char            * m_pRespBufPos;
@@ -73,12 +73,13 @@ typedef struct lsapi_request
     char            * m_pRespHeaderBuf;
     char            * m_pRespHeaderBufEnd;
     char            * m_pRespHeaderBufPos;
+    struct lsapi_child_status * child_status;
 
 
     struct iovec    * m_pIovec;
     struct iovec    * m_pIovecEnd;
     struct iovec    * m_pIovecCur;
-    struct iovec    * m_pIovecToWrite;    
+    struct iovec    * m_pIovecToWrite;
 
     struct lsapi_packet_header      * m_respPktHeaderEnd;
 
@@ -90,7 +91,7 @@ typedef struct lsapi_request
 
     struct lsapi_http_header_index  * m_pHeaderIndex;
     struct lsapi_header_offset      * m_pUnknownHeader;
-    
+
     char            * m_pScriptFile;
     char            * m_pScriptName;
     char            * m_pQueryString;
@@ -102,9 +103,9 @@ typedef struct lsapi_request
     off_t             m_reqBodyRead;
     int               m_bufProcessed;
     int               m_bufRead;
-    
+
     struct lsapi_packet_header        m_respPktHeader[5];
-    
+
     struct lsapi_resp_header          m_respHeader;
     short                             m_respHeaderLen[LSAPI_MAX_RESP_HEADERS];
     void            * m_pAppData;
@@ -150,7 +151,6 @@ int LSAPI_ForeachSpecialEnv_r( LSAPI_Request * pReq,
             LSAPI_CB_EnvHandler fn, void * arg );
 
 char * LSAPI_GetEnv_r( LSAPI_Request * pReq, const char * name );
-            
 
 ssize_t LSAPI_ReadReqBody_r( LSAPI_Request * pReq, char * pBuf, size_t len );
 
@@ -171,7 +171,7 @@ int LSAPI_Flush_r( LSAPI_Request * pReq );
 
 int LSAPI_AppendRespHeader_r( LSAPI_Request * pReq, const char * pBuf, int len );
 
-int LSAPI_AppendRespHeader2_r( LSAPI_Request * pReq, const char * pHeaderName, 
+int LSAPI_AppendRespHeader2_r( LSAPI_Request * pReq, const char * pHeaderName,
                               const char * pHeaderValue );
 
 int LSAPI_ErrResponse_r( LSAPI_Request * pReq, int code, const char ** pRespHeaders,
@@ -248,6 +248,9 @@ static inline off_t LSAPI_GetReqBodyRemain_r( LSAPI_Request * pReq )
 }
 
 
+int LSAPI_End_Response_r(LSAPI_Request * pReq);
+
+
 
 int LSAPI_Is_Listen(void);
 
@@ -313,7 +316,7 @@ static inline ssize_t LSAPI_Write( const char * pBuf, ssize_t len )
 
 static inline ssize_t LSAPI_sendfile( int fdIn, off_t* off, size_t size )
 {
-    return LSAPI_sendfile_r(&g_req, fdIn, off, size );          
+    return LSAPI_sendfile_r(&g_req, fdIn, off, size );
 }
 
 static inline ssize_t LSAPI_Write_Stderr( const char * pBuf, ssize_t len )
@@ -331,6 +334,9 @@ static inline int LSAPI_SetRespStatus( int code )
 static inline int LSAPI_ErrResponse( int code, const char ** pRespHeaders, const char * pBody, int bodyLen )
 {   return LSAPI_ErrResponse_r( &g_req, code, pRespHeaders, pBody, bodyLen );   }
 
+static inline int LSAPI_End_Response(void)
+{   return LSAPI_End_Response_r( &g_req );                         }
+
 int LSAPI_IsRunning(void);
 
 int LSAPI_CreateListenSock( const char * pBind, int backlog );
@@ -343,6 +349,8 @@ void LSAPI_Set_Server_fd( int fd );
 
 int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq );
 
+void LSAPI_No_Check_ppid(void);
+
 void LSAPI_Set_Max_Reqs( int reqs );
 
 void LSAPI_Set_Max_Idle( int secs );
@@ -363,6 +371,43 @@ int  LSAPI_Get_Slow_Req_Msecs(void);
 
 int LSAPI_is_suEXEC_Daemon(void);
 
+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);
+
+int LSAPI_Inc_Req_Processed(int cnt);
+
+int LSAPI_Accept_Before_Fork(LSAPI_Request * pReq);
+
+int LSAPI_Postfork_Child(LSAPI_Request * pReq);
+
+int LSAPI_Postfork_Parent(LSAPI_Request * pReq);
+
+#define LSAPI_LOG_LEVEL_BITS    0xff
+#define LSAPI_LOG_FLAG_NONE     0
+#define LSAPI_LOG_FLAG_DEBUG    1
+#define LSAPI_LOG_FLAG_INFO     2
+#define LSAPI_LOG_FLAG_NOTICE   3
+#define LSAPI_LOG_FLAG_WARN     4
+#define LSAPI_LOG_FLAG_ERROR    5
+#define LSAPI_LOG_FLAG_CRIT     6
+#define LSAPI_LOG_FLAG_FATAL    7
+
+#define LSAPI_LOG_TIMESTAMP_BITS (0xff00)
+#define LSAPI_LOG_TIMESTAMP_FULL (0x100)
+#define LSAPI_LOG_TIMESTAMP_HMS  (0x200)
+#define LSAPI_LOG_TIMESTAMP_STDERR  (0x400)
+
+#define LSAPI_LOG_PID            (0x10000)
+
+void LSAPI_Log(int flag, const char * fmt, ...)
+#if __GNUC__
+        __attribute__((format(printf, 2, 3)))
+#endif
+;
+
+
 #if defined (c_plusplus) || defined (__cplusplus)
 }
 #endif

data/ext/lsapi/lsruby.c

@@ -209,6 +209,30 @@ static VALUE lsapi_s_accept( VALUE self )
     }
 }
 
+
+static VALUE lsapi_s_accept_new_conn(VALUE self)
+{
+    if (LSAPI_Accept_Before_Fork(&g_req) == -1 )
+        return Qnil;
+    else
+        return s_req;
+}
+
+
+static VALUE lsapi_s_postfork_child(VALUE self)
+{
+    LSAPI_Postfork_Child(&g_req);
+    return s_req;
+}
+
+
+static VALUE lsapi_s_postfork_parent(VALUE self)
+{
+    LSAPI_Postfork_Parent(&g_req);
+    return s_req;
+}
+
+
 /*
  * static int chdir_file( const char * pFile )
  * {
@@ -482,15 +506,19 @@ static int createBodyBuf()
                 {
                     return 1;
                 }
-                ftruncate(fd, s_body.bodyLen);   
+                if (ftruncate(fd, s_body.bodyLen) == 0)
+                {
+                    perror("ftruncate() failed. \n");
+                    close(fd);
+                    return 1;
+                }
                 s_body.bodyBuf = mmap(NULL, s_body.bodyLen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
                 if (s_body.bodyBuf == MAP_FAILED)
                 {
                     perror("File mapping failed. \n");
                     close(fd);
                     return 1;
-                } 
-                
+                }
                 close(fd);  //close since needn't it anymore
             }
             else
@@ -823,7 +851,10 @@ void Init_lsapi()
     
     cLSAPI = rb_define_class("LSAPI", rb_cObject);
     rb_define_singleton_method(cLSAPI, "accept", lsapi_s_accept, 0);
-    
+    rb_define_singleton_method(cLSAPI, "accept_new_connection", lsapi_s_accept_new_conn, 0);
+    rb_define_singleton_method(cLSAPI, "postfork_child", lsapi_s_postfork_child, 0);
+    rb_define_singleton_method(cLSAPI, "postfork_parent", lsapi_s_postfork_parent, 0);
+
     rb_define_method(cLSAPI, "process", lsapi_process, 0 );
     /* rb_define_method(cLSAPI, "initialize", lsapi_initialize, 0); */
     rb_define_method(cLSAPI, "putc", lsapi_putc, 1);

data/lsapi.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby-lsapi}
-  s.version = "4.4"
-  s.date = %q{2018-01-18}
+  s.version = "5.0"
+  s.date = %q{2020-05-15}
   s.description = "This is a ruby extension for fast communication with LiteSpeed Web Server."
   s.summary = %q{A ruby extension for fast communication with LiteSpeed Web Server.}
   s.has_rdoc = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsapi
 version: !ruby/object:Gem::Version
-  version: '4.4'
+  version: '5.0'
 platform: ruby
 authors:
 - LiteSpeed Technologies Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies: []
 description: This is a ruby extension for fast communication with LiteSpeed Web Server.
 email: info@litespeedtech.com
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-lsapi
-rubygems_version: 2.2.5
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A ruby extension for fast communication with LiteSpeed Web Server.