diff options
author | George Wang <gwang@php.net> | 2019-05-09 18:15:48 -0400 |
---|---|---|
committer | George Wang <gwang@php.net> | 2019-05-09 18:15:48 -0400 |
commit | dc63b0e48051113cb2dc19ca2469ab51afaf2873 (patch) | |
tree | 2811abe9796033ae97cbbcc9ba6c9357ae0cc487 /sapi | |
parent | ec518aef10abb26db9c50dc9c4912386cbe94989 (diff) | |
parent | d2037b1bd45684dda48d4a212b96349fb3737db0 (diff) | |
download | php-git-dc63b0e48051113cb2dc19ca2469ab51afaf2873.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'sapi')
-rw-r--r-- | sapi/litespeed/lsapi_main.c | 2 | ||||
-rw-r--r-- | sapi/litespeed/lsapidef.h | 2 | ||||
-rw-r--r-- | sapi/litespeed/lsapilib.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 078827c721..e553ba1ed0 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -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 */ diff --git a/sapi/litespeed/lsapidef.h b/sapi/litespeed/lsapidef.h index 5c46bd9cf7..c909b5f986 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 d6e1e2b350..c0c486cb15 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -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 ); |