From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 28 Aug 2019 15:56:23 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0RC1~26^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=195b8ae7791c9f556cd26ceb5f5d6eca91ac47ca;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78473: odbc_close() closes arbitrary resources
---

195b8ae7791c9f556cd26ceb5f5d6eca91ac47ca
diff --cc NEWS
index 515f423160,838f1d23e8..fc7bc2f784
--- a/NEWS
+++ b/NEWS
@@@ -23,7 -11,10 +23,10 @@@ PH
    . Fixed connect_attr issues and added the _server_host connection attribute.
      (Qianqian Bu)
  
+ - ODBC:
+   . Fixed bug #78473 (odbc_close() closes arbitrary resources). (cmb)
+ 
 -29 Aug 2019, PHP 7.2.22
 +29 Aug 2019, PHP 7.3.9
  
  - Core:
    . Fixed bug #78363 (Buffer overflow in zendparse). (Nikita)