Skip to content

Commit d2037b1

Browse files
author
George Wang
committed
Merge branch 'PHP-7.2' into PHP-7.3
2 parents fd1ffa4 + af41437 commit d2037b1

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

sapi/litespeed/lsapi_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ static int sapi_lsapi_activate()
455455
static sapi_module_struct lsapi_sapi_module =
456456
{
457457
"litespeed",
458-
"LiteSpeed V7.3.1",
458+
"LiteSpeed V7.3.2",
459459

460460
php_lsapi_startup, /* startup */
461461
php_module_shutdown_wrapper, /* shutdown */

sapi/litespeed/lsapidef.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ struct lsapi_req_header
163163

164164
struct lsapi_http_header_index
165165
{
166-
int16_t m_headerLen[H_TRANSFER_ENCODING+1];
166+
uint16_t m_headerLen[H_TRANSFER_ENCODING+1];
167167
int32_t m_headerOff[H_TRANSFER_ENCODING+1];
168168
} ;
169169

sapi/litespeed/lsapilib.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3170,9 +3170,6 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer,
31703170

31713171
#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
31723172
*s_avail_pages = sysconf(_SC_AVPHYS_PAGES);
3173-
// lsapi_log("Memory total: %zd, free: %zd, free %%%zd\n",
3174-
// s_total_pages, *s_avail_pages, *s_avail_pages * 100 / s_total_pages);
3175-
31763173
#endif
31773174
FD_ZERO( &readfds );
31783175
FD_SET( pServer->m_fd, &readfds );

0 commit comments

Comments
 (0)