mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2' into PHP-7.3

Browse Source
This commit is contained in:
George Wang 2019-04-21 15:59:07 -04:00
commit fb4c811835
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sapi/litespeed/lsapi_main.c
View File

@ -455,7 +455,7 @@ static int sapi_lsapi_activate()
static sapi_module_struct lsapi_sapi_module =
{
"litespeed",
"LiteSpeed V7.3",
"LiteSpeed V7.3.1",
php_lsapi_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
@ -1390,7 +1390,6 @@ static const zend_function_entry litespeed_functions[] = {
PHP_FALIAS(getallheaders, litespeed_request_headers, arginfo_litespeed__void)
PHP_FALIAS(apache_request_headers, litespeed_request_headers, arginfo_litespeed__void)
PHP_FALIAS(apache_response_headers, litespeed_response_headers, arginfo_litespeed__void)
PHP_FALIAS(fastcgi_finish_request, litespeed_finish_request, arginfo_litespeed__void)
{NULL, NULL, NULL}
};
@ -1526,6 +1525,10 @@ PHP_FUNCTION(litespeed_finish_request)
if (ZEND_NUM_ARGS() > 0) {
WRONG_PARAM_COUNT;
}
php_output_end_all();
php_header();
if (LSAPI_End_Response() != -1) {
RETURN_TRUE;
}

27
sapi/litespeed/lsapilib.c
View File

@ -1600,8 +1600,11 @@ int LSAPI_Accept_r( LSAPI_Request * pReq )
}
static struct lsapi_packet_header finish = {'L', 'S',
LSAPI_RESP_END, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} };
static struct lsapi_packet_header finish_close[2] =
{
{'L', 'S', LSAPI_RESP_END, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} },
{'L', 'S', LSAPI_CONN_CLOSE, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} }
};
int LSAPI_Finish_r( LSAPI_Request * pReq )
@ -1622,7 +1625,7 @@ int LSAPI_Finish_r( LSAPI_Request * pReq )
Flush_RespBuf_r( pReq );
}
pReq->m_pIovecCur->iov_base = (void *)&finish;
pReq->m_pIovecCur->iov_base = (void *)finish_close;
pReq->m_pIovecCur->iov_len = LSAPI_PACKET_HEADER_LEN;
pReq->m_totalLen += LSAPI_PACKET_HEADER_LEN;
++pReq->m_pIovecCur;
@ -1638,12 +1641,17 @@ int LSAPI_End_Response_r(LSAPI_Request * pReq)
{
if (!pReq)
return -1;
if (pReq->m_reqState & LSAPI_ST_BACKGROUND)
return 0;
if (pReq->m_reqState)
{
if ( pReq->m_fd != -1 )
{
if ( pReq->m_reqState & LSAPI_ST_RESP_HEADER )
{
if ( pReq->m_pRespHeaderBufPos <= pReq->m_pRespHeaderBuf )
return 0;
LSAPI_FinalizeRespHeaders_r( pReq );
}
if ( pReq->m_pRespBufPos != pReq->m_pRespBuf )
@ -1651,14 +1659,13 @@ int LSAPI_End_Response_r(LSAPI_Request * pReq)
Flush_RespBuf_r( pReq );
}
pReq->m_pIovecCur->iov_base = (void *)&finish;
pReq->m_pIovecCur->iov_len = LSAPI_PACKET_HEADER_LEN;
pReq->m_totalLen += LSAPI_PACKET_HEADER_LEN;
pReq->m_pIovecCur->iov_base = (void *)finish_close;
pReq->m_pIovecCur->iov_len = LSAPI_PACKET_HEADER_LEN << 1;
pReq->m_totalLen += LSAPI_PACKET_HEADER_LEN << 1;
++pReq->m_pIovecCur;
LSAPI_Flush_r( pReq );
lsapi_close_connection(pReq);
}
send_conn_close_notification(pReq->m_fd);
lsapi_close_connection(pReq);
pReq->m_reqState |= LSAPI_ST_BACKGROUND;
}
return 0;
@ -3163,8 +3170,8 @@ 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);
// 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 );