diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:41:44 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:41:44 +0000 |
| commit | 532486569add9b53105279f95a85579dff143852 (patch) | |
| tree | 78be7670c35b6526fdc11bde4291c792966bdbaa /main | |
| parent | b4459af0256d991d21aef8ed167be47512d20e5d (diff) | |
| parent | a5027d43dde2f54cadce475aaba2ad09b2273fca (diff) | |
| download | php-git-532486569add9b53105279f95a85579dff143852.tar.gz | |
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Flush stderr on win32 in cli_log_message
Fixed bug #73154
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c index 8cc4a9863e..a9755ccd8d 100644 --- a/main/main.c +++ b/main/main.c @@ -1165,11 +1165,9 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u if ((!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi")) && PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR ) { -#ifdef PHP_WIN32 fprintf(stderr, "%s: %s in %s on line %u\n", error_type_str, buffer, error_filename, error_lineno); +#ifdef PHP_WIN32 fflush(stderr); -#else - fprintf(stderr, "%s: %s in %s on line %u\n", error_type_str, buffer, error_filename, error_lineno); #endif } else { php_printf("%s\n%s: %s in %s on line %d\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); |