1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00

Merge branch 'PHP-7.4'

This commit is contained in:
George Wang
2019-05-09 18:16:09 -04:00
3 changed files with 2 additions and 5 deletions
+1 -1
View File
@@ -448,7 +448,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 */
+1 -1
View File
@@ -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];
} ;
-3
View File
@@ -3172,9 +3172,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 );