From: Joe Watkins <krakjoe@php.net>
Date: Wed, 26 Jul 2017 09:47:02 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0beta2~36^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb9ea4e88b14ab9ae51370c6265d8a88c8532937;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

bb9ea4e88b14ab9ae51370c6265d8a88c8532937
diff --cc NEWS
index 1b91bb6565,d91c6c91ff..07d466981f
--- a/NEWS
+++ b/NEWS
@@@ -21,13 -21,10 +21,17 @@@ PH
  - OCI8:
    . Expose oci_unregister_taf_callback() (Tianfang Yang)
  
 +- Opcache:
 +  . Fixed bug #74980 (Narrowing occurred during type inference). (Laruence)
 +
+ - 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)
 +
  - SimpleXML:
    . Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces).
      (Laruence)