From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Jan 2017 20:09:27 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~32^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5027d43dde2f54cadce475aaba2ad09b2273fca;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

a5027d43dde2f54cadce475aaba2ad09b2273fca
diff --cc sapi/cli/php_cli.c
index dc92045ae7,22f4e0cebe..6a07878775
--- a/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
  }
  /* }}} */