]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 11 Feb 2019 14:50:33 +0000 (15:50 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 11 Feb 2019 14:50:47 +0000 (15:50 +0100)
1  2 
NEWS
ext/spl/spl_directory.c
main/streams/glob_wrapper.c

diff --cc NEWS
index d3f1d7ebd8e8d2afd884d132365cb19c11b618bc,fa5200ce845abbe2d4a89a11f874493f16da6b3b..8f3e10e09a7ba0248f61ae4fabea9b38944432fc
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -26,9 -10,10 +26,13 @@@ PH
    . Support Oracle Database tracing attributes ACTION, MODULE,
      CLIENT_INFO, and CLIENT_IDENTIFIER. (Cameron Porter)
  
 +- phpdbg:
 +  . Fixed bug #76596 (phpdbg support for display_errors=stderr). (kabel)
 +
+ - SPL:
+   . Fixed bug #51068 (DirectoryIterator glob:// don't support current path
+     relative queries). (Ahmed Abdou)
  - Standard:
    . Fixed bug #77552 (Unintialized php_stream_statbuf in stat functions).
      (John Stevenson)
Simple merge
Simple merge