From: Joe Watkins <krakjoe@php.net>
Date: Wed, 30 Jan 2019 17:28:09 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.3RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d1df603ada38814dbf4728950bc7f9d0a636864;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug 76596: phpdbg supports display_errors=stderr
---

7d1df603ada38814dbf4728950bc7f9d0a636864
diff --cc NEWS
index 083e7d593c,f3c3063ac7..d94a6f47e5
--- a/NEWS
+++ b/NEWS
@@@ -1,45 -1,14 +1,48 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.16
 -
 -07 Feb 2019, PHP 7.2.15
 +?? ??? ????, PHP 7.3.3
  
  - Core:
 -  . Fixed bug #77339 (__callStatic may get incorrect arguments). (Dmitry)
    . Fixed bug #77494 (Disabling class causes segfault on member access).
      (Dmitry)
 +  . Fixed bug #77498 (Custom extension Segmentation fault when declare static
 +    property). (Nikita)
    . Fixed bug #77530 (PHP crashes when parsing `(2)::class`). (Ekin)
 +  . Fixed bug #77546 (iptcembed broken function). (gdegoulet)
 +
 +- Mbstring:
 +  . Fixed bug #77514 (mb_ereg_replace() with trailing backslash adds null byte).
 +    (Nikita)
 +
 +- Opcache:
 +  . Fixed bug #77287 (Opcache literal compaction is incompatible with EXT
 +    opcodes). (Nikita)
 +
 +- OpenSSL:
 +  . Fixed bug #77390 (feof might hang on TLS streams in case of fragmented TLS
 +    records). (Abyl Valg, Jakub Zelenka)
 +
++- phpdbg:
++  . Fixed bug #76596 (phpdbg support for display_errors=stderr). (kabel)
++
 +07 Feb 2019, PHP 7.3.2
 +
 +- Core:
 +  . Fixed bug #77369 (memcpy with negative length via crafted DNS response). (Stas)
 +  . Fixed bug #77387 (Recursion detection broken when printing GLOBALS).
 +    (Laruence)
 +  . Fixed bug #77376 ("undefined function" message no longer includes
 +    namespace). (Laruence)
 +  . Fixed bug #77357 (base64_encode / base64_decode doest not work on nested
 +    VM). (Nikita)
 +  . Fixed bug #77339 (__callStatic may get incorrect arguments). (Dmitry)
 +  . Fixed bug #77317 (__DIR__, __FILE__, realpath() reveal physical path for
 +    subst virtual drive). (Anatol)
 +  . Fixed bug #77263 (Segfault when using 2 RecursiveFilterIterator). (Dmitry)
 +  . Fixed bug #77447 (PHP 7.3 built with ASAN crashes in
 +    zend_cpu_supports_avx2). (Nikita)
 +  . Fixed bug #77484 (Zend engine crashes when calling realpath in invalid
 +    working dir). (Anatol)
  
  - Curl:
    . Fixed bug #76675 (Segfault with H2 server push). (Pedro Magalhães)
diff --cc main/main.c
index fee7b038bd,d68cb6eca4..ee422db52f
--- a/main/main.c
+++ b/main/main.c
@@@ -1343,10 -1181,10 +1343,10 @@@ static ZEND_COLD void php_error_cb(int 
  					}
  				} else {
  					/* Write CLI/CGI errors to stderr if display_errors = "stderr" */
- 					if ((!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi")) &&
+ 					if ((!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi") || !strcmp(sapi_module.name, "phpdbg")) &&
  						PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR
  					) {
 -						fprintf(stderr, "%s: %s in %s on line %u\n", error_type_str, buffer, error_filename, error_lineno);
 +						fprintf(stderr, "%s: %s in %s on line %" PRIu32 "\n", error_type_str, buffer, error_filename, error_lineno);
  #ifdef PHP_WIN32
  						fflush(stderr);
  #endif