Merge branch 'PHP-7.1'

* 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

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