From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 4 Oct 2017 06:59:27 +0000 (+0300)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC4~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3bb81d5a467174540017d9e4577e58285017403;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
---

c3bb81d5a467174540017d9e4577e58285017403
diff --cc NEWS
index ac28474df4,53a96a371f..ded4a9819d
--- a/NEWS
+++ b/NEWS
@@@ -19,6 -21,12 +19,9 @@@ PH
      only litespeed SAPI). (petk)
    . Fixed bug #75251 (Missing program prefix and suffix). (petk)
  
 -- MySQLi:
 -  . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol)
 -
+ - OCI8:
+   . Fixed incorrect reference counting. (Dmitry, Tianfang Yang)
+ 
  - Opcache
    . Fixed bug #75255 (Request hangs and not finish). (Dmitry)