mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 06:21:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source 
* PHP-7.1:
  Remove remnants of TSMRLS_* macro calls
This commit is contained in:
Joe Watkins 2017-01-18 17:46:35 +00:00
commit 409467dc2f
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sapi/cli/php_cli_server.c
View File

@ -1979,7 +1979,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv
if (client->request.path_translated &&
('.' == client->request.path_translated[client->request.path_translated_len-1] ||
' ' == client->request.path_translated[client->request.path_translated_len-1])) {
return php_cli_server_send_error_page(server, client, 500 TSRMLS_CC);
return php_cli_server_send_error_page(server, client, 500);
}
#endif

2
sapi/litespeed/lsapi_main.c
View File

@ -865,7 +865,7 @@ static int lsapi_activate_user_ini_finally(_lsapi_activate_user_ini_ctx *ctx,
return rc;
}
static int lsapi_activate_user_ini(TSRMLS_D)
static int lsapi_activate_user_ini( void )
{
_lsapi_activate_user_ini_ctx ctx;
/**