From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 6 Aug 2019 15:27:32 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.9RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ea39d15abef3df259e0aa2974d1c530654aa2b1;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78282: atime and mtime mismatch
---

9ea39d15abef3df259e0aa2974d1c530654aa2b1
diff --cc NEWS
index c4c2a2b421,a4e4793e85..35147c0dc2
--- a/NEWS
+++ b/NEWS
@@@ -31,15 -26,11 +31,16 @@@ PH
  - Standard:
    . Fixed bug #69100 (Bus error from stream_copy_to_stream (file -> SSL stream)
      with invalid length). (Nikita)
+   . Fixed bug #78282 (atime and mtime mismatch). (cmb)
    . Fixed bug #78326 (improper memory deallocation on stream_get_contents()
      with fixed length buffer). (Albert Casademont)
 +  . Fixed bug #78346 (strip_tags no longer handling nested php tags). (cmb)
  
 -01 Aug 2019, PHP 7.2.21
 +01 Aug 2019, PHP 7.3.8
 +
 +- Core:
 +  . Added syslog.filter=raw option. (Erik Lundin)
 +  . Fixed bug #78212 (Segfault in built-in webserver). (cmb)
  
  - Date:
    . Fixed bug #69044 (discrepency between time and microtime). (krakjoe)