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

diff --cc NEWS
index 1b91bb65659c707327fccf369c69c6e2196f6b5d,d91c6c91ffdf4ddd53645d518710a1b1d6310891..07d466981ff78712dfe3929857301bcbcc43dea2
--- 1/NEWS
--- 2/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)

diff --cc ext/phar/util.c
Simple merge