Merge branch 'PHP-7.0' into PHP-7.1

diff --cc main/main.c
Simple merge

diff --cc sapi/cli/php_cli.c
index dc92045ae7402ad16566a9024453820a26c69da8,22f4e0cebe3914e97eb1c6a36826b231de392bc6..6a0787877526371b09c0dc4c24c6bf925b606886
--- 1/sapi/cli/php_cli.c
--- 2/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@@ -377,9 -376,12 +377,12 @@@ static void sapi_cli_register_variables
  }
  /* }}} */
  
 -static void sapi_cli_log_message(char *message) /* {{{ */
 +static void sapi_cli_log_message(char *message, int syslog_type_int) /* {{{ */
  {
        fprintf(stderr, "%s\n", message);
+ #ifdef PHP_WIN32
+       fflush(stderr);
+ #endif
  }
  /* }}} */