Merge branch 'PHP-7.4'

* PHP-7.4:
  fix mac tests on azure
This commit is contained in:
Joe Watkins 2019-06-14 12:57:47 +02:00
commit 956db0cdc2
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
19 changed files with 71 additions and 93 deletions

View file

@ -961,6 +961,12 @@ static int do_cli(int argc, char **argv) /* {{{ */
}
request_started = 1;
CG(start_lineno) = lineno;
zend_register_bool_constant(
ZEND_STRL("PHP_CLI_PROCESS_TITLE"),
is_ps_title_available() == PS_TITLE_SUCCESS,
CONST_CS, 0);
*arg_excp = arg_free; /* reconstuct argv */
if (hide_argv) {