Merge branch 'PHP-7.0' into PHP-7.1

krakjoe · krakjoe · commit bbe21ccf3877 · 2017-01-18T17:46:11.000Z
* PHP-7.0:
  Remove remnants of TSMRLS_* macro calls
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -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
 
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
@@ -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;
     /**

Original file line number	Diff line number	Diff line change
`@@ -1979,7 +1979,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv`
`1979`	`1979`	`if (client->request.path_translated &&`
`1980`	`1980`	`('.' == client->request.path_translated[client->request.path_translated_len-1] \|\|`
`1981`	`1981`	`' ' == client->request.path_translated[client->request.path_translated_len-1])) {`
`1982`		`- return php_cli_server_send_error_page(server, client, 500 TSRMLS_CC);`
	`1982`	`+ return php_cli_server_send_error_page(server, client, 500);`
`1983`	`1983`	`}`
`1984`	`1984`	`#endif`
`1985`	`1985`
Original file line number	Diff line number	Diff line change
`@@ -865,7 +865,7 @@ static int lsapi_activate_user_ini_finally(_lsapi_activate_user_ini_ctx *ctx,`
`865`	`865`	`return rc;`
`866`	`866`	`}`
`867`	`867`
`868`		`-static int lsapi_activate_user_ini(TSRMLS_D)`
	`868`	`+static int lsapi_activate_user_ini( void )`
`869`	`869`	`{`
`870`	`870`	`_lsapi_activate_user_ini_ctx ctx;`
`871`	`871`	`/**`