From: Joe Watkins <krakjoe@php.net>
Date: Wed, 26 Jul 2017 09:48:03 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1783
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3707411d63587d392b42e961a3e05477277257a4;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases
---

3707411d63587d392b42e961a3e05477277257a4
diff --cc NEWS
index af8f27887e,798a540756..a11a4e2493
--- a/NEWS
+++ b/NEWS
@@@ -11,17 -14,34 +11,21 @@@ PH
    . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).
      (cebe)
  
 -- Mbstring:
 -  . Fixed bug #69267 (mb_strtolower fails on titlecase characters). (Nikita)
 -  . Fixed bug #71606 (Segmentation fault mb_strcut with HTML-ENTITIES encoding).
 -    (cmb)
 -
 -- MySQLi:
 -  . Fixed bug #74968 (PHP crashes when calling mysqli_result::fetch_object with
 -    an abstract class). (Anatol)
 -
 -- OCI8:
 -  . Expose oci_unregister_taf_callback() (Tianfang Yang)
 +- LDAP:
 +  . Added ldap_exop_refresh helper for EXOP REFRESH operation with dds overlay. 
 +    (Come)
  
 -- Opcache:
 -  . Fixed bug #74980 (Narrowing occurred during type inference). (Laruence)
 +- Mbstring:
 +  . Fixed bug #73528 (Crash in zif_mb_send_mail). (Nikita)
  
 -- OpenSSL:
 -  . Fixed bug #74903 (openssl_pkcs7_encrypt() uses different EOL than before).
 -    (Anatol)
 +- ODBC:
 +  . Removed support for Birdstep. (Kalle)
  
+ - phar:
+   . Fixed bug #74991 (include_path has a 4096 char limit in some cases).
+     (bwbroersma)
+ 
  - Session:
 -  . Fixed bug #74892 (Url Rewriting (trans_sid) not working on urls that start
 -    with "#"). (Andrew Nester)
 -  . Fixed bug #74936 (session_cache_expire/cache_limiter/save_path() trigger a
 -    warning in read mode). (morozov)
    . Fixed bug #74941 (session fails to start after having headers sent). 
      (morozov)