From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 20 Dec 2019 11:05:39 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~392
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0737fa35e3a8dec495a8faf39887f1a587307d8;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78982: pdo_pgsql returns dead persistent connection
---

b0737fa35e3a8dec495a8faf39887f1a587307d8
diff --cc NEWS
index b55e9ee190,5f70bd1ae0..f927b4ee3d
--- a/NEWS
+++ b/NEWS
@@@ -34,19 -26,24 +34,21 @@@ PH
      Kentarō)
    . Fixed bug #78980 (pgsqlGetNotify() overlooks dead connection). (SATŌ
      Kentarō)
+   . Fixed bug #78982 (pdo_pgsql returns dead persistent connection). (SATŌ
+     Kentarō)
  
 -18 Dec 2019, PHP 7.3.13
 +- Spl:
 +  . Fixed bug #78976 (SplFileObject::fputcsv returns -1 on failure). (cmb)
  
 -- Bcmath:
 -  . Fixed bug #78878 (Buffer underflow in bc_shift_addsub). (CVE-2019-11046).
 -    (cmb)
 +- Standard:
 +  . Fixed bug #79000 (Non-blocking socket stream reports EAGAIN as error).
 +    (Nikita)
 +
 +18 Dec 2019, PHP 7.4.1
  
  - Core:
 -  . Fixed bug #78862 (link() silently truncates after a null byte on Windows).
 -    (CVE-2019-11044). (cmb)
 -  . Fixed bug #78863 (DirectoryIterator class silently truncates after a null
 -    byte). (CVE-2019-11045). (cmb)
 -  . Fixed bug #78943 (mail() may release string with refcount==1 twice).
 -    (CVE-2019-11049). (cmb)
 -  . Fixed bug #78787 (Segfault with trait overriding inherited private shadow
 -    property). (Nikita)
 +  . Fixed bug #78810 (RW fetches do not throw "uninitialized property"
 +    exception). (Nikita)
    . Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value).
      (Antony Dovgal, Dmitry)
    . Fixed bug #78296 (is_file fails to detect file). (cmb)