Merge branch 'PHP-7.2' into PHP-7.3

3 files changed, 2 insertions, 5 deletions

diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index a5eb973cad..a2eb54ae95 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -455,7 +455,7 @@ static int sapi_lsapi_activate()
 static sapi_module_struct lsapi_sapi_module =
 {
     "litespeed",
-    "LiteSpeed V7.3.1",
+    "LiteSpeed V7.3.2",
 
     php_lsapi_startup,              /* startup */
     php_module_shutdown_wrapper,    /* shutdown */
diff --git a/sapi/litespeed/lsapidef.h b/sapi/litespeed/lsapidef.h
index f6c0cb0231..ee87a01053 100644
--- a/sapi/litespeed/lsapidef.h
+++ b/sapi/litespeed/lsapidef.h
@@ -163,7 +163,7 @@ struct lsapi_req_header
 
 struct lsapi_http_header_index
 {
-    int16_t m_headerLen[H_TRANSFER_ENCODING+1];
+    uint16_t m_headerLen[H_TRANSFER_ENCODING+1];
     int32_t m_headerOff[H_TRANSFER_ENCODING+1];
 } ;
 
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
index 88a30a7f6a..926a832cea 100644
--- a/sapi/litespeed/lsapilib.c
+++ b/sapi/litespeed/lsapilib.c
@@ -3170,9 +3170,6 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer,
 
 #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
         *s_avail_pages = sysconf(_SC_AVPHYS_PAGES);
-//        lsapi_log("Memory total: %zd, free: %zd, free %%%zd\n",
-//                  s_total_pages, *s_avail_pages, *s_avail_pages * 100 / s_total_pages);
-
 #endif
         FD_ZERO( &readfds );
         FD_SET( pServer->m_fd, &readfds );